From e4e72404dcca533c0cbaece10624414ea3586bf1 Mon Sep 17 00:00:00 2001
From: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Date: Tue, 9 Jun 2015 15:34:08 +0300
Subject: [PATCH 001/252] Fixed Fernflower decompiler output for generic nested
 types (IDEA-141230)

https://github.com/JetBrains/intellij-community/pull/273
---
 .../struct/gen/generics/GenericMain.java      |  96 ++++++++++--------
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../pkg/TestParameterizedTypes$Inner.class    | Bin 0 -> 642 bytes
 .../classes/pkg/TestParameterizedTypes.class  | Bin 0 -> 776 bytes
 testData/results/TestParameterizedTypes.dec   |  11 ++
 testData/src/pkg/TestParameterizedTypes.java  |  26 +++++
 6 files changed, 91 insertions(+), 43 deletions(-)
 create mode 100644 testData/classes/pkg/TestParameterizedTypes$Inner.class
 create mode 100644 testData/classes/pkg/TestParameterizedTypes.class
 create mode 100644 testData/results/TestParameterizedTypes.dec
 create mode 100644 testData/src/pkg/TestParameterizedTypes.java

diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 2992078..0a3f9d3 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.struct.StructClass;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -193,57 +192,68 @@ public class GenericMain {
     }
     else if (tp == CodeConstants.TYPE_OBJECT) {
       StringBuilder buffer = new StringBuilder();
-      buffer.append(DecompilerContext.getImportCollector().getShortName(buildJavaClassName(type)));
-
-      if (!type.getArguments().isEmpty()) {
-        buffer.append("<");
-        for (int i = 0; i < type.getArguments().size(); i++) {
-          if (i > 0) {
-            buffer.append(", ");
-          }
-          int wildcard = type.getWildcards().get(i);
-          if (wildcard != GenericType.WILDCARD_NO) {
-            buffer.append("?");
-
-            switch (wildcard) {
-              case GenericType.WILDCARD_EXTENDS:
-                buffer.append(" extends ");
-                break;
-              case GenericType.WILDCARD_SUPER:
-                buffer.append(" super ");
-            }
-          }
-
-          GenericType genPar = type.getArguments().get(i);
-          if (genPar != null) {
-            buffer.append(getGenericCastTypeName(genPar));
-          }
-        }
-        buffer.append(">");
-      }
-
+      appendClassName(type, buffer);
       return buffer.toString();
     }
 
     throw new RuntimeException("Invalid type: " + type);
   }
 
-  private static String buildJavaClassName(GenericType type) {
-    String name = "";
-    for (GenericType tp : type.getEnclosingClasses()) {
-      name += tp.value + "$";
+  private static void appendClassName(GenericType type, StringBuilder buffer) {
+    List<GenericType> enclosingClasses = type.getEnclosingClasses();
+
+    if (enclosingClasses.isEmpty()) {
+      String name = type.value.replace('/', '.');
+      buffer.append(DecompilerContext.getImportCollector().getShortName(name));
     }
-    name += type.value;
+    else {
+      for (GenericType tp : enclosingClasses) {
+        if (buffer.length() == 0) {
+          buffer.append(DecompilerContext.getImportCollector().getShortName(tp.value));
+        }
+        else {
+          buffer.append(tp.value);
+        }
 
-    String res = name.replace('/', '.');
-
-    if (res.contains("$")) {
-      StructClass cl = DecompilerContext.getStructContext().getClass(name);
-      if (cl == null || !cl.isOwn()) {
-        res = res.replace('$', '.');
+        appendTypeArguments(tp, buffer);
+        buffer.append('.');
       }
+
+      buffer.append(type.value);
     }
 
-    return res;
+    appendTypeArguments(type, buffer);
+  }
+
+  private static void appendTypeArguments(GenericType type, StringBuilder buffer) {
+    if (!type.getArguments().isEmpty()) {
+      buffer.append('<');
+
+      for (int i = 0; i < type.getArguments().size(); i++) {
+        if (i > 0) {
+          buffer.append(", ");
+        }
+
+        int wildcard = type.getWildcards().get(i);
+        switch (wildcard) {
+          case GenericType.WILDCARD_UNBOUND:
+            buffer.append('?');
+            break;
+          case GenericType.WILDCARD_EXTENDS:
+            buffer.append("? extends ");
+            break;
+          case GenericType.WILDCARD_SUPER:
+            buffer.append("? super ");
+            break;
+        }
+
+        GenericType genPar = type.getArguments().get(i);
+        if (genPar != null) {
+          buffer.append(getGenericCastTypeName(genPar));
+        }
+      }
+
+      buffer.append(">");
+    }
   }
 }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index d8f6bee..e85cd67 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -60,4 +60,5 @@ public class SingleClassesTest extends SingleClassesTestBase {
   @Test public void testInnerLocal() { doTest("pkg/TestInnerLocal"); }
   @Test public void testInnerLocalPkg() { doTest("pkg/TestInnerLocalPkg"); }
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
+  @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
 }
diff --git a/testData/classes/pkg/TestParameterizedTypes$Inner.class b/testData/classes/pkg/TestParameterizedTypes$Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..55f1d4cd6538a1400040bba8710b1dc2aa630390
GIT binary patch
literal 642
zcmaJ;O;5r=5PeGvm0AT+Q32yeI3ODE;K??<keHA(N<zbZfekJ~A#E|yf91iLc<=}K
zqm0wS#Sh3PGxH{I-oBmv{CfWYaD~G(6y$ZN*wb*Jp}>#|?`2TFWGFe)he6#HLD=Fx
zAB#}<@>%rVr>O``;#ty@q0MkqSw%eSFsO}5Uod1G>51FfxGQ{@cSqF8Ig=hAb+|7h
zylASC0fuDL^Mub}#JMrzK_IAoy5h2OOeJsmpSt9Dp?$Gp+HzZ_U5h0ww`tm>lWxm_
z$HSRVUMp7f+8OdkULSF9P`~RAMK3h%zbyv6J(>AEaU-KQ7XRO1Es`>jM9P4MqJ|Q~
z@$!YwpT>~=?SMh4L_01lpH)xjlU4d}md!>NMim_mYZTLjT1e0V^y>L5SoIBw7eWej
xiYej%J6NZfpR-^fLx}jX8kwTnh<Q5YEkX)%6cgB{$tdq)ld?`61^d`g**BH-pfCUc

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestParameterizedTypes.class b/testData/classes/pkg/TestParameterizedTypes.class
new file mode 100644
index 0000000000000000000000000000000000000000..0c61819012a8dee6e1c6d88fb2e52331d4b11670
GIT binary patch
literal 776
zcmaJ<!A`<J5Pb^;q@o}qDqtcB2k-zFPl8;CCMJ!N6uB>Dt&63QwwUN&c{1_f2l!FO
zX-gtRX%9P{nfK<+%<k9s$0vYuoT!N7IE7LQ<rFFmi5uG%4nroeJ&U`pa2b*vX-lum
z5U)3e3`%b{77STU+TwOG9SLW^M;1l$+RWhAkUP@%mqEpQlvJal&7aKHK)7C?JA5iU
z;mB7p9=yzj+h!=PQz^QnS0i|xLBHK4a^4i)z3tA0As?i%oS{~4L{Mu1inwWAnl|?q
z4)uQ-NeR@N0k5M?_%m-=+%{Xf=SbTO`p8iq`g#{ybjg)E;U?SNNQHW*f3d>38%>1a
zwYz^q45~g`IEJ{E{>_yCUwqRaBZCyS7)qP(havYnZ>Y&|x)~oXSE(XK@5}$<V7>^Q
zY4WbfGO~%Ycd)l0t<tFy9LPgK0o(MK2|;9c$lG0uWI-_Gut%6YWn$PTzp&yTkZ71G
S;xIrQAxTyxhC=v+!hQg)b<N`d

literal 0
HcmV?d00001

diff --git a/testData/results/TestParameterizedTypes.dec b/testData/results/TestParameterizedTypes.dec
new file mode 100644
index 0000000..862ba54
--- /dev/null
+++ b/testData/results/TestParameterizedTypes.dec
@@ -0,0 +1,11 @@
+package pkg;
+
+public abstract class TestParameterizedTypes<P> {
+   abstract TestParameterizedTypes<P>.Inner<String> getUnspecificInner();
+
+   abstract TestParameterizedTypes<Number>.Inner<String> getSpecificInner();
+
+   public abstract class Inner<I> {
+   }
+}
+
diff --git a/testData/src/pkg/TestParameterizedTypes.java b/testData/src/pkg/TestParameterizedTypes.java
new file mode 100644
index 0000000..490869e
--- /dev/null
+++ b/testData/src/pkg/TestParameterizedTypes.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public abstract class TestParameterizedTypes<P> {
+
+  public abstract class Inner<I> { }
+
+  abstract Inner<String> getUnspecificInner();
+
+  abstract TestParameterizedTypes<Number>.Inner<String> getSpecificInner();
+
+}
\ No newline at end of file

From debe6cc338fd8075df412fbdb15e82ab2ce17b7e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 29 Jun 2015 13:27:31 +0300
Subject: [PATCH 002/252] safe delete unused environment + deprecations, part 2

(follow-up to 63cae114)
---
 .../java/decompiler/main/ClassesProcessor.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index b27e343..2403836 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -148,7 +148,7 @@ public class ClassesProcessor {
         // root class?
         if (!mapInnerClasses.containsKey(ent.getKey())) {
 
-          HashSet<String> setVisited = new HashSet<String>();
+          Set<String> setVisited = new HashSet<String>();
           LinkedList<String> stack = new LinkedList<String>();
 
           stack.add(ent.getKey());
@@ -157,12 +157,12 @@ public class ClassesProcessor {
           while (!stack.isEmpty()) {
 
             String superClass = stack.removeFirst();
-            ClassNode supernode = mapRootClasses.get(superClass);
+            ClassNode superNode = mapRootClasses.get(superClass);
 
-            HashSet<String> setNestedClasses = mapNestedClassReferences.get(superClass);
+            Set<String> setNestedClasses = mapNestedClassReferences.get(superClass);
             if (setNestedClasses != null) {
 
-              StructClass scl = supernode.classStruct;
+              StructClass scl = superNode.classStruct;
               StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttributes().getWithKey("InnerClasses");
               for (int i = 0; i < inner.getStringEntries().size(); i++) {
                 String nestedClass = inner.getStringEntries().get(i)[0];
@@ -216,8 +216,8 @@ public class ClassesProcessor {
                   nestednode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
                 }
 
-                supernode.nested.add(nestednode);
-                nestednode.parent = supernode;
+                superNode.nested.add(nestednode);
+                nestednode.parent = superNode;
 
                 nestednode.enclosingClasses.addAll(mapEnclosingClassReferences.get(nestedClass));
 

From aa480480e9c90f7283fbd03c90eaec00fccacac9 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 29 Jun 2015 14:59:18 +0300
Subject: [PATCH 003/252] Cleanup (formatting; typos)

---
 .../decompiler/main/ClassesProcessor.java     | 84 +++++++++----------
 1 file changed, 39 insertions(+), 45 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 2403836..acdf656 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -47,10 +47,10 @@ public class ClassesProcessor {
 
   public ClassesProcessor(StructContext context) {
 
-    HashMap<String, Object[]> mapInnerClasses = new HashMap<String, Object[]>();
-    HashMap<String, HashSet<String>> mapNestedClassReferences = new HashMap<String, HashSet<String>>();
-    HashMap<String, HashSet<String>> mapEnclosingClassReferences = new HashMap<String, HashSet<String>>();
-    HashMap<String, String> mapNewSimpleNames = new HashMap<String, String>();
+    Map<String, Object[]> mapInnerClasses = new HashMap<String, Object[]>();
+    Map<String, Set<String>> mapNestedClassReferences = new HashMap<String, Set<String>>();
+    Map<String, Set<String>> mapEnclosingClassReferences = new HashMap<String, Set<String>>();
+    Map<String, String> mapNewSimpleNames = new HashMap<String, String>();
 
     boolean bDecompileInner = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_INNER);
 
@@ -65,18 +65,16 @@ public class ClassesProcessor {
             for (int i = 0; i < inner.getClassEntries().size(); i++) {
 
               int[] entry = inner.getClassEntries().get(i);
-              String[] strentry = inner.getStringEntries().get(i);
-
+              String[] strEntry = inner.getStringEntries().get(i);
               Object[] arr = new Object[4]; // arr[0] not used
-
-              String innername = strentry[0];
+              String innerName = strEntry[0];
 
               // nested class type
               arr[2] = entry[1] == 0 ? (entry[2] == 0 ? ClassNode.CLASS_ANONYMOUS : ClassNode.CLASS_LOCAL) : ClassNode.CLASS_MEMBER;
 
               // original simple name
-              String simpleName = strentry[2];
-              String savedName = mapNewSimpleNames.get(innername);
+              String simpleName = strEntry[2];
+              String savedName = mapNewSimpleNames.get(innerName);
 
               if (savedName != null) {
                 simpleName = savedName;
@@ -84,8 +82,8 @@ public class ClassesProcessor {
               else if (simpleName != null && DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
                 IIdentifierRenamer renamer = DecompilerContext.getPoolInterceptor().getHelper();
                 if (renamer.toBeRenamed(IIdentifierRenamer.Type.ELEMENT_CLASS, simpleName, null, null)) {
-                  simpleName = renamer.getNextClassName(innername, simpleName);
-                  mapNewSimpleNames.put(innername, simpleName);
+                  simpleName = renamer.getNextClassName(innerName, simpleName);
+                  mapNewSimpleNames.put(innerName, simpleName);
                 }
               }
 
@@ -97,36 +95,36 @@ public class ClassesProcessor {
               // enclosing class
               String enclClassName;
               if (entry[1] != 0) {
-                enclClassName = strentry[1];
+                enclClassName = strEntry[1];
               }
               else {
                 enclClassName = cl.qualifiedName;
               }
 
-              if (!innername.equals(enclClassName)) {  // self reference
+              if (!innerName.equals(enclClassName)) {  // self reference
                 StructClass enclosing_class = context.getClasses().get(enclClassName);
                 if (enclosing_class != null && enclosing_class.isOwn()) { // own classes only
 
-                  Object[] arrold = mapInnerClasses.get(innername);
-                  if (arrold == null) {
-                    mapInnerClasses.put(innername, arr);
+                  Object[] arrOld = mapInnerClasses.get(innerName);
+                  if (arrOld == null) {
+                    mapInnerClasses.put(innerName, arr);
                   }
-                  else if (!InterpreterUtil.equalObjectArrays(arrold, arr)) {
-                    String message = "Inconsistent inner class entries for " + innername + "!";
+                  else if (!InterpreterUtil.equalObjectArrays(arrOld, arr)) {
+                    String message = "Inconsistent inner class entries for " + innerName + "!";
                     DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
                   }
 
                   // reference to the nested class
-                  HashSet<String> set = mapNestedClassReferences.get(enclClassName);
+                  Set<String> set = mapNestedClassReferences.get(enclClassName);
                   if (set == null) {
                     mapNestedClassReferences.put(enclClassName, set = new HashSet<String>());
                   }
-                  set.add(innername);
+                  set.add(innerName);
 
                   // reference to the enclosing class
-                  set = mapEnclosingClassReferences.get(innername);
+                  set = mapEnclosingClassReferences.get(innerName);
                   if (set == null) {
-                    mapEnclosingClassReferences.put(innername, set = new HashSet<String>());
+                    mapEnclosingClassReferences.put(innerName, set = new HashSet<String>());
                   }
                   set.add(enclClassName);
                 }
@@ -174,8 +172,8 @@ public class ClassesProcessor {
                   continue;
                 }
 
-                ClassNode nestednode = mapRootClasses.get(nestedClass);
-                if (nestednode == null) {
+                ClassNode nestedNode = mapRootClasses.get(nestedClass);
+                if (nestedNode == null) {
                   DecompilerContext.getLogger().writeMessage("Nested class " + nestedClass + " missing!", IFernflowerLogger.Severity.WARN);
                   continue;
                 }
@@ -186,16 +184,16 @@ public class ClassesProcessor {
                   // FIXME: check for consistent naming
                 //}
 
-                nestednode.type = (Integer)arr[2];
-                nestednode.simpleName = (String)arr[1];
-                nestednode.access = (Integer)arr[3];
+                nestedNode.type = (Integer)arr[2];
+                nestedNode.simpleName = (String)arr[1];
+                nestedNode.access = (Integer)arr[3];
 
-                if (nestednode.type == ClassNode.CLASS_ANONYMOUS) {
-                  StructClass cl = nestednode.classStruct;
+                if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) {
+                  StructClass cl = nestedNode.classStruct;
 
                   // remove static if anonymous class
                   // a common compiler bug
-                  nestednode.access &= ~CodeConstants.ACC_STATIC;
+                  nestedNode.access &= ~CodeConstants.ACC_STATIC;
 
                   int[] interfaces = cl.getInterfaces();
 
@@ -204,22 +202,22 @@ public class ClassesProcessor {
                       String message = "Inconsistent anonymous class definition: " + cl.qualifiedName;
                       DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
                     }
-                    nestednode.anonymousClassType = new VarType(cl.getInterface(0), true);
+                    nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
                   }
                   else {
-                    nestednode.anonymousClassType = new VarType(cl.superClass.getString(), true);
+                    nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
                   }
                 }
-                else if (nestednode.type == ClassNode.CLASS_LOCAL) {
+                else if (nestedNode.type == ClassNode.CLASS_LOCAL) {
                   // only abstract and final are permitted
                   // a common compiler bug
-                  nestednode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
+                  nestedNode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
                 }
 
-                superNode.nested.add(nestednode);
-                nestednode.parent = superNode;
+                superNode.nested.add(nestedNode);
+                nestedNode.parent = superNode;
 
-                nestednode.enclosingClasses.addAll(mapEnclosingClassReferences.get(nestedClass));
+                nestedNode.enclosingClasses.addAll(mapEnclosingClassReferences.get(nestedClass));
 
                 stack.add(nestedClass);
               }
@@ -258,11 +256,8 @@ public class ClassesProcessor {
       TextBuffer classBuffer = new TextBuffer(AVERAGE_CLASS_SIZE);
       new ClassWriter().classToJava(root, classBuffer, 0, null);
 
-      int total_offset_lines = 0;
-
       int index = cl.qualifiedName.lastIndexOf("/");
       if (index >= 0) {
-        total_offset_lines+=2;
         String packageName = cl.qualifiedName.substring(0, index).replace('/', '.');
 
         buffer.append("package ");
@@ -275,16 +270,15 @@ public class ClassesProcessor {
       int import_lines_written = importCollector.writeImports(buffer);
       if (import_lines_written > 0) {
         buffer.appendLineSeparator();
-        total_offset_lines += import_lines_written + 1;
       }
-      //buffer.append(lineSeparator);
 
-      total_offset_lines = buffer.countLines();
+      int offsetLines = buffer.countLines();
+
       buffer.append(classBuffer);
 
       if (DecompilerContext.getOption(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING)) {
         BytecodeSourceMapper mapper = DecompilerContext.getBytecodeSourceMapper();
-        mapper.addTotalOffset(total_offset_lines);
+        mapper.addTotalOffset(offsetLines);
         if (DecompilerContext.getOption(IFernflowerPreferences.DUMP_ORIGINAL_LINES)) {
           buffer.dumpOriginalLineNumbers(mapper.getOriginalLinesMapping());
         }

From 6a802a6fc971f37b1cde2db35c97d9984c877626 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 29 Jun 2015 15:13:05 +0300
Subject: [PATCH 004/252] java-decompiler: NPE fixed

https://github.com/JetBrains/intellij-community/pull/268
---
 .../jetbrains/java/decompiler/main/ClassesProcessor.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index acdf656..5a56641 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -162,6 +162,12 @@ public class ClassesProcessor {
 
               StructClass scl = superNode.classStruct;
               StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttributes().getWithKey("InnerClasses");
+
+              if (inner == null || inner.getStringEntries().isEmpty()) {
+                DecompilerContext.getLogger().writeMessage(superClass + " does not contain inner classes!", IFernflowerLogger.Severity.WARN);
+                continue;
+              }
+
               for (int i = 0; i < inner.getStringEntries().size(); i++) {
                 String nestedClass = inner.getStringEntries().get(i)[0];
                 if (!setNestedClasses.contains(nestedClass)) {

From 9a06c52a8f8a3b2c361e8a006d53cd5f7ae86766 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 24 Aug 2015 17:51:52 +0200
Subject: [PATCH 005/252] move hamcrest-library to hamcrest lib

---
 java-decompiler-engine.iml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java-decompiler-engine.iml b/java-decompiler-engine.iml
index d56249d..5880ebf 100644
--- a/java-decompiler-engine.iml
+++ b/java-decompiler-engine.iml
@@ -9,5 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
   </component>
 </module>
\ No newline at end of file

From aab87019efe1249352e0c45f58a8d28aa8732164 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 7 Sep 2015 19:23:12 +0300
Subject: [PATCH 006/252] [java-decompiler] common file comparison method
 extracted; test data updated

---
 .../decompiler/BulkDecompilationTest.java     | 21 ++-------
 .../decompiler/DecompilerTestFixture.java     | 27 +++++++++++-
 .../decompiler/SingleClassesTestBase.java     | 43 ++++++-------------
 testData/bulk/META-INF/MANIFEST.MF            |  3 ++
 testData/bulk/pkg/Main.java                   | 11 +++++
 testData/bulk/pkg/res/Loader.java             | 25 +++++++++++
 6 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
index 1b5353b..0211a57 100644
--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+++ b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.java.decompiler;
 
-import org.hamcrest.Matchers;
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.junit.After;
@@ -27,7 +26,7 @@ import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.junit.Assert.assertThat;
+import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
 import static org.junit.Assert.assertTrue;
 
 public class BulkDecompilationTest {
@@ -54,7 +53,7 @@ public class BulkDecompilationTest {
     decompiler.addSpace(classes, true);
     decompiler.decompileContext();
 
-    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
+    assertFilesEqual(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
   }
 
   @Test
@@ -66,7 +65,7 @@ public class BulkDecompilationTest {
     File unpacked = new File(fixture.getTempDir(), "unpacked");
     unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
 
-    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
+    assertFilesEqual(new File(fixture.getTestDataDir(), "bulk"), unpacked);
   }
 
   private static void unpack(File archive, File targetDir) {
@@ -95,16 +94,4 @@ public class BulkDecompilationTest {
       throw new RuntimeException(e);
     }
   }
-
-  private static void compareDirectories(File expected, File actual) {
-    String[] expectedList = expected.list();
-    String[] actualList = actual.list();
-    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
-    for (String name : expectedList) {
-      File child = new File(expected, name);
-      if (child.isDirectory()) {
-        compareDirectories(child, new File(actual, name));
-      }
-    }
-  }
 }
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index d0d869c..ad36548 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,10 @@
  */
 package org.jetbrains.java.decompiler;
 
+import org.hamcrest.Matchers;
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,6 +26,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class DecompilerTestFixture {
@@ -43,6 +46,7 @@ public class DecompilerTestFixture {
     if (!isTestDataDir(testDataDir)) testDataDir = new File("../community/plugins/java-decompiler/engine/testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("../plugins/java-decompiler/engine/testData");
     assertTrue("current dir: " + new File("").getAbsolutePath(), isTestDataDir(testDataDir));
+    testDataDir = testDataDir.getAbsoluteFile();
 
     //noinspection SSBasedInspection
     tempDir = File.createTempFile("decompiler_test_", "_dir");
@@ -96,4 +100,25 @@ public class DecompilerTestFixture {
     }
     assertTrue(file.delete());
   }
+
+  public static void assertFilesEqual(File expected, File actual) {
+    if (expected.isDirectory()) {
+      assertThat(actual.list(), Matchers.arrayContainingInAnyOrder(expected.list()));
+      for (String name : expected.list()) {
+        assertFilesEqual(new File(expected, name), new File(actual, name));
+      }
+    }
+    else {
+      assertThat(getContent(actual), Matchers.equalTo(getContent(expected)));
+    }
+  }
+
+  private static String getContent(File expected) {
+    try {
+      return new String(InterpreterUtil.getBytes(expected), "UTF-8").replace("\r\n", "\n");
+    }
+    catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
 }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
index 165f695..97e98b2 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.junit.After;
 import org.junit.Before;
 
@@ -28,7 +27,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
 import static org.junit.Assert.assertTrue;
 
 public abstract class SingleClassesTestBase {
@@ -51,25 +50,20 @@ public abstract class SingleClassesTestBase {
   }
 
   protected void doTest(String testFile) {
-    try {
-      File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
-      assertTrue(classFile.isFile());
-      String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
+    File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
+    assertTrue(classFile.isFile());
+    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
 
-      ConsoleDecompiler decompiler = fixture.getDecompiler();
+    ConsoleDecompiler decompiler = fixture.getDecompiler();
 
-      for (File file : collectClasses(classFile)) decompiler.addSpace(file, true);
-      decompiler.decompileContext();
+    for (File file : collectClasses(classFile)) decompiler.addSpace(file, true);
+    decompiler.decompileContext();
 
-      File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
-      assertTrue(decompiledFile.isFile());
-      File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
-      assertTrue(referenceFile.isFile());
-      compareContent(decompiledFile, referenceFile);
-    }
-    catch (Exception e) {
-      throw new RuntimeException(e);
-    }
+    File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
+    assertTrue(decompiledFile.isFile());
+    File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
+    assertTrue(referenceFile.isFile());
+    assertFilesEqual(referenceFile, decompiledFile);
   }
 
   private static List<File> collectClasses(File classFile) {
@@ -90,15 +84,4 @@ public abstract class SingleClassesTestBase {
 
     return files;
   }
-
-  private static void compareContent(File decompiledFile, File referenceFile) throws IOException {
-    String decompiledContent = new String(InterpreterUtil.getBytes(decompiledFile), "UTF-8");
-
-    String referenceContent = new String(InterpreterUtil.getBytes(referenceFile), "UTF-8");
-    if (InterpreterUtil.IS_WINDOWS && !referenceContent.contains("\r\n")) {
-      referenceContent = referenceContent.replace("\n", "\r\n");  // fix for broken Git checkout on Windows
-    }
-
-    assertEquals(referenceContent, decompiledContent);
-  }
 }
diff --git a/testData/bulk/META-INF/MANIFEST.MF b/testData/bulk/META-INF/MANIFEST.MF
index e69de29..22f53c8 100644
--- a/testData/bulk/META-INF/MANIFEST.MF
+++ b/testData/bulk/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: 1.8.0_20 (Oracle Corporation)
+
diff --git a/testData/bulk/pkg/Main.java b/testData/bulk/pkg/Main.java
index e69de29..f22c5d2 100644
--- a/testData/bulk/pkg/Main.java
+++ b/testData/bulk/pkg/Main.java
@@ -0,0 +1,11 @@
+package pkg;
+
+import pkg.res.Loader;
+
+public class Main {
+   public static void main(String[] args) {
+      Loader loader = new Loader();
+      String resource = loader.getResource();
+      System.out.println(resource);
+   }
+}
diff --git a/testData/bulk/pkg/res/Loader.java b/testData/bulk/pkg/res/Loader.java
index e69de29..b0326dd 100644
--- a/testData/bulk/pkg/res/Loader.java
+++ b/testData/bulk/pkg/res/Loader.java
@@ -0,0 +1,25 @@
+package pkg.res;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+public class Loader {
+   public String getResource() {
+      URL resource = this.getClass().getClassLoader().getResource("pkg/res/resource.txt");
+      if(resource == null) {
+         throw new RuntimeException("Resource missing");
+      } else {
+         try {
+            File e = new File(resource.toURI());
+            byte[] bytes = new byte[(int)e.length()];
+            FileInputStream stream = new FileInputStream(e);
+            stream.read(bytes);
+            stream.close();
+            return new String(bytes, "UTF-8");
+         } catch (Exception var5) {
+            throw new RuntimeException("Resource load failed", var5);
+         }
+      }
+   }
+}

From ee740aa05628856906e4b1b25f84d6cbb8cd3d9c Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 7 Sep 2015 20:34:28 +0300
Subject: [PATCH 007/252] [java-decompiler] main test method extended to accept
 companion files

---
 .../decompiler/SingleClassesTestBase.java     | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
index 97e98b2..0601f0e 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
@@ -49,16 +49,26 @@ public abstract class SingleClassesTestBase {
     return Collections.emptyMap();
   }
 
-  protected void doTest(String testFile) {
-    File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
-    assertTrue(classFile.isFile());
-    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
-
+  protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
 
-    for (File file : collectClasses(classFile)) decompiler.addSpace(file, true);
+    File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
+    assertTrue(classFile.isFile());
+    for (File file : collectClasses(classFile)) {
+      decompiler.addSpace(file, true);
+    }
+
+    for (String companionFile : companionFiles) {
+      File companionClassFile = new File(fixture.getTestDataDir(), "/classes/" + companionFile + ".class");
+      assertTrue(companionClassFile.isFile());
+      for (File file : collectClasses(companionClassFile)) {
+        decompiler.addSpace(file, true);
+      }
+    }
+
     decompiler.decompileContext();
 
+    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
     File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
     assertTrue(decompiledFile.isFile());
     File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");

From 766fc1390d833f1694f67dccc40c99033b88e452 Mon Sep 17 00:00:00 2001
From: Alexandru-Constantin Bledea <admin@notbed.com>
Date: Mon, 7 Sep 2015 20:44:51 +0300
Subject: [PATCH 008/252] Decompiler name shadowing resolution

https://github.com/JetBrains/intellij-community/pull/295
---
 .../main/collectors/ImportCollector.java          |   3 ++-
 .../java/decompiler/SingleClassesTest.java        |   1 +
 testData/classes/ext/Shadow$B.class               | Bin 0 -> 243 bytes
 testData/classes/ext/Shadow.class                 | Bin 0 -> 243 bytes
 testData/classes/pkg/Shadow.class                 | Bin 0 -> 190 bytes
 testData/classes/pkg/TestShadowing.class          | Bin 0 -> 342 bytes
 testData/results/TestShadowing.dec                |   6 ++++++
 testData/src/ext/Shadow.java                      |   6 ++++++
 testData/src/pkg/Shadow.java                      |   4 ++++
 testData/src/pkg/TestShadowing.java               |   5 +++++
 10 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 testData/classes/ext/Shadow$B.class
 create mode 100644 testData/classes/ext/Shadow.class
 create mode 100644 testData/classes/pkg/Shadow.class
 create mode 100644 testData/classes/pkg/TestShadowing.class
 create mode 100644 testData/results/TestShadowing.dec
 create mode 100644 testData/src/ext/Shadow.java
 create mode 100644 testData/src/pkg/Shadow.java
 create mode 100644 testData/src/pkg/TestShadowing.java

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 05dc835..ada6abc 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -99,7 +99,8 @@ public class ImportCollector {
 
     if (existsDefaultClass ||
         (mapSimpleNames.containsKey(nshort) && !npackage.equals(mapSimpleNames.get(nshort)))) {
-      return fullname;
+      //  don't return full name because if the class is a inner class, full name refers to the parent full name, not the child full name
+      return retname == null ? fullname : (npackage + "." + retname);
     }
     else if (!mapSimpleNames.containsKey(nshort)) {
       mapSimpleNames.put(nshort, npackage);
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index e85cd67..0da0d3b 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -61,4 +61,5 @@ public class SingleClassesTest extends SingleClassesTestBase {
   @Test public void testInnerLocalPkg() { doTest("pkg/TestInnerLocalPkg"); }
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
   @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
+  @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
 }
diff --git a/testData/classes/ext/Shadow$B.class b/testData/classes/ext/Shadow$B.class
new file mode 100644
index 0000000000000000000000000000000000000000..eeb9d384874454df5be278d03747e9da23ae6fa6
GIT binary patch
literal 243
zcmYLD%?`m}5S%S-siGdhLE?aeUL3`NL?RIm75A@vp;BLy{@}HoBn}?HLy2u2Y_dC<
znapJ0pXUp}2rUaGSSD-}O@c8FRFF;xrCxtaD9@t3Bs7<SlB?|O%XlOFkQK{|vUn%w
zK~8GkQS77Z@FXt6Mj5&ZhhWQF>i(SWlt8@pLMa)~LXjjgAvk%!4TU<mYyTv7Dfj+E
s=s@Gw^5Jw|%hzDmE;yhM9-w<+n|uwHS>#ZKQ9~6CMvGMqHPli40_$KbJOBUy

literal 0
HcmV?d00001

diff --git a/testData/classes/ext/Shadow.class b/testData/classes/ext/Shadow.class
new file mode 100644
index 0000000000000000000000000000000000000000..e576dfd9b0fdfd1b1feffd31f52d1a42bb23e849
GIT binary patch
literal 243
zcmYL@%?`m(5QWcZDOG<DU?H)<LN}ITQHew%EGqW5bwj0YleT_d%SvM50X&qL%fc+q
z<a{Ud^Ljs?07hupFi^8lx6rWAB#=jN=1R$Q8jCEG8KE?eRFqE$Mz6minA2n{35`Xh
z<nnY3WV#kX%*6JSQyR)yq)pY|i*0fl9>iHVuu$e)UUT<{2~8ciu~0jA6&z%k^Vxsi
s_0U0qU(>};=>@D6cI~eRii11o_Kj`U5@W#Rp(^(R943IxRI?%~AJWb&K>z>%

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/Shadow.class b/testData/classes/pkg/Shadow.class
new file mode 100644
index 0000000000000000000000000000000000000000..61ed27b36a1d424dc1237961c416e6f9a4490b12
GIT binary patch
literal 190
zcmX^0Z`VEs1_l!bUM>b^1}=66ZgvJ9Mg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;|
zRKL>Pq|~C2#H1Xc2v=}^X;E^jTPBFZ9h{Mvl3%Wul~|U@!@$D83Y0I%PS=MBGcpK(
zB=mC<^V0SGld@8iOBfUxn1Hr|03#3rbpS~=AWs&|XJBB}+RnhZ5iHFPB-wz%3_xX!
L3>-k3iGdRUsiz`b

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestShadowing.class b/testData/classes/pkg/TestShadowing.class
new file mode 100644
index 0000000000000000000000000000000000000000..228fd8f7571f13eb43fd7fd3d86211b334142ec8
GIT binary patch
literal 342
zcmY*V%Syvg5IvK`#H6uJ>T~JBg%&XzcZ!P^1fkePi{SDmy~bPPO-WMqw_Hd;!4L4G
z#7Pv?#SCX2=Nx7}K40Gf9An3WjnKim2Lqvt6>K=zbg)HeDP2}VCvtStClH5!p|vaq
znJ7zH652!gR7K-kG0h+M`X>bYRB2V65zPIAD}pu1r;^YaDlIP;_pvM{BF?zujq^p3
z$a7T}-H9x#ZxN-_qnUURK3eb{Y_sEE2OkbRLO8!mqkkkqP}8DJ=rkI|GnrIu@=L`o
z-(~Z?#K9Urh)uY&#?>LrW)}38pxzsd>m|$=SkKL7n{)jh@Rr3&20Dxl1aO-PG45g&
F?iW35LgoMf

literal 0
HcmV?d00001

diff --git a/testData/results/TestShadowing.dec b/testData/results/TestShadowing.dec
new file mode 100644
index 0000000..45adbea
--- /dev/null
+++ b/testData/results/TestShadowing.dec
@@ -0,0 +1,6 @@
+package pkg;
+
+class TestShadowing {
+   ext.Shadow.B instanceOfB = new ext.Shadow.B();
+}
+
diff --git a/testData/src/ext/Shadow.java b/testData/src/ext/Shadow.java
new file mode 100644
index 0000000..02869ca
--- /dev/null
+++ b/testData/src/ext/Shadow.java
@@ -0,0 +1,6 @@
+package ext;
+
+// companion class for pkg/TestShadowing.java
+public class Shadow {
+  public static class B { }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/Shadow.java b/testData/src/pkg/Shadow.java
new file mode 100644
index 0000000..d76fb78
--- /dev/null
+++ b/testData/src/pkg/Shadow.java
@@ -0,0 +1,4 @@
+package pkg;
+
+// companion class for pkg/TestShadowing.java
+public class Shadow { }
\ No newline at end of file
diff --git a/testData/src/pkg/TestShadowing.java b/testData/src/pkg/TestShadowing.java
new file mode 100644
index 0000000..c8792b2
--- /dev/null
+++ b/testData/src/pkg/TestShadowing.java
@@ -0,0 +1,5 @@
+package pkg;
+
+class TestShadowing {
+  ext.Shadow.B instanceOfB = new ext.Shadow.B();
+}
\ No newline at end of file

From 810818e2c328070ba0968b70277c05f244ab749a Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 7 Sep 2015 23:04:43 +0300
Subject: [PATCH 009/252] [java-decompiler] Ant tests in forked VM

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 9f4c208..7986eb4 100644
--- a/build.xml
+++ b/build.xml
@@ -46,7 +46,7 @@
   </target>
 
   <target name="test" depends="init,test-compile">
-    <junit printsummary="true" failureproperty="tests.failed">
+    <junit printsummary="true" failureproperty="tests.failed" fork="true">
       <classpath path="${test-out}:${out}"/>
       <classpath refid="junit"/>
       <batchtest>

From 26ab681d56eb73ed71264463e2052d3642682431 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 9 Nov 2015 20:46:35 +0100
Subject: [PATCH 010/252] [java-decompiler] cleanup (text rearranging mode
 dropped)

---
 .../java/decompiler/main/ClassWriter.java     |  39 ------------------
 .../decompiler/main/DecompilerContext.java    |   2 +-
 .../java/decompiler/main/TextBuffer.java      |  18 +-------
 .../main/extern/IFernflowerPreferences.java   |   6 +--
 .../java/decompiler/LineNumbersMatchTest.java |  33 ---------------
 .../classes/pkg/TestLineNumbersMatch.class    | Bin 783 -> 0 bytes
 testData/results/TestLineNumbersMatch.dec     |  22 ----------
 testData/src/pkg/TestLineNumbersMatch.java    |  22 ----------
 8 files changed, 5 insertions(+), 137 deletions(-)
 delete mode 100644 test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java
 delete mode 100644 testData/classes/pkg/TestLineNumbersMatch.class
 delete mode 100644 testData/results/TestLineNumbersMatch.dec
 delete mode 100644 testData/src/pkg/TestLineNumbersMatch.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index afa2473..f84e05c 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -835,9 +835,6 @@ public class ClassWriter {
         // We do not have line information for method start, lets have it here for now
         StructLineNumberTableAttribute lineNumberTable =
           (StructLineNumberTableAttribute)mt.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
-        if (lineNumberTable != null && DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS)) {
-          buffer.setCurrentLine(lineNumberTable.getFirstLine() - 1);
-        }
         buffer.append('{').appendLineSeparator();
         tracer.incrementCurrentSourceLine();
 
@@ -851,10 +848,6 @@ public class ClassWriter {
 
             hideMethod = (clinit || dinit || hideConstructor(wrapper, init, throwsExceptions, paramCount)) && code.length() == 0;
 
-            if (!hideMethod && lineNumberTable != null && DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS)) {
-              mapLines(code, lineNumberTable, tracer, startLine);
-            }
-
             buffer.append(code);
           }
           catch (Throwable ex) {
@@ -888,38 +881,6 @@ public class ClassWriter {
     return !hideMethod;
   }
 
-  private static void mapLines(TextBuffer code, StructLineNumberTableAttribute table, BytecodeMappingTracer tracer, int startLine) {
-    // build line start offsets map
-    HashMap<Integer, Set<Integer>> lineStartOffsets = new HashMap<Integer, Set<Integer>>();
-    for (Map.Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
-      Integer lineNumber = entry.getValue() - startLine;
-      Set<Integer> curr = lineStartOffsets.get(lineNumber);
-      if (curr == null) {
-        curr = new TreeSet<Integer>(); // requires natural sorting!
-      }
-      curr.add(entry.getKey());
-      lineStartOffsets.put(lineNumber, curr);
-    }
-    String lineSeparator = DecompilerContext.getNewLineSeparator();
-    StringBuilder text = code.getOriginalText();
-    int pos = text.indexOf(lineSeparator);
-    int lineNumber = 0;
-    while (pos != -1) {
-      Set<Integer> startOffsets = lineStartOffsets.get(lineNumber);
-      if (startOffsets != null) {
-        for (Integer offset : startOffsets) {
-          int number = table.findLineNumber(offset);
-          if (number >= 0) {
-            code.setLineMapping(number, pos);
-            break;
-          }
-        }
-      }
-      pos = text.indexOf(lineSeparator, pos+1);
-      lineNumber++;
-    }
-  }
-
   private static boolean hideConstructor(ClassWrapper wrapper, boolean init, boolean throwsExceptions, int paramCount) {
     if (!init || throwsExceptions || paramCount > 0 || !DecompilerContext.getOption(IFernflowerPreferences.HIDE_DEFAULT_CONSTRUCTOR)) {
       return false;
diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
index 15c6e40..d105959 100644
--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -156,6 +156,6 @@ public class DecompilerContext {
 
   public static String getNewLineSeparator() {
     return getOption(IFernflowerPreferences.NEW_LINE_SEPARATOR) ?
-           IFernflowerPreferences.LINE_SEPARATOR_LIN : IFernflowerPreferences.LINE_SEPARATOR_WIN;
+           IFernflowerPreferences.LINE_SEPARATOR_UNX : IFernflowerPreferences.LINE_SEPARATOR_WIN;
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/main/TextBuffer.java b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
index 95afc50..952b26f 100644
--- a/src/org/jetbrains/java/decompiler/main/TextBuffer.java
+++ b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
@@ -42,17 +42,6 @@ public class TextBuffer {
     myStringBuilder = new StringBuilder(text);
   }
 
-  public void setCurrentLine(int line) {
-    setLineMapping(line, myStringBuilder.length()+1);
-  }
-
-  public void setLineMapping(int line, int offset) {
-    if (line >= 0) {
-      checkMapCreated();
-      myLineToOffsetMapping.put(line, offset);
-    }
-  }
-
   public TextBuffer append(String str) {
     myStringBuilder.append(str);
     return this;
@@ -301,15 +290,12 @@ public class TextBuffer {
     return res;
   }
 
-  public StringBuilder getOriginalText() {
-    return myStringBuilder;
-  }
-
   private Map<Integer, Set<Integer>> myLineMapping = null; // new to original
+
   public void dumpOriginalLineNumbers(int[] lineMapping) {
     if (lineMapping.length > 0) {
       myLineMapping = new HashMap<Integer, Set<Integer>>();
-      for (int i = 0; i < lineMapping.length; i+=2) {
+      for (int i = 0; i < lineMapping.length; i += 2) {
         int key = lineMapping[i + 1];
         Set<Integer> existing = myLineMapping.get(key);
         if (existing == null) {
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 31871c5..cd6333b 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,6 @@ public interface IFernflowerPreferences {
   String IDEA_NOT_NULL_ANNOTATION = "inn";
   String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
   String BYTECODE_SOURCE_MAPPING = "bsm";
-  String USE_DEBUG_LINE_NUMBERS = "udl";
 
   String LOG_LEVEL = "log";
   String MAX_PROCESSING_METHOD = "mpm";
@@ -58,7 +57,7 @@ public interface IFernflowerPreferences {
   String UNIT_TEST_MODE = "__unit_test_mode__";
 
   String LINE_SEPARATOR_WIN = "\r\n";
-  String LINE_SEPARATOR_LIN = "\n";
+  String LINE_SEPARATOR_UNX = "\n";
 
   Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
     put(REMOVE_BRIDGE, "1");
@@ -83,7 +82,6 @@ public interface IFernflowerPreferences {
     put(IDEA_NOT_NULL_ANNOTATION, "1");
     put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
     put(BYTECODE_SOURCE_MAPPING, "0");
-    put(USE_DEBUG_LINE_NUMBERS, "0");
 
     put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
     put(MAX_PROCESSING_METHOD, "0");
diff --git a/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java b/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java
deleted file mode 100644
index 758aa5f..0000000
--- a/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler;
-
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class LineNumbersMatchTest extends SingleClassesTestBase {
-  @Override
-  protected Map<String, Object> getDecompilerOptions() {
-    return new HashMap<String, Object>() {{
-      put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
-    }};
-  }
-
-  @Test public void testMatch1() { doTest("pkg/TestLineNumbersMatch"); }
-}
diff --git a/testData/classes/pkg/TestLineNumbersMatch.class b/testData/classes/pkg/TestLineNumbersMatch.class
deleted file mode 100644
index 0a96fbb25cd9a20f3938d8843fb61aa153bed8e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 783
zcmZ{i-%iv(6vn@4OS@ajE-o%CApS)ys5I!E7;i{SOcpg+LLzt5I#~++vuV2~K8jD^
zwO(MNi4WjI8NcanKofS7nRDjM`F?YHroaFE_yyn@0v9fBG_ir34cu~Z8+RI5c5v5)
zjeC08ba3Cn0|5wlud_@Q`-v<|RSMWI;w-LS3Yh-Zk$|<Ie^3JLew?W{<1|#op$rp7
zI{iG7$&oB#y`KiH>Ley(tv@;&28XJwE@kC`tfG@W0VCZd)<4#C5po_2EDS0cogK*0
zlw+h%1>8YCE+X|R*4M3GMcX-*AEk!{v>ZJ2;A4w8>0sN#BRpmuv&z`q)v6~RcF+>&
z%}Ntk)Hei)%!a|+@Ki<Bf1$yrvQjBqm5+JQ?bpe19=t2!tQu5>k|{rU>58y`Gtx;(
zMx8$q*0)d<XTv?+oDF|=8}+$aj5EG%laH;3$;nReMcecOT0Sr4w!cGsrDI@`t6c|e
zT%+$z641dCcffUY8PVd9*#>QI{WDtMV06rLSYI%&-8s6NXV$z9Ecy+uO)BTHLaJsj
zPxKe;9wRHH_jqQ(Xgjp47sWm&O&9C^g#DfcJLhOz*6h|SP4E6ww>M=QSfkRwI&TJB
J!9SRm<1ah8l>`6)

diff --git a/testData/results/TestLineNumbersMatch.dec b/testData/results/TestLineNumbersMatch.dec
deleted file mode 100644
index 9ab7626..0000000
--- a/testData/results/TestLineNumbersMatch.dec
+++ /dev/null
@@ -1,22 +0,0 @@
-package pkg;
-
-class TestLineNumbersMatch {
-
-
-
-   void m1(boolean b) {
-      if(b) {
-         System.out.println("a");
-      } else {
-         System.out.println("b");
-      }   }
-
-   void m2() {
-      (new Runnable() {
-
-         public void run() {
-            System.out.println("run with me");
-         }
-      }).run();
-   }
-}
diff --git a/testData/src/pkg/TestLineNumbersMatch.java b/testData/src/pkg/TestLineNumbersMatch.java
deleted file mode 100644
index d9d486a..0000000
--- a/testData/src/pkg/TestLineNumbersMatch.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Weird comment here.
- */
-package pkg;
-
-class TestLineNumbersMatch {
-  void m1(boolean b) {
-    if (b)
-      System.out.println("a");
-    else
-      System.out.println("b");
-  }
-
-  void m2() {
-    new Runnable() {
-      @Override
-      public void run() {
-        System.out.println("run with me");
-      }
-    }.run();
-  }
-}
\ No newline at end of file

From 45a41684e6dc257808615b35841f617cea926f72 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 10 Nov 2015 19:48:44 +0100
Subject: [PATCH 011/252] [java-decompiler] cleanup (arrays to data classes;
 formatting; typos; dead code)

---
 .../java/decompiler/main/ClassWriter.java     |  29 +-
 .../decompiler/main/ClassesProcessor.java     |  78 +-
 .../collectors/BytecodeMappingTracer.java     |  12 +-
 .../main/rels/NestedClassProcessor.java       | 720 ++++++++----------
 .../modules/decompiler/exps/NewExprent.java   | 223 +++---
 .../attr/StructInnerClassesAttribute.java     |  62 +-
 .../java/decompiler/util/InterpreterUtil.java |  25 +-
 7 files changed, 500 insertions(+), 649 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index f84e05c..b55f29d 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -46,7 +46,6 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import java.util.*;
 
 public class ClassWriter {
-
   private final ClassReference14Processor ref14processor;
   private final PoolInterceptor interceptor;
 
@@ -154,15 +153,6 @@ public class ClassWriter {
     DecompilerContext.getLogger().endWriteClass();
   }
 
-  private static void addTracer(StructClass cls, StructMethod method, BytecodeMappingTracer tracer) {
-    StructLineNumberTableAttribute lineNumberTable =
-      (StructLineNumberTableAttribute)method.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
-    tracer.setLineNumberTable(lineNumberTable);
-    DecompilerContext.getBytecodeSourceMapper().addTracer(cls.qualifiedName,
-                                                          InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor()),
-                                                          tracer);
-  }
-
   public void classToJava(ClassNode node, TextBuffer buffer, int indent, BytecodeMappingTracer tracer) {
     ClassNode outerNode = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_NODE, node);
@@ -183,12 +173,7 @@ public class ClassWriter {
       int start_class_def = buffer.length();
       writeClassDefinition(node, buffer, indent);
 
-//      // count lines in class definition the easiest way
-//      startLine = buffer.substring(start_class_def).toString().split(lineSeparator, -1).length - 1;
-
       boolean hasContent = false;
-
-      // fields
       boolean enumFields = false;
 
       dummy_tracer.incrementCurrentSourceLine(buffer.countLines(start_class_def));
@@ -287,6 +272,13 @@ public class ClassWriter {
     DecompilerContext.getLogger().endWriteClass();
   }
 
+  private static void addTracer(StructClass cls, StructMethod method, BytecodeMappingTracer tracer) {
+    StructLineNumberTableAttribute table = (StructLineNumberTableAttribute)method.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
+    tracer.setLineNumberTable(table);
+    String key = InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor());
+    DecompilerContext.getBytecodeSourceMapper().addTracer(cls.qualifiedName, key, tracer);
+  }
+
   private void writeClassDefinition(ClassNode node, TextBuffer buffer, int indent) {
     if (node.type == ClassNode.CLASS_ANONYMOUS) {
       buffer.append(" {").appendLineSeparator();
@@ -567,7 +559,7 @@ public class ClassWriter {
     }
   }
 
-  public static String toValidJavaIdentifier(String name) {
+  private static String toValidJavaIdentifier(String name) {
     if (name == null || name.isEmpty()) return name;
 
     boolean changed = false;
@@ -833,8 +825,6 @@ public class ClassWriter {
         }
 
         // We do not have line information for method start, lets have it here for now
-        StructLineNumberTableAttribute lineNumberTable =
-          (StructLineNumberTableAttribute)mt.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
         buffer.append('{').appendLineSeparator();
         tracer.incrementCurrentSourceLine();
 
@@ -842,8 +832,6 @@ public class ClassWriter {
 
         if (root != null && !methodWrapper.decompiledWithErrors) { // check for existence
           try {
-            int startLine = tracer.getCurrentSourceLine();
-
             TextBuffer code = root.toJava(indent + 1, tracer);
 
             hideMethod = (clinit || dinit || hideConstructor(wrapper, init, throwsExceptions, paramCount)) && code.length() == 0;
@@ -960,7 +948,6 @@ public class ClassWriter {
     StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS};
 
   private static void appendAnnotations(TextBuffer buffer, StructMember mb, int indent) {
-
     BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one
 
     for (String name : ANNOTATION_ATTRIBUTES) {
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 5a56641..17331e9 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -40,14 +40,22 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class ClassesProcessor {
-
   public static final int AVERAGE_CLASS_SIZE = 16 * 1024;
 
   private final Map<String, ClassNode> mapRootClasses = new HashMap<String, ClassNode>();
 
-  public ClassesProcessor(StructContext context) {
+  private static class Inner {
+    private String simpleName;
+    private int type;
+    private int accessFlags;
 
-    Map<String, Object[]> mapInnerClasses = new HashMap<String, Object[]>();
+    private static boolean equal(Inner o1, Inner o2) {
+      return o1.type == o2.type && o1.accessFlags == o2.accessFlags && InterpreterUtil.equalObjects(o1.simpleName, o2.simpleName);
+    }
+  }
+
+  public ClassesProcessor(StructContext context) {
+    Map<String, Inner> mapInnerClasses = new HashMap<String, Inner>();
     Map<String, Set<String>> mapNestedClassReferences = new HashMap<String, Set<String>>();
     Map<String, Set<String>> mapEnclosingClassReferences = new HashMap<String, Set<String>>();
     Map<String, String> mapNewSimpleNames = new HashMap<String, String>();
@@ -57,25 +65,16 @@ public class ClassesProcessor {
     // create class nodes
     for (StructClass cl : context.getClasses().values()) {
       if (cl.isOwn() && !mapRootClasses.containsKey(cl.qualifiedName)) {
-
         if (bDecompileInner) {
           StructInnerClassesAttribute inner = (StructInnerClassesAttribute)cl.getAttributes().getWithKey("InnerClasses");
+
           if (inner != null) {
-
-            for (int i = 0; i < inner.getClassEntries().size(); i++) {
-
-              int[] entry = inner.getClassEntries().get(i);
-              String[] strEntry = inner.getStringEntries().get(i);
-              Object[] arr = new Object[4]; // arr[0] not used
-              String innerName = strEntry[0];
-
-              // nested class type
-              arr[2] = entry[1] == 0 ? (entry[2] == 0 ? ClassNode.CLASS_ANONYMOUS : ClassNode.CLASS_LOCAL) : ClassNode.CLASS_MEMBER;
+            for (StructInnerClassesAttribute.Entry entry : inner.getEntries()) {
+              String innerName = entry.innerName;
 
               // original simple name
-              String simpleName = strEntry[2];
+              String simpleName = entry.simpleName;
               String savedName = mapNewSimpleNames.get(innerName);
-
               if (savedName != null) {
                 simpleName = savedName;
               }
@@ -87,15 +86,15 @@ public class ClassesProcessor {
                 }
               }
 
-              arr[1] = simpleName;
-
-              // original access flags
-              arr[3] = entry[3];
+              Inner rec = new Inner();
+              rec.simpleName = simpleName;
+              rec.type = entry.outerNameIdx != 0 ? ClassNode.CLASS_MEMBER : entry.simpleNameIdx != 0 ? ClassNode.CLASS_LOCAL : ClassNode.CLASS_ANONYMOUS;
+              rec.accessFlags = entry.accessFlags;
 
               // enclosing class
               String enclClassName;
-              if (entry[1] != 0) {
-                enclClassName = strEntry[1];
+              if (entry.outerNameIdx != 0) {
+                enclClassName = entry.enclosingName;
               }
               else {
                 enclClassName = cl.qualifiedName;
@@ -105,11 +104,11 @@ public class ClassesProcessor {
                 StructClass enclosing_class = context.getClasses().get(enclClassName);
                 if (enclosing_class != null && enclosing_class.isOwn()) { // own classes only
 
-                  Object[] arrOld = mapInnerClasses.get(innerName);
-                  if (arrOld == null) {
-                    mapInnerClasses.put(innerName, arr);
+                  Inner existingRec = mapInnerClasses.get(innerName);
+                  if (existingRec == null) {
+                    mapInnerClasses.put(innerName, rec);
                   }
-                  else if (!InterpreterUtil.equalObjectArrays(arrOld, arr)) {
+                  else if (!Inner.equal(existingRec, rec)) {
                     String message = "Inconsistent inner class entries for " + innerName + "!";
                     DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
                   }
@@ -140,12 +139,10 @@ public class ClassesProcessor {
     }
 
     if (bDecompileInner) {
-
       // connect nested classes
       for (Entry<String, ClassNode> ent : mapRootClasses.entrySet()) {
         // root class?
         if (!mapInnerClasses.containsKey(ent.getKey())) {
-
           Set<String> setVisited = new HashSet<String>();
           LinkedList<String> stack = new LinkedList<String>();
 
@@ -153,7 +150,6 @@ public class ClassesProcessor {
           setVisited.add(ent.getKey());
 
           while (!stack.isEmpty()) {
-
             String superClass = stack.removeFirst();
             ClassNode superNode = mapRootClasses.get(superClass);
 
@@ -163,13 +159,13 @@ public class ClassesProcessor {
               StructClass scl = superNode.classStruct;
               StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttributes().getWithKey("InnerClasses");
 
-              if (inner == null || inner.getStringEntries().isEmpty()) {
+              if (inner == null || inner.getEntries().isEmpty()) {
                 DecompilerContext.getLogger().writeMessage(superClass + " does not contain inner classes!", IFernflowerLogger.Severity.WARN);
                 continue;
               }
 
-              for (int i = 0; i < inner.getStringEntries().size(); i++) {
-                String nestedClass = inner.getStringEntries().get(i)[0];
+              for (StructInnerClassesAttribute.Entry entry : inner.getEntries()) {
+                String nestedClass = entry.innerName;
                 if (!setNestedClasses.contains(nestedClass)) {
                   continue;
                 }
@@ -184,21 +180,20 @@ public class ClassesProcessor {
                   continue;
                 }
 
-                Object[] arr = mapInnerClasses.get(nestedClass);
+                Inner rec = mapInnerClasses.get(nestedClass);
 
                 //if ((Integer)arr[2] == ClassNode.CLASS_MEMBER) {
                   // FIXME: check for consistent naming
                 //}
 
-                nestedNode.type = (Integer)arr[2];
-                nestedNode.simpleName = (String)arr[1];
-                nestedNode.access = (Integer)arr[3];
+                nestedNode.simpleName = rec.simpleName;
+                nestedNode.type = rec.type;
+                nestedNode.access = rec.accessFlags;
 
                 if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) {
                   StructClass cl = nestedNode.classStruct;
 
-                  // remove static if anonymous class
-                  // a common compiler bug
+                  // remove static if anonymous class (a common compiler bug)
                   nestedNode.access &= ~CodeConstants.ACC_STATIC;
 
                   int[] interfaces = cl.getInterfaces();
@@ -215,8 +210,7 @@ public class ClassesProcessor {
                   }
                 }
                 else if (nestedNode.type == ClassNode.CLASS_LOCAL) {
-                  // only abstract and final are permitted
-                  // a common compiler bug
+                  // only abstract and final are permitted (a common compiler bug)
                   nestedNode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
                 }
 
@@ -301,7 +295,6 @@ public class ClassesProcessor {
   }
 
   private static void initWrappers(ClassNode node) throws IOException {
-
     if (node.type == ClassNode.CLASS_LAMBDA) {
       return;
     }
@@ -317,7 +310,6 @@ public class ClassesProcessor {
   }
 
   private static void addClassnameToImport(ClassNode node, ImportCollector imp) {
-
     if (node.simpleName != null && node.simpleName.length() > 0) {
       imp.getShortName(node.type == ClassNode.CLASS_ROOT ? node.classStruct.qualifiedName : node.simpleName, false);
     }
@@ -328,7 +320,6 @@ public class ClassesProcessor {
   }
 
   private static void destroyWrappers(ClassNode node) {
-
     node.wrapper = null;
     node.classStruct.releaseResources();
 
@@ -343,7 +334,6 @@ public class ClassesProcessor {
 
 
   public static class ClassNode {
-
     public static final int CLASS_ROOT = 0;
     public static final int CLASS_MEMBER = 1;
     public static final int CLASS_ANONYMOUS = 2;
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
index e25cca2..94c2993 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -21,13 +21,9 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class BytecodeMappingTracer {
-
   private int currentSourceLine;
-
   private StructLineNumberTableAttribute lineNumberTable = null;
-
-  // bytecode offset, source line
-  private final Map<Integer, Integer> mapping = new HashMap<Integer, Integer>();
+  private final Map<Integer, Integer> mapping = new HashMap<Integer, Integer>();  // bytecode offset, source line
 
   public BytecodeMappingTracer() { }
 
@@ -43,12 +39,6 @@ public class BytecodeMappingTracer {
     currentSourceLine += number_lines;
   }
 
-  public void shiftSourceLines(int shift) {
-    for (Entry<Integer, Integer> entry : mapping.entrySet()) {
-      entry.setValue(entry.getValue() + shift);
-    }
-  }
-
   public void addMapping(int bytecode_offset) {
     if (!mapping.containsKey(bytecode_offset)) {
       mapping.put(bytecode_offset, currentSourceLine);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 798010e..6963f1d 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -43,9 +43,7 @@ import java.util.Map.Entry;
 
 public class NestedClassProcessor {
 
-
   public void processClass(ClassNode root, ClassNode node) {
-
     // hide synthetic lambda content methods
     if (node.type == ClassNode.CLASS_LAMBDA && !node.lambdaInformation.is_method_reference) {
       ClassNode node_content = DecompilerContext.getClassProcessor().getMapRootClasses().get(node.classStruct.qualifiedName);
@@ -59,7 +57,6 @@ public class NestedClassProcessor {
     }
 
     if (node.type != ClassNode.CLASS_LAMBDA) {
-
       computeLocalVarsAndDefinitions(node);
 
       // for each local or anonymous class ensure not empty enclosing method
@@ -102,13 +99,12 @@ public class NestedClassProcessor {
   }
 
   private static void setLambdaVars(ClassNode parent, ClassNode child) {
-
     if (child.lambdaInformation.is_method_reference) { // method reference, no code and no parameters
       return;
     }
 
-    final MethodWrapper meth = parent.getWrapper().getMethods().getWithKey(child.lambdaInformation.content_method_key);
-    final MethodWrapper encmeth = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
+    MethodWrapper method = parent.getWrapper().getMethods().getWithKey(child.lambdaInformation.content_method_key);
+    final MethodWrapper enclosingMethod = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
 
     MethodDescriptor md_lambda = MethodDescriptor.parseDescriptor(child.lambdaInformation.method_descriptor);
     final MethodDescriptor md_content = MethodDescriptor.parseDescriptor(child.lambdaInformation.content_method_descriptor);
@@ -120,52 +116,45 @@ public class NestedClassProcessor {
 
     final boolean is_static_lambda_content = child.lambdaInformation.is_content_method_static;
 
-    final String parent_class_name = parent.getWrapper().getClassStruct().qualifiedName;
-    final String lambda_class_name = child.simpleName;
+    String parent_class_name = parent.getWrapper().getClassStruct().qualifiedName;
+    String lambda_class_name = child.simpleName;
 
     final VarType lambda_class_type = new VarType(lambda_class_name, true);
 
     // this pointer
     if (!is_static_lambda_content && DecompilerContext.getOption(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS)) {
-      meth.varproc.getThisVars().put(new VarVersionPair(0, 0), parent_class_name);
-      meth.varproc.setVarName(new VarVersionPair(0, 0), parent.simpleName + ".this");
+      method.varproc.getThisVars().put(new VarVersionPair(0, 0), parent_class_name);
+      method.varproc.setVarName(new VarVersionPair(0, 0), parent.simpleName + ".this");
     }
 
-    // local variables
-    DirectGraph graph = encmeth.getOrBuildGraph();
+    final Map<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
 
-    final HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
-
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
+    enclosingMethod.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
+      @Override
       public int processExprent(Exprent exprent) {
-
         List<Exprent> lst = exprent.getAllExprents(true);
         lst.add(exprent);
 
         for (Exprent expr : lst) {
-
           if (expr.type == Exprent.EXPRENT_NEW) {
             NewExprent new_expr = (NewExprent)expr;
-            if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
 
+            if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
               InvocationExprent inv_dynamic = new_expr.getConstructor();
 
               int param_index = is_static_lambda_content ? 0 : 1;
-              int varindex = is_static_lambda_content ? 0 : 1;
+              int varIndex = is_static_lambda_content ? 0 : 1;
 
               for (int i = 0; i < vars_count; ++i) {
-
                 Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
 
                 if (param.type == Exprent.EXPRENT_VAR) {
-                  VarVersionPair enc_varpaar = new VarVersionPair((VarExprent)param);
-                  String enc_varname = encmeth.varproc.getVarName(enc_varpaar);
-
-                  //meth.varproc.setVarName(new VarVersionPair(varindex, 0), enc_varname);
-                  mapNewNames.put(new VarVersionPair(varindex, 0), enc_varname);
+                  VarVersionPair pair = new VarVersionPair((VarExprent)param);
+                  String name = enclosingMethod.varproc.getVarName(pair);
+                  mapNewNames.put(new VarVersionPair(varIndex, 0), name);
                 }
 
-                varindex += md_content.params[i].stackSize;
+                varIndex += md_content.params[i].stackSize;
               }
             }
           }
@@ -176,36 +165,33 @@ public class NestedClassProcessor {
     });
 
     // update names of local variables
-    HashSet<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
-    setNewOuterNames.removeAll(meth.setOuterVarNames);
+    Set<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
+    setNewOuterNames.removeAll(method.setOuterVarNames);
 
-    meth.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
-    meth.setOuterVarNames.addAll(setNewOuterNames);
+    method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
+    method.setOuterVarNames.addAll(setNewOuterNames);
 
-    for (Entry<VarVersionPair, String> entr : mapNewNames.entrySet()) {
-      meth.varproc.setVarName(entr.getKey(), entr.getValue());
+    for (Entry<VarVersionPair, String> entry : mapNewNames.entrySet()) {
+      method.varproc.setVarName(entry.getKey(), entry.getValue());
     }
   }
 
   private static void checkNotFoundClasses(ClassNode root, ClassNode node) {
+    List<ClassNode> copy = new ArrayList<ClassNode>(node.nested);
 
-    List<ClassNode> lstChildren = new ArrayList<ClassNode>(node.nested);
-
-    for (ClassNode child : lstChildren) {
-
+    for (ClassNode child : copy) {
       if ((child.type == ClassNode.CLASS_LOCAL || child.type == ClassNode.CLASS_ANONYMOUS) && child.enclosingMethod == null) {
-
         Set<String> setEnclosing = child.enclosingClasses;
 
         if (setEnclosing.size() == 1) {
           StructEnclosingMethodAttribute attr =
             (StructEnclosingMethodAttribute)child.classStruct.getAttributes().getWithKey("EnclosingMethod");
-          if (attr != null && attr.getMethodName() != null) {
-            if (node.classStruct.qualifiedName.equals(attr.getClassName()) &&
-                node.classStruct.getMethod(attr.getMethodName(), attr.getMethodDescriptor()) != null) {
-              child.enclosingMethod = InterpreterUtil.makeUniqueKey(attr.getMethodName(), attr.getMethodDescriptor());
-              continue;
-            }
+          if (attr != null &&
+              attr.getMethodName() != null &&
+              node.classStruct.qualifiedName.equals(attr.getClassName()) &&
+              node.classStruct.getMethod(attr.getMethodName(), attr.getMethodDescriptor()) != null) {
+            child.enclosingMethod = InterpreterUtil.makeUniqueKey(attr.getMethodName(), attr.getMethodDescriptor());
+            continue;
           }
         }
 
@@ -235,14 +221,12 @@ public class NestedClassProcessor {
   }
 
   private static boolean insertNestedClass(ClassNode root, ClassNode child) {
-
     Set<String> setEnclosing = child.enclosingClasses;
 
     LinkedList<ClassNode> stack = new LinkedList<ClassNode>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
-
       ClassNode node = stack.removeFirst();
 
       if (setEnclosing.contains(node.classStruct.qualifiedName)) {
@@ -259,109 +243,98 @@ public class NestedClassProcessor {
     return false;
   }
 
-
   private static void computeLocalVarsAndDefinitions(final ClassNode node) {
-
     // local var masks
     // class name, constructor descriptor, field mask
-    final HashMap<String, HashMap<String, List<VarFieldPair>>> mapVarMasks = new HashMap<String, HashMap<String, List<VarFieldPair>>>();
+    final Map<String, Map<String, List<VarFieldPair>>> mapVarMasks = new HashMap<String, Map<String, List<VarFieldPair>>>();
 
-    int cltypes = 0;
+    int clTypes = 0;
 
     for (ClassNode nd : node.nested) {
-      if (nd.type != ClassNode.CLASS_LAMBDA) {
-        if ((nd.access & CodeConstants.ACC_STATIC) == 0 && (nd.access & CodeConstants.ACC_INTERFACE) == 0) {
+      if (nd.type != ClassNode.CLASS_LAMBDA &&
+          (nd.access & CodeConstants.ACC_STATIC) == 0 &&
+          (nd.access & CodeConstants.ACC_INTERFACE) == 0) {
+        clTypes |= nd.type;
 
-          cltypes |= nd.type;
-
-          HashMap<String, List<VarFieldPair>> mask = getMaskLocalVars(nd.getWrapper());
-          if (mask.isEmpty()) {
-            if (!nd.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
-              String message = "Nested class " + nd.classStruct.qualifiedName + " has no constructor!";
-              DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-            }
-          }
-          else {
-            mapVarMasks.put(nd.classStruct.qualifiedName, mask);
+        Map<String, List<VarFieldPair>> mask = getMaskLocalVars(nd.getWrapper());
+        if (mask.isEmpty()) {
+          if (!nd.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
+            String message = "Nested class " + nd.classStruct.qualifiedName + " has no constructor!";
+            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
           }
         }
+        else {
+          mapVarMasks.put(nd.classStruct.qualifiedName, mask);
+        }
       }
     }
 
     // local var masks
-    final HashMap<String, HashMap<String, List<VarFieldPair>>> mapVarFieldPairs =
-      new HashMap<String, HashMap<String, List<VarFieldPair>>>();
-
-    if (cltypes != ClassNode.CLASS_MEMBER) {
+    final Map<String, Map<String, List<VarFieldPair>>> mapVarFieldPairs = new HashMap<String, Map<String, List<VarFieldPair>>>();
 
+    if (clTypes != ClassNode.CLASS_MEMBER) {
       // iterate enclosing class
-      for (final MethodWrapper meth : node.getWrapper().getMethods()) {
-
-        if (meth.root != null) { // neither abstract, nor native
-          DirectGraph graph = meth.getOrBuildGraph();
-
-          graph.iterateExprents(new DirectGraph.ExprentIterator() {
+      for (final MethodWrapper method : node.getWrapper().getMethods()) {
+        if (method.root != null) { // neither abstract, nor native
+          method.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
+            @Override
             public int processExprent(Exprent exprent) {
               List<Exprent> lst = exprent.getAllExprents(true);
               lst.add(exprent);
 
               for (Exprent expr : lst) {
-
                 if (expr.type == Exprent.EXPRENT_NEW) {
-                  InvocationExprent constr = ((NewExprent)expr).getConstructor();
+                  InvocationExprent constructor = ((NewExprent)expr).getConstructor();
 
-                  if (constr != null && mapVarMasks.containsKey(constr.getClassname())) { // non-static inner class constructor
-
-                    String refclname = constr.getClassname();
-
-                    ClassNode nestedClassNode = node.getClassNode(refclname);
+                  if (constructor != null && mapVarMasks.containsKey(constructor.getClassname())) { // non-static inner class constructor
+                    String refClassName = constructor.getClassname();
+                    ClassNode nestedClassNode = node.getClassNode(refClassName);
 
                     if (nestedClassNode.type != ClassNode.CLASS_MEMBER) {
+                      List<VarFieldPair> mask = mapVarMasks.get(refClassName).get(constructor.getStringDescriptor());
 
-                      List<VarFieldPair> mask = mapVarMasks.get(refclname).get(constr.getStringDescriptor());
-
-                      if (!mapVarFieldPairs.containsKey(refclname)) {
-                        mapVarFieldPairs.put(refclname, new HashMap<String, List<VarFieldPair>>());
+                      if (!mapVarFieldPairs.containsKey(refClassName)) {
+                        mapVarFieldPairs.put(refClassName, new HashMap<String, List<VarFieldPair>>());
                       }
 
                       List<VarFieldPair> lstTemp = new ArrayList<VarFieldPair>();
 
                       for (int i = 0; i < mask.size(); i++) {
-                        Exprent param = constr.getLstParameters().get(i);
+                        Exprent param = constructor.getLstParameters().get(i);
                         VarFieldPair pair = null;
 
                         if (param.type == Exprent.EXPRENT_VAR && mask.get(i) != null) {
-                          VarVersionPair varpaar = new VarVersionPair((VarExprent)param);
+                          VarVersionPair varPair = new VarVersionPair((VarExprent)param);
 
-                          // FIXME: final flags of variables are wrong! Correct the entire final functionality.
-                          //													if(meth.varproc.getVarFinal(varpaar) != VarTypeProcessor.VAR_NON_FINAL) {
-                          pair = new VarFieldPair(mask.get(i).keyfield, varpaar);
-                          //													}
+                          // FIXME: flags of variables are wrong! Correct the entire functionality.
+                          // if(method.varproc.getVarFinal(varPair) != VarTypeProcessor.VAR_NON_FINAL) {
+                          pair = new VarFieldPair(mask.get(i).fieldKey, varPair);
+                          // }
                         }
 
                         lstTemp.add(pair);
                       }
 
-                      List<VarFieldPair> pairmask = mapVarFieldPairs.get(refclname).get(constr.getStringDescriptor());
-
-                      if (pairmask == null) {
-                        pairmask = lstTemp;
+                      List<VarFieldPair> pairMask = mapVarFieldPairs.get(refClassName).get(constructor.getStringDescriptor());
+                      if (pairMask == null) {
+                        pairMask = lstTemp;
                       }
                       else {
-                        for (int i = 0; i < pairmask.size(); i++) {
-                          if (!InterpreterUtil.equalObjects(pairmask.get(i), lstTemp.get(i))) {
-                            pairmask.set(i, null);
+                        for (int i = 0; i < pairMask.size(); i++) {
+                          if (!InterpreterUtil.equalObjects(pairMask.get(i), lstTemp.get(i))) {
+                            pairMask.set(i, null);
                           }
                         }
                       }
 
-                      mapVarFieldPairs.get(refclname).put(constr.getStringDescriptor(), pairmask);
+                      mapVarFieldPairs.get(refClassName).put(constructor.getStringDescriptor(), pairMask);
                       nestedClassNode.enclosingMethod =
-                        InterpreterUtil.makeUniqueKey(meth.methodStruct.getName(), meth.methodStruct.getDescriptor());
+                        InterpreterUtil.makeUniqueKey(method.methodStruct.getName(), method.methodStruct.getDescriptor());
                     }
                   }
                 }
               }
+
               return 0;
             }
           });
@@ -370,219 +343,200 @@ public class NestedClassProcessor {
     }
 
     // merge var masks
-    for (Entry<String, HashMap<String, List<VarFieldPair>>> entcl : mapVarMasks.entrySet()) {
-
-      ClassNode nestedNode = node.getClassNode(entcl.getKey());
+    for (Entry<String, Map<String, List<VarFieldPair>>> enclosing : mapVarMasks.entrySet()) {
+      ClassNode nestedNode = node.getClassNode(enclosing.getKey());
 
       // intersection
-      List<VarFieldPair> intrPairMask = null;
+      List<VarFieldPair> interPairMask = null;
       // merge referenced constructors
-      if (mapVarFieldPairs.containsKey(entcl.getKey())) {
-        for (List<VarFieldPair> mask : mapVarFieldPairs.get(entcl.getKey()).values()) {
-          if (intrPairMask == null) {
-            intrPairMask = new ArrayList<VarFieldPair>(mask);
+      if (mapVarFieldPairs.containsKey(enclosing.getKey())) {
+        for (List<VarFieldPair> mask : mapVarFieldPairs.get(enclosing.getKey()).values()) {
+          if (interPairMask == null) {
+            interPairMask = new ArrayList<VarFieldPair>(mask);
           }
           else {
-            mergeListSignatures(intrPairMask, mask, false);
+            mergeListSignatures(interPairMask, mask, false);
           }
         }
       }
 
-      List<VarFieldPair> intrMask = null;
+      List<VarFieldPair> interMask = null;
       // merge all constructors
-      for (List<VarFieldPair> mask : entcl.getValue().values()) {
-        if (intrMask == null) {
-          intrMask = new ArrayList<VarFieldPair>(mask);
+      for (List<VarFieldPair> mask : enclosing.getValue().values()) {
+        if (interMask == null) {
+          interMask = new ArrayList<VarFieldPair>(mask);
         }
         else {
-          mergeListSignatures(intrMask, mask, false);
+          mergeListSignatures(interMask, mask, false);
         }
       }
 
-      if (intrPairMask == null) { // member or local and never instantiated
-        intrPairMask = new ArrayList<VarFieldPair>(intrMask);
+      if (interPairMask == null) { // member or local and never instantiated
+        interPairMask = interMask != null ? new ArrayList<VarFieldPair>(interMask) : new ArrayList<VarFieldPair>();
 
         boolean found = false;
 
-        for (int i = 0; i < intrPairMask.size(); i++) {
-          if (intrPairMask.get(i) != null) {
+        for (int i = 0; i < interPairMask.size(); i++) {
+          if (interPairMask.get(i) != null) {
             if (found) {
-              intrPairMask.set(i, null);
+              interPairMask.set(i, null);
             }
             found = true;
           }
         }
       }
 
-      mergeListSignatures(intrPairMask, intrMask, true);
+      mergeListSignatures(interPairMask, interMask, true);
 
-      for (int i = 0; i < intrPairMask.size(); i++) {
-        VarFieldPair pair = intrPairMask.get(i);
-        if (pair != null && pair.keyfield.length() > 0) {
-          nestedNode.mapFieldsToVars.put(pair.keyfield, pair.varpaar);
+      for (VarFieldPair pair : interPairMask) {
+        if (pair != null && pair.fieldKey.length() > 0) {
+          nestedNode.mapFieldsToVars.put(pair.fieldKey, pair.varPair);
         }
       }
 
       // set resulting constructor signatures
-      for (Entry<String, List<VarFieldPair>> entmt : entcl.getValue().entrySet()) {
-        mergeListSignatures(entmt.getValue(), intrPairMask, false);
+      for (Entry<String, List<VarFieldPair>> entry : enclosing.getValue().entrySet()) {
+        mergeListSignatures(entry.getValue(), interPairMask, false);
 
-        MethodWrapper meth = nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entmt.getKey());
-        meth.signatureFields = new ArrayList<VarVersionPair>();
+        MethodWrapper method = nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entry.getKey());
+        method.signatureFields = new ArrayList<VarVersionPair>();
 
-        for (VarFieldPair pair : entmt.getValue()) {
-          meth.signatureFields.add(pair == null ? null : pair.varpaar);
+        for (VarFieldPair pair : entry.getValue()) {
+          method.signatureFields.add(pair == null ? null : pair.varPair);
         }
       }
     }
   }
 
-  private static void insertLocalVars(final ClassNode parent, final ClassNode child) {
-
+  private static void insertLocalVars(ClassNode parent, final ClassNode child) {
     // enclosing method, is null iff member class
-    MethodWrapper encmeth = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
+    MethodWrapper enclosingMethod = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
 
     // iterate all child methods
-    for (final MethodWrapper meth : child.getWrapper().getMethods()) {
+    for (final MethodWrapper method : child.getWrapper().getMethods()) {
+      if (method.root != null) { // neither abstract nor native
+        Map<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();  // local var names
+        Map<VarVersionPair, VarType> mapNewTypes = new HashMap<VarVersionPair, VarType>();  // local var types
 
-      if (meth.root != null) { // neither abstract nor native
+        final Map<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<Integer, VarVersionPair>();
+        if (method.signatureFields != null) {
+          int index = 0, varIndex = 1;
+          MethodDescriptor md = MethodDescriptor.parseDescriptor(method.methodStruct.getDescriptor());
 
-        // local var names
-        HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
-        // local var types
-        HashMap<VarVersionPair, VarType> mapNewTypes = new HashMap<VarVersionPair, VarType>();
+          for (VarVersionPair pair : method.signatureFields) {
+            if (pair != null) {
+              VarVersionPair newVar = new VarVersionPair(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
 
-        final HashMap<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<Integer, VarVersionPair>();
-        if (meth.signatureFields != null) {
-          int index = 0;
-          int varindex = 1;
-          MethodDescriptor md = MethodDescriptor.parseDescriptor(meth.methodStruct.getDescriptor());
+              mapParamsToNewVars.put(varIndex, newVar);
 
-          for (VarVersionPair paar : meth.signatureFields) {
-            if (paar != null) {
-              VarVersionPair newvar = new VarVersionPair(meth.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
-
-              mapParamsToNewVars.put(varindex, newvar);
-
-              String varname = null;
-              VarType vartype = null;
+              String varName = null;
+              VarType varType = null;
 
               if (child.type != ClassNode.CLASS_MEMBER) {
-                varname = encmeth.varproc.getVarName(paar);
-                vartype = encmeth.varproc.getVarType(paar);
+                varName = enclosingMethod.varproc.getVarName(pair);
+                varType = enclosingMethod.varproc.getVarType(pair);
 
-                encmeth.varproc.setVarFinal(paar, VarTypeProcessor.VAR_EXPLICIT_FINAL);
+                enclosingMethod.varproc.setVarFinal(pair, VarTypeProcessor.VAR_EXPLICIT_FINAL);
               }
 
-              if (paar.var == -1 || "this".equals(varname)) {
+              if (pair.var == -1 || "this".equals(varName)) {
                 if (parent.simpleName == null) {
                   // anonymous enclosing class, no access to this
-                  varname = VarExprent.VAR_NAMELESS_ENCLOSURE;
+                  varName = VarExprent.VAR_NAMELESS_ENCLOSURE;
                 }
                 else {
-                  varname = parent.simpleName + ".this";
+                  varName = parent.simpleName + ".this";
                 }
-                meth.varproc.getThisVars().put(newvar, parent.classStruct.qualifiedName);
+                method.varproc.getThisVars().put(newVar, parent.classStruct.qualifiedName);
               }
 
-              mapNewNames.put(newvar, varname);
-              mapNewTypes.put(newvar, vartype);
+              mapNewNames.put(newVar, varName);
+              mapNewTypes.put(newVar, varType);
             }
-            varindex += md.params[index++].stackSize;
+
+            varIndex += md.params[index++].stackSize;
           }
         }
 
-        // new vars
-        final HashMap<String, VarVersionPair> mapFieldsToNewVars = new HashMap<String, VarVersionPair>();
+        final Map<String, VarVersionPair> mapFieldsToNewVars = new HashMap<String, VarVersionPair>();
+        for (ClassNode classNode = child; classNode != null; classNode = classNode.parent) {
+          for (Entry<String, VarVersionPair> entry : classNode.mapFieldsToVars.entrySet()) {
+            VarVersionPair newVar = new VarVersionPair(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
 
-        for (ClassNode clnode = child; clnode != null; clnode = clnode.parent) {
+            mapFieldsToNewVars.put(InterpreterUtil.makeUniqueKey(classNode.classStruct.qualifiedName, entry.getKey()), newVar);
 
-          for (Entry<String, VarVersionPair> entr : clnode.mapFieldsToVars.entrySet()) {
-            VarVersionPair newvar = new VarVersionPair(meth.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
+            String varName = null;
+            VarType varType = null;
 
-            mapFieldsToNewVars.put(InterpreterUtil.makeUniqueKey(clnode.classStruct.qualifiedName, entr.getKey()), newvar);
+            if (classNode.type != ClassNode.CLASS_MEMBER) {
+              MethodWrapper enclosing_method = classNode.parent.getWrapper().getMethods().getWithKey(classNode.enclosingMethod);
 
-            String varname = null;
-            VarType vartype = null;
+              varName = enclosing_method.varproc.getVarName(entry.getValue());
+              varType = enclosing_method.varproc.getVarType(entry.getValue());
 
-            if (clnode.type != ClassNode.CLASS_MEMBER) {
-
-              MethodWrapper enclosing_method = clnode.parent.getWrapper().getMethods().getWithKey(clnode.enclosingMethod);
-
-              varname = enclosing_method.varproc.getVarName(entr.getValue());
-              vartype = enclosing_method.varproc.getVarType(entr.getValue());
-
-              enclosing_method.varproc.setVarFinal(entr.getValue(), VarTypeProcessor.VAR_EXPLICIT_FINAL);
+              enclosing_method.varproc.setVarFinal(entry.getValue(), VarTypeProcessor.VAR_EXPLICIT_FINAL);
             }
 
-            if (entr.getValue().var == -1 || "this".equals(varname)) {
-              if (clnode.parent.simpleName == null) {
+            if (entry.getValue().var == -1 || "this".equals(varName)) {
+              if (classNode.parent.simpleName == null) {
                 // anonymous enclosing class, no access to this
-                varname = VarExprent.VAR_NAMELESS_ENCLOSURE;
+                varName = VarExprent.VAR_NAMELESS_ENCLOSURE;
               }
               else {
-                varname = clnode.parent.simpleName + ".this";
+                varName = classNode.parent.simpleName + ".this";
               }
-              meth.varproc.getThisVars().put(newvar, clnode.parent.classStruct.qualifiedName);
+              method.varproc.getThisVars().put(newVar, classNode.parent.classStruct.qualifiedName);
             }
 
-            mapNewNames.put(newvar, varname);
-            mapNewTypes.put(newvar, vartype);
+            mapNewNames.put(newVar, varName);
+            mapNewTypes.put(newVar, varType);
 
             // hide synthetic field
-            if (clnode == child) { // fields higher up the chain were already handled with their classes
-              StructField fd = child.classStruct.getFields().getWithKey(entr.getKey());
+            if (classNode == child) { // fields higher up the chain were already handled with their classes
+              StructField fd = child.classStruct.getFields().getWithKey(entry.getKey());
               child.getWrapper().getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fd.getName(), fd.getDescriptor()));
             }
           }
         }
 
-        HashSet<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
-        setNewOuterNames.removeAll(meth.setOuterVarNames);
+        Set<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
+        setNewOuterNames.removeAll(method.setOuterVarNames);
 
-        meth.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
-        meth.setOuterVarNames.addAll(setNewOuterNames);
+        method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
+        method.setOuterVarNames.addAll(setNewOuterNames);
 
-        for (Entry<VarVersionPair, String> entr : mapNewNames.entrySet()) {
-          VarVersionPair varpaar = entr.getKey();
-          VarType vartype = mapNewTypes.get(varpaar);
+        for (Entry<VarVersionPair, String> entry : mapNewNames.entrySet()) {
+          VarVersionPair pair = entry.getKey();
+          VarType type = mapNewTypes.get(pair);
 
-          meth.varproc.setVarName(varpaar, entr.getValue());
-          if (vartype != null) {
-            meth.varproc.setVarType(varpaar, vartype);
+          method.varproc.setVarName(pair, entry.getValue());
+          if (type != null) {
+            method.varproc.setVarType(pair, type);
           }
         }
 
-        DirectGraph graph = meth.getOrBuildGraph();
-
-        graph.iterateExprents(new DirectGraph.ExprentIterator() {
+        method.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
+          @Override
           public int processExprent(Exprent exprent) {
-
             if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-              AssignmentExprent asexpr = (AssignmentExprent)exprent;
-              if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-                FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-
-                if (fexpr.getClassname().equals(child.classStruct.qualifiedName) &&  // process this class only
-                    mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(child.classStruct.qualifiedName,
-                                                                                 InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr
-                                                                                   .getDescriptor().descriptorString)))) {
+              AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+              if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+                FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+                String qName = child.classStruct.qualifiedName;
+                if (fExpr.getClassname().equals(qName) &&  // process this class only
+                    mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(qName, fExpr.getName(), fExpr.getDescriptor().descriptorString))) {
                   return 2;
                 }
-
-                //if(fexpr.getClassname().equals(child.classStruct.qualifiedName) &&
-                //		mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString))) {
-                //	return 2;
-                //}
               }
             }
 
-            if (child.type == ClassNode.CLASS_ANONYMOUS && CodeConstants.INIT_NAME.equals(meth.methodStruct.getName())
-                && exprent.type == Exprent.EXPRENT_INVOCATION) {
-              InvocationExprent invexpr = (InvocationExprent)exprent;
-              if (invexpr.getFunctype() == InvocationExprent.TYP_INIT) {
+            if (child.type == ClassNode.CLASS_ANONYMOUS &&
+                CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) &&
+                exprent.type == Exprent.EXPRENT_INVOCATION) {
+              InvocationExprent invokeExpr = (InvocationExprent)exprent;
+              if (invokeExpr.getFunctype() == InvocationExprent.TYP_INIT) {
                 // invocation of the super constructor in an anonymous class
-                child.superInvocation = invexpr; // FIXME: save original names of parameters
+                child.superInvocation = invokeExpr; // FIXME: save original names of parameters
                 return 2;
               }
             }
@@ -593,27 +547,23 @@ public class NestedClassProcessor {
           }
 
           private Exprent replaceExprent(Exprent exprent) {
-
             if (exprent.type == Exprent.EXPRENT_VAR) {
-              int varindex = ((VarExprent)exprent).getIndex();
-              if (mapParamsToNewVars.containsKey(varindex)) {
-                VarVersionPair newvar = mapParamsToNewVars.get(varindex);
-                meth.varproc.getExternalVars().add(newvar);
-                return new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
+              int varIndex = ((VarExprent)exprent).getIndex();
+              if (mapParamsToNewVars.containsKey(varIndex)) {
+                VarVersionPair newVar = mapParamsToNewVars.get(varIndex);
+                method.varproc.getExternalVars().add(newVar);
+                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc);
               }
             }
             else if (exprent.type == Exprent.EXPRENT_FIELD) {
-              FieldExprent fexpr = (FieldExprent)exprent;
-
-              String keyField = InterpreterUtil.makeUniqueKey(fexpr.getClassname(), InterpreterUtil
-                .makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString));
-
-              if (mapFieldsToNewVars.containsKey(keyField)) {
-                //if(fexpr.getClassname().equals(child.classStruct.qualifiedName) &&
-                //		mapFieldsToNewVars.containsKey(keyField)) {
-                VarVersionPair newvar = mapFieldsToNewVars.get(keyField);
-                meth.varproc.getExternalVars().add(newvar);
-                return new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
+              FieldExprent fExpr = (FieldExprent)exprent;
+              String key = InterpreterUtil.makeUniqueKey(fExpr.getClassname(), fExpr.getName(), fExpr.getDescriptor().descriptorString);
+              if (mapFieldsToNewVars.containsKey(key)) {
+                //if(fExpr.getClassname().equals(child.classStruct.qualifiedName) &&
+                //		mapFieldsToNewVars.containsKey(key)) {
+                VarVersionPair newVar = mapFieldsToNewVars.get(key);
+                method.varproc.getExternalVars().add(newVar);
+                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc);
               }
             }
 
@@ -622,9 +572,9 @@ public class NestedClassProcessor {
               replaced = false;
 
               for (Exprent expr : exprent.getAllExprents()) {
-                Exprent retexpr = replaceExprent(expr);
-                if (retexpr != null) {
-                  exprent.replaceExprent(expr, retexpr);
+                Exprent retExpr = replaceExprent(expr);
+                if (retExpr != null) {
+                  exprent.replaceExprent(expr, retExpr);
                   replaced = true;
                   break;
                 }
@@ -638,30 +588,28 @@ public class NestedClassProcessor {
     }
   }
 
-  private static HashMap<String, List<VarFieldPair>> getMaskLocalVars(ClassWrapper wrapper) {
-
-    HashMap<String, List<VarFieldPair>> mapMasks = new HashMap<String, List<VarFieldPair>>();
+  private static Map<String, List<VarFieldPair>> getMaskLocalVars(ClassWrapper wrapper) {
+    Map<String, List<VarFieldPair>> mapMasks = new HashMap<String, List<VarFieldPair>>();
 
     StructClass cl = wrapper.getClassStruct();
 
     // iterate over constructors
     for (StructMethod mt : cl.getMethods()) {
       if (CodeConstants.INIT_NAME.equals(mt.getName())) {
-
         MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-
-        MethodWrapper meth = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, mt.getDescriptor());
-        DirectGraph graph = meth.getOrBuildGraph();
+        MethodWrapper method = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, mt.getDescriptor());
+        DirectGraph graph = method.getOrBuildGraph();
 
         if (graph != null) { // something gone wrong, should not be null
           List<VarFieldPair> fields = new ArrayList<VarFieldPair>();
 
-          int varindex = 1;
+          int varIndex = 1;
           for (int i = 0; i < md.params.length; i++) {  // no static methods allowed
-            String keyField = getEnclosingVarField(cl, meth, graph, varindex);
+            String keyField = getEnclosingVarField(cl, method, graph, varIndex);
             fields.add(keyField == null ? null : new VarFieldPair(keyField, new VarVersionPair(-1, 0))); // TODO: null?
-            varindex += md.params[i].stackSize;
+            varIndex += md.params[i].stackSize;
           }
+
           mapMasks.put(mt.getDescriptor(), fields);
         }
       }
@@ -670,38 +618,35 @@ public class NestedClassProcessor {
     return mapMasks;
   }
 
-  private static String getEnclosingVarField(StructClass cl, MethodWrapper meth, DirectGraph graph, final int index) {
-
+  private static String getEnclosingVarField(StructClass cl, MethodWrapper method, DirectGraph graph, int index) {
     String field = "";
 
     // parameter variable final
-    if (meth.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_NON_FINAL) {
+    if (method.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_NON_FINAL) {
       return null;
     }
 
     boolean noSynthFlag = DecompilerContext.getOption(IFernflowerPreferences.SYNTHETIC_NOT_SET);
 
     // no loop at the begin
-    DirectNode firstnode = graph.first;
-    if (firstnode.preds.isEmpty()) {
-      // assignment to a final synthetic field?
-      for (Exprent exprent : firstnode.exprents) {
+    DirectNode firstNode = graph.first;
+    if (firstNode.preds.isEmpty()) {
+      // assignment to a synthetic field?
+      for (Exprent exprent : firstNode.exprents) {
         if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-          AssignmentExprent asexpr = (AssignmentExprent)exprent;
-          if (asexpr.getRight().type == Exprent.EXPRENT_VAR && ((VarExprent)asexpr.getRight()).getIndex() == index) {
-            if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+          AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+          if (assignExpr.getRight().type == Exprent.EXPRENT_VAR &&
+              ((VarExprent)assignExpr.getRight()).getIndex() == index &&
+              assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+            FieldExprent left = (FieldExprent)assignExpr.getLeft();
+            StructField fd = cl.getField(left.getName(), left.getDescriptor().descriptorString);
 
-              FieldExprent left = (FieldExprent)asexpr.getLeft();
-              StructField fd = cl.getField(left.getName(), left.getDescriptor().descriptorString);
-
-              if (fd != null) { // local (== not inherited) field
-                if (cl.qualifiedName.equals(left.getClassname()) &&
-                    fd.hasModifier(CodeConstants.ACC_FINAL) &&
-                    (fd.isSynthetic() || (noSynthFlag && fd.hasModifier(CodeConstants.ACC_PRIVATE)))) {
-                  field = InterpreterUtil.makeUniqueKey(left.getName(), left.getDescriptor().descriptorString);
-                  break;
-                }
-              }
+            if (fd != null && cl.qualifiedName.equals(left.getClassname()) &&
+                fd.hasModifier(CodeConstants.ACC_FINAL) &&
+                (fd.isSynthetic() || (noSynthFlag && fd.hasModifier(CodeConstants.ACC_PRIVATE)))) {
+              // local (== not inherited) field
+              field = InterpreterUtil.makeUniqueKey(left.getName(), left.getDescriptor().descriptorString);
+              break;
             }
           }
         }
@@ -712,51 +657,31 @@ public class NestedClassProcessor {
   }
 
   private static void mergeListSignatures(List<VarFieldPair> first, List<VarFieldPair> second, boolean both) {
-
     int i = 1;
+
     while (true) {
       if (first.size() <= i || second.size() <= i) {
         break;
       }
 
-      VarFieldPair fobj = first.get(first.size() - i);
-      VarFieldPair sobj = second.get(second.size() - i);
+      VarFieldPair fObj = first.get(first.size() - i);
+      VarFieldPair sObj = second.get(second.size() - i);
 
-      boolean eq = false;
-      if (fobj == null || sobj == null) {
-        eq = (fobj == sobj);
-      }
-      else {
-        eq = true;
-        if (fobj.keyfield.length() == 0) {
-          fobj.keyfield = sobj.keyfield;
-        }
-        else if (sobj.keyfield.length() == 0) {
-          if (both) {
-            sobj.keyfield = fobj.keyfield;
-          }
-        }
-        else {
-          eq = fobj.keyfield.equals(sobj.keyfield);
-        }
-      }
-
-      if (!eq) {
+      if (!isEqual(both, fObj, sObj)) {
         first.set(first.size() - i, null);
         if (both) {
           second.set(second.size() - i, null);
         }
       }
-      else {
-        if (fobj != null) {
-          if (fobj.varpaar.var == -1) {
-            fobj.varpaar = sobj.varpaar;
-          }
-          else {
-            sobj.varpaar = fobj.varpaar;
-          }
+      else if (fObj != null) {
+        if (fObj.varPair.var == -1) {
+          fObj.varPair = sObj.varPair;
+        }
+        else {
+          sObj.varPair = fObj.varPair;
         }
       }
+
       i++;
     }
 
@@ -780,64 +705,66 @@ public class NestedClassProcessor {
       first.set(0, null);
     }
     else {
-      VarFieldPair fobj = first.get(0);
-      VarFieldPair sobj = second.get(0);
+      VarFieldPair fObj = first.get(0);
+      VarFieldPair sObj = second.get(0);
 
-      boolean eq = false;
-      if (fobj == null || sobj == null) {
-        eq = (fobj == sobj);
-      }
-      else {
-        eq = true;
-        if (fobj.keyfield.length() == 0) {
-          fobj.keyfield = sobj.keyfield;
-        }
-        else if (sobj.keyfield.length() == 0) {
-          if (both) {
-            sobj.keyfield = fobj.keyfield;
-          }
-        }
-        else {
-          eq = fobj.keyfield.equals(sobj.keyfield);
-        }
-      }
-
-      if (!eq) {
+      if (!isEqual(both, fObj, sObj)) {
         first.set(0, null);
         if (both) {
           second.set(0, null);
         }
       }
-      else if (fobj != null) {
-        if (fobj.varpaar.var == -1) {
-          fobj.varpaar = sobj.varpaar;
+      else if (fObj != null) {
+        if (fObj.varPair.var == -1) {
+          fObj.varPair = sObj.varPair;
         }
         else {
-          sobj.varpaar = fobj.varpaar;
+          sObj.varPair = fObj.varPair;
         }
       }
     }
   }
 
+  private static boolean isEqual(boolean both, VarFieldPair fObj, VarFieldPair sObj) {
+    boolean eq;
+    if (fObj == null || sObj == null) {
+      eq = (fObj == sObj);
+    }
+    else {
+      eq = true;
+      if (fObj.fieldKey.length() == 0) {
+        fObj.fieldKey = sObj.fieldKey;
+      }
+      else if (sObj.fieldKey.length() == 0) {
+        if (both) {
+          sObj.fieldKey = fObj.fieldKey;
+        }
+      }
+      else {
+        eq = fObj.fieldKey.equals(sObj.fieldKey);
+      }
+    }
+    return eq;
+  }
 
-  private static void setLocalClassDefinition(MethodWrapper meth, ClassNode node) {
+  private static void setLocalClassDefinition(MethodWrapper method, ClassNode node) {
+    RootStatement root = method.root;
 
-    RootStatement root = meth.root;
+    Set<Statement> setStats = new HashSet<Statement>();
+    VarType classType = new VarType(node.classStruct.qualifiedName, true);
 
-    HashSet<Statement> setStats = new HashSet<Statement>();
-    VarType classtype = new VarType(node.classStruct.qualifiedName, true);
-
-    Statement stdef = getDefStatement(root, classtype, setStats);
-    if (stdef == null) {
+    Statement statement = getDefStatement(root, classType, setStats);
+    if (statement == null) {
       // unreferenced local class
-      stdef = root.getFirst();
+      statement = root.getFirst();
     }
 
-    Statement first = findFirstBlock(stdef, setStats);
+    Statement first = findFirstBlock(statement, setStats);
 
     List<Exprent> lst;
+    //noinspection Duplicates
     if (first == null) {
-      lst = stdef.getVarDefinitions();
+      lst = statement.getVarDefinitions();
     }
     else if (first.getExprents() == null) {
       lst = first.getVarDefinitions();
@@ -846,26 +773,22 @@ public class NestedClassProcessor {
       lst = first.getExprents();
     }
 
-
-    int addindex = 0;
+    int addIndex = 0;
     for (Exprent expr : lst) {
-      if (searchForClass(expr, classtype)) {
+      if (searchForClass(expr, classType)) {
         break;
       }
-      addindex++;
+      addIndex++;
     }
 
-    VarExprent var = new VarExprent(meth.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER),
-                                    classtype, meth.varproc);
+    VarExprent var = new VarExprent(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), classType, method.varproc);
     var.setDefinition(true);
     var.setClassDef(true);
 
-    lst.add(addindex, var);
+    lst.add(addIndex, var);
   }
 
-
-  private static Statement findFirstBlock(Statement stat, HashSet<Statement> setStats) {
-
+  private static Statement findFirstBlock(Statement stat, Set<Statement> setStats) {
     LinkedList<Statement> stack = new LinkedList<Statement>();
     stack.add(stat);
 
@@ -873,30 +796,25 @@ public class NestedClassProcessor {
       Statement st = stack.remove(0);
 
       if (stack.isEmpty() || setStats.contains(st)) {
-
-        if (st.isLabeled() && !stack.isEmpty()) {
+        if (st.isLabeled() && !stack.isEmpty() || st.getExprents() != null) {
           return st;
         }
 
-        if (st.getExprents() != null) {
-          return st;
-        }
-        else {
-          stack.clear();
+        stack.clear();
 
-          switch (st.type) {
-            case Statement.TYPE_SEQUENCE:
-              stack.addAll(0, st.getStats());
-              break;
-            case Statement.TYPE_IF:
-            case Statement.TYPE_ROOT:
-            case Statement.TYPE_SWITCH:
-            case Statement.TYPE_SYNCRONIZED:
-              stack.add(st.getFirst());
-              break;
-            default:
-              return st;
-          }
+        //noinspection Duplicates
+        switch (st.type) {
+          case Statement.TYPE_SEQUENCE:
+            stack.addAll(0, st.getStats());
+            break;
+          case Statement.TYPE_IF:
+          case Statement.TYPE_ROOT:
+          case Statement.TYPE_SWITCH:
+          case Statement.TYPE_SYNCRONIZED:
+            stack.add(st.getFirst());
+            break;
+          default:
+            return st;
         }
       }
     }
@@ -904,11 +822,9 @@ public class NestedClassProcessor {
     return null;
   }
 
-
-  private static Statement getDefStatement(Statement stat, VarType classtype, HashSet<Statement> setStats) {
-
-    List<Exprent> condlst = new ArrayList<Exprent>();
-    Statement retstat = null;
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
+    List<Exprent> lst = new ArrayList<Exprent>();
+    Statement retStat = null;
 
     if (stat.getExprents() == null) {
       int counter = 0;
@@ -917,65 +833,63 @@ public class NestedClassProcessor {
         if (obj instanceof Statement) {
           Statement st = (Statement)obj;
 
-          Statement stTemp = getDefStatement(st, classtype, setStats);
+          Statement stTemp = getDefStatement(st, classType, setStats);
 
           if (stTemp != null) {
             if (counter == 1) {
-              retstat = stat;
+              retStat = stat;
               break;
             }
-            retstat = stTemp;
+            retStat = stTemp;
             counter++;
           }
 
-          if (st.type == DoStatement.TYPE_DO) {
+          if (st.type == Statement.TYPE_DO) {
             DoStatement dost = (DoStatement)st;
 
-            condlst.addAll(dost.getInitExprentList());
-            condlst.addAll(dost.getConditionExprentList());
+            lst.addAll(dost.getInitExprentList());
+            lst.addAll(dost.getConditionExprentList());
           }
         }
         else if (obj instanceof Exprent) {
-          condlst.add((Exprent)obj);
+          lst.add((Exprent)obj);
         }
       }
     }
     else {
-      condlst = stat.getExprents();
+      lst = stat.getExprents();
     }
 
-    if (retstat != stat) {
-      for (Exprent exprent : condlst) {
-        if (exprent != null && searchForClass(exprent, classtype)) {
-          retstat = stat;
+    if (retStat != stat) {
+      for (Exprent exprent : lst) {
+        if (exprent != null && searchForClass(exprent, classType)) {
+          retStat = stat;
           break;
         }
       }
     }
 
-    if (retstat != null) {
+    if (retStat != null) {
       setStats.add(stat);
     }
 
-    return retstat;
+    return retStat;
   }
 
-  private static boolean searchForClass(Exprent exprent, VarType classtype) {
-
+  private static boolean searchForClass(Exprent exprent, VarType classType) {
     List<Exprent> lst = exprent.getAllExprents(true);
     lst.add(exprent);
 
-    String classname = classtype.value;
+    String classname = classType.value;
 
     for (Exprent expr : lst) {
-
       boolean res = false;
 
       switch (expr.type) {
         case Exprent.EXPRENT_CONST:
-          ConstExprent cexpr = (ConstExprent)expr;
-          res = (VarType.VARTYPE_CLASS.equals(cexpr.getConstType()) && classname.equals(cexpr.getValue()) ||
-                 classtype.equals(cexpr.getConstType()));
+          ConstExprent constExpr = (ConstExprent)expr;
+          res = (VarType.VARTYPE_CLASS.equals(constExpr.getConstType()) && classname.equals(constExpr.getValue()) ||
+                 classType.equals(constExpr.getConstType()));
           break;
         case Exprent.EXPRENT_FIELD:
           res = classname.equals(((FieldExprent)expr).getClassname());
@@ -988,10 +902,10 @@ public class NestedClassProcessor {
           res = newType.type == CodeConstants.TYPE_OBJECT && classname.equals(newType.value);
           break;
         case Exprent.EXPRENT_VAR:
-          VarExprent vexpr = (VarExprent)expr;
-          if (vexpr.isDefinition()) {
-            VarType vtype = vexpr.getVarType();
-            if (classtype.equals(vtype) || (vtype.arrayDim > 0 && classtype.value.equals(vtype.value))) {
+          VarExprent varExpr = (VarExprent)expr;
+          if (varExpr.isDefinition()) {
+            VarType varType = varExpr.getVarType();
+            if (classType.equals(varType) || (varType.arrayDim > 0 && classType.value.equals(varType.value))) {
               res = true;
             }
           }
@@ -1005,15 +919,13 @@ public class NestedClassProcessor {
     return false;
   }
 
-
   private static class VarFieldPair {
+    public String fieldKey = "";
+    public VarVersionPair varPair;
 
-    public String keyfield = "";
-    public VarVersionPair varpaar;
-
-    public VarFieldPair(String field, VarVersionPair varpaar) {
-      this.keyfield = field;
-      this.varpaar = varpaar;
+    public VarFieldPair(String field, VarVersionPair varPair) {
+      this.fieldKey = field;
+      this.varPair = varPair;
     }
 
     @Override
@@ -1022,12 +934,12 @@ public class NestedClassProcessor {
       if (o == null || !(o instanceof VarFieldPair)) return false;
 
       VarFieldPair pair = (VarFieldPair)o;
-      return keyfield.equals(pair.keyfield) && varpaar.equals(pair.varpaar);
+      return fieldKey.equals(pair.fieldKey) && varPair.equals(pair.varPair);
     }
 
     @Override
     public int hashCode() {
-      return keyfield.hashCode() + varpaar.hashCode();
+      return fieldKey.hashCode() + varPair.hashCode();
     }
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index b5ecd9e..fb0adb7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -36,7 +36,6 @@ import java.util.List;
 import java.util.Set;
 
 public class NewExprent extends Exprent {
-
   private InvocationExprent constructor;
   private final VarType newType;
   private List<Exprent> lstDims = new ArrayList<Exprent>();
@@ -80,12 +79,7 @@ public class NewExprent extends Exprent {
 
   @Override
   public VarType getExprType() {
-    if (anonymous) {
-      return DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value).anonymousClassType;
-    }
-    else {
-      return newType;
-    }
+    return anonymous ? DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value).anonymousClassType : newType;
   }
 
   @Override
@@ -163,24 +157,22 @@ public class NewExprent extends Exprent {
     TextBuffer buf = new TextBuffer();
 
     if (anonymous) {
-
       ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
 
       buf.append("(");
 
       if (!lambda && constructor != null) {
+        InvocationExprent invSuper = child.superInvocation;
 
-        InvocationExprent invsuper = child.superInvocation;
-
-        ClassNode newnode = DecompilerContext.getClassProcessor().getMapRootClasses().get(invsuper.getClassname());
+        ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(invSuper.getClassname());
 
         List<VarVersionPair> sigFields = null;
-        if (newnode != null) { // own class
-          if (newnode.getWrapper() != null) {
-            sigFields = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, invsuper.getStringDescriptor()).signatureFields;
+        if (newNode != null) { // own class
+          if (newNode.getWrapper() != null) {
+            sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, invSuper.getStringDescriptor()).signatureFields;
           }
           else {
-            if (newnode.type == ClassNode.CLASS_MEMBER && (newnode.access & CodeConstants.ACC_STATIC) == 0 &&
+            if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0 &&
                 !constructor.getLstParameters().isEmpty()) { // member non-static class invoked with enclosing class instance
               sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(constructor.getLstParameters().size(), (VarVersionPair)null));
               sigFields.set(0, new VarVersionPair(-1, 0));
@@ -188,31 +180,29 @@ public class NewExprent extends Exprent {
           }
         }
 
-        boolean firstpar = true;
-        int start = 0, end = invsuper.getLstParameters().size();
+        boolean firstParam = true;
+        int start = 0, end = invSuper.getLstParameters().size();
         if (enumConst) {
           start += 2;
           end -= 1;
         }
         for (int i = start; i < end; i++) {
           if (sigFields == null || sigFields.get(i) == null) {
-            if (!firstpar) {
+            if (!firstParam) {
               buf.append(", ");
             }
 
-            Exprent param = invsuper.getLstParameters().get(i);
+            Exprent param = invSuper.getLstParameters().get(i);
             if (param.type == Exprent.EXPRENT_VAR) {
-              int varindex = ((VarExprent)param).getIndex();
-              if (varindex > 0 && varindex <= constructor.getLstParameters().size()) {
-                param = constructor.getLstParameters().get(varindex - 1);
+              int varIndex = ((VarExprent)param).getIndex();
+              if (varIndex > 0 && varIndex <= constructor.getLstParameters().size()) {
+                param = constructor.getLstParameters().get(varIndex - 1);
               }
             }
 
-            TextBuffer buff = new TextBuffer();
-            ExprProcessor.getCastedExprent(param, invsuper.getDescriptor().params[i], buff, indent, true, tracer);
+            ExprProcessor.getCastedExprent(param, invSuper.getDescriptor().params[i], buf, indent, true, tracer);
 
-            buf.append(buff);
-            firstpar = false;
+            firstParam = false;
           }
         }
       }
@@ -226,14 +216,15 @@ public class NewExprent extends Exprent {
         String typename = ExprProcessor.getCastTypeName(child.anonymousClassType);
 
         if (enclosing != null) {
-          ClassNode anonimousNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(child.anonymousClassType.value);
-          if (anonimousNode != null) {
-            typename = anonimousNode.simpleName;
+          ClassNode anonymousNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(child.anonymousClassType.value);
+          if (anonymousNode != null) {
+            typename = anonymousNode.simpleName;
           }
           else {
             typename = typename.substring(typename.lastIndexOf('.') + 1);
           }
         }
+
         buf.prepend("new " + typename);
 
         if (enclosing != null) {
@@ -275,118 +266,108 @@ public class NewExprent extends Exprent {
       }
       buf.append("}");
     }
-    else {
-      if (newType.arrayDim == 0) {
+    else if (newType.arrayDim == 0) {
+      if (constructor != null) {
+        List<Exprent> lstParameters = constructor.getLstParameters();
 
-        if (constructor != null) {
+        ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(constructor.getClassname());
 
-          List<Exprent> lstParameters = constructor.getLstParameters();
-
-          ClassNode newnode = DecompilerContext.getClassProcessor().getMapRootClasses().get(constructor.getClassname());
-
-          List<VarVersionPair> sigFields = null;
-          if (newnode != null) { // own class
-            if (newnode.getWrapper() != null) {
-              sigFields = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).signatureFields;
-            }
-            else {
-              if (newnode.type == ClassNode.CLASS_MEMBER && (newnode.access & CodeConstants.ACC_STATIC) == 0 &&
-                  !constructor.getLstParameters().isEmpty()) { // member non-static class invoked with enclosing class instance
-                sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
-                sigFields.set(0, new VarVersionPair(-1, 0));
-              }
-            }
+        List<VarVersionPair> sigFields = null;
+        if (newNode != null) { // own class
+          if (newNode.getWrapper() != null) {
+            sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).signatureFields;
           }
-
-          int start = enumConst ? 2 : 0;
-          if (!enumConst || start < lstParameters.size()) {
-            buf.append("(");
-
-            boolean firstParam = true;
-            for (int i = start; i < lstParameters.size(); i++) {
-              if (sigFields == null || sigFields.get(i) == null) {
-                Exprent expr = lstParameters.get(i);
-                VarType leftType = constructor.getDescriptor().params[i];
-
-                if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
-                  ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
-                  if (node != null && node.namelessConstructorStub) {
-                    break;  // skip last parameter of synthetic constructor call
-                  }
-                }
-
-                if (!firstParam) {
-                  buf.append(", ");
-                }
-
-                TextBuffer buff = new TextBuffer();
-                ExprProcessor.getCastedExprent(expr, leftType, buff, indent, true, tracer);
-                buf.append(buff);
-
-                firstParam = false;
-              }
-            }
-
-            buf.append(")");
+          else if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0 && !constructor.getLstParameters().isEmpty()) {
+            // member non-static class invoked with enclosing class instance
+            sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
+            sigFields.set(0, new VarVersionPair(-1, 0));
           }
         }
 
-        if (!enumConst) {
-          String enclosing = null;
-          if (constructor != null) {
-            enclosing = getQualifiedNewInstance(newType.value, constructor.getLstParameters(), indent, tracer);
-          }
+        int start = enumConst ? 2 : 0;
+        if (!enumConst || start < lstParameters.size()) {
+          buf.append("(");
 
-          String typename = ExprProcessor.getTypeName(newType);
+          boolean firstParam = true;
+          for (int i = start; i < lstParameters.size(); i++) {
+            if (sigFields == null || sigFields.get(i) == null) {
+              Exprent expr = lstParameters.get(i);
+              VarType leftType = constructor.getDescriptor().params[i];
 
-          if (enclosing != null) {
-            ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
-            if (newNode != null) {
-              typename = newNode.simpleName;
-            }
-            else {
-              typename = typename.substring(typename.lastIndexOf('.') + 1);
+              if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
+                ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
+                if (node != null && node.namelessConstructorStub) {
+                  break;  // skip last parameter of synthetic constructor call
+                }
+              }
+
+              if (!firstParam) {
+                buf.append(", ");
+              }
+
+              ExprProcessor.getCastedExprent(expr, leftType, buf, indent, true, tracer);
+
+              firstParam = false;
             }
           }
-          buf.prepend("new " + typename);
 
-          if (enclosing != null) {
-            buf.prepend(enclosing + ".");
-          }
+          buf.append(")");
         }
       }
-      else {
-        buf.append("new ").append(ExprProcessor.getTypeName(newType));
 
-        if (lstArrayElements.isEmpty()) {
-          for (int i = 0; i < newType.arrayDim; i++) {
-            buf.append("[");
-            if (i < lstDims.size()) {
-              buf.append(lstDims.get(i).toJava(indent, tracer));
-            }
-            buf.append("]");
+      if (!enumConst) {
+        String enclosing = null;
+        if (constructor != null) {
+          enclosing = getQualifiedNewInstance(newType.value, constructor.getLstParameters(), indent, tracer);
+        }
+
+        String typename = ExprProcessor.getTypeName(newType);
+
+        if (enclosing != null) {
+          ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
+          if (newNode != null) {
+            typename = newNode.simpleName;
+          }
+          else {
+            typename = typename.substring(typename.lastIndexOf('.') + 1);
           }
         }
-        else {
-          for (int i = 0; i < newType.arrayDim; i++) {
-            buf.append("[]");
-          }
+        buf.prepend("new " + typename);
 
-          VarType leftType = newType.decreaseArrayDim();
-          buf.append("{");
-          for (int i = 0; i < lstArrayElements.size(); i++) {
-            if (i > 0) {
-              buf.append(", ");
-            }
-            TextBuffer buff = new TextBuffer();
-            ExprProcessor.getCastedExprent(lstArrayElements.get(i), leftType, buff, indent, false, tracer);
-
-            buf.append(buff);
-          }
-          buf.append("}");
+        if (enclosing != null) {
+          buf.prepend(enclosing + ".");
         }
       }
     }
+    else {
+      buf.append("new ").append(ExprProcessor.getTypeName(newType));
+
+      if (lstArrayElements.isEmpty()) {
+        for (int i = 0; i < newType.arrayDim; i++) {
+          buf.append("[");
+          if (i < lstDims.size()) {
+            buf.append(lstDims.get(i).toJava(indent, tracer));
+          }
+          buf.append("]");
+        }
+      }
+      else {
+        for (int i = 0; i < newType.arrayDim; i++) {
+          buf.append("[]");
+        }
+
+        VarType leftType = newType.decreaseArrayDim();
+        buf.append("{");
+        for (int i = 0; i < lstArrayElements.size(); i++) {
+          if (i > 0) {
+            buf.append(", ");
+          }
+          ExprProcessor.getCastedExprent(lstArrayElements.get(i), leftType, buf, indent, false, tracer);
+        }
+        buf.append("}");
+      }
+    }
+
     return buf;
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
index 5969487..3c9f760 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,27 @@ import java.util.Collections;
 import java.util.List;
 
 public class StructInnerClassesAttribute extends StructGeneralAttribute {
+  public static class Entry {
+    public final int innerNameIdx;
+    public final int outerNameIdx;
+    public final int simpleNameIdx;
+    public final int accessFlags;
+    public final String innerName;
+    public final String enclosingName;
+    public final String simpleName;
 
-  private List<int[]> classEntries;
-  private List<String[]> stringEntries;
+    private Entry(int innerNameIdx, int outerNameIdx, int simpleNameIdx, int accessFlags, String innerName, String enclosingName, String simpleName) {
+      this.innerNameIdx = innerNameIdx;
+      this.outerNameIdx = outerNameIdx;
+      this.simpleNameIdx = simpleNameIdx;
+      this.accessFlags = accessFlags;
+      this.innerName = innerName;
+      this.enclosingName = enclosingName;
+      this.simpleName = simpleName;
+    }
+  }
+
+  private List<Entry> entries;
 
   @Override
   public void initContent(ConstantPool pool) throws IOException {
@@ -34,39 +52,27 @@ public class StructInnerClassesAttribute extends StructGeneralAttribute {
 
     int len = data.readUnsignedShort();
     if (len > 0) {
-      classEntries = new ArrayList<int[]>(len);
-      stringEntries = new ArrayList<String[]>(len);
+      entries = new ArrayList<Entry>(len);
 
       for (int i = 0; i < len; i++) {
-        int[] classEntry = new int[4];
-        for (int j = 0; j < 4; j++) {
-          classEntry[j] = data.readUnsignedShort();
-        }
-        classEntries.add(classEntry);
+        int innerNameIdx = data.readUnsignedShort();
+        int outerNameIdx = data.readUnsignedShort();
+        int simpleNameIdx = data.readUnsignedShort();
+        int accessFlags = data.readUnsignedShort();
 
-        // inner name, enclosing class, original simple name
-        String[] stringEntry = new String[3];
-        stringEntry[0] = pool.getPrimitiveConstant(classEntry[0]).getString();
-        if (classEntry[1] != 0) {
-          stringEntry[1] = pool.getPrimitiveConstant(classEntry[1]).getString();
-        }
-        if (classEntry[2] != 0) {
-          stringEntry[2] = pool.getPrimitiveConstant(classEntry[2]).getString();
-        }
-        stringEntries.add(stringEntry);
+        String innerName = pool.getPrimitiveConstant(innerNameIdx).getString();
+        String outerName = outerNameIdx != 0 ? pool.getPrimitiveConstant(outerNameIdx).getString() : null;
+        String simpleName = simpleNameIdx != 0 ? pool.getPrimitiveConstant(simpleNameIdx).getString() : null;
+
+        entries.add(new Entry(innerNameIdx, outerNameIdx, simpleNameIdx, accessFlags, innerName, outerName, simpleName));
       }
     }
     else {
-      classEntries = Collections.emptyList();
-      stringEntries = Collections.emptyList();
+      entries = Collections.emptyList();
     }
   }
 
-  public List<int[]> getClassEntries() {
-    return classEntries;
-  }
-
-  public List<String[]> getStringEntries() {
-    return stringEntries;
+  public List<Entry> getEntries() {
+    return entries;
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
index b965009..8ec1aaa 100644
--- a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
@@ -120,25 +120,6 @@ public class InterpreterUtil {
     return first == null ? second == null : first.equals(second);
   }
 
-  public static boolean equalObjectArrays(Object[] first, Object[] second) {
-    if (first == null || second == null) {
-      return equalObjects(first, second);
-    }
-    else {
-      if (first.length != second.length) {
-        return false;
-      }
-
-      for (int i = 0; i < first.length; i++) {
-        if (!equalObjects(first[i], second[i])) {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
   public static boolean equalLists(List<?> first, List<?> second) {
     if (first == null) {
       return second == null;
@@ -172,6 +153,10 @@ public class InterpreterUtil {
   }
 
   public static String makeUniqueKey(String name, String descriptor) {
-    return name + " " + descriptor;
+    return name + ' ' + descriptor;
+  }
+
+  public static String makeUniqueKey(String name, String descriptor1, String descriptor2) {
+    return name + ' ' + descriptor1 + ' ' + descriptor2;
   }
 }

From 1794156473bf72a83dc5644333234d922f0d0a4f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 11 Nov 2015 16:25:11 +0100
Subject: [PATCH 012/252] [java-decompiler] synthetic inner class constructor
 parameter filtering (IDEA-147606)

---
 .../main/rels/NestedClassProcessor.java       |  32 ++++++----
 .../pkg/TestInnerClassConstructor$1.class     | Bin 234 -> 231 bytes
 .../TestInnerClassConstructor$Another.class   | Bin 0 -> 856 bytes
 .../pkg/TestInnerClassConstructor$Inner.class | Bin 671 -> 668 bytes
 .../pkg/TestInnerClassConstructor.class       | Bin 886 -> 1081 bytes
 .../v11/TestInnerClassConstructor$1.class     | Bin 206 -> 224 bytes
 .../TestInnerClassConstructor$Another.class   | Bin 0 -> 880 bytes
 .../v11/TestInnerClassConstructor$Inner.class | Bin 695 -> 695 bytes
 .../v11/TestInnerClassConstructor.class       | Bin 880 -> 1086 bytes
 .../results/TestInnerClassConstructor.dec     |  60 +++++++++++++-----
 .../src/pkg/TestInnerClassConstructor.java    |  12 +++-
 11 files changed, 74 insertions(+), 30 deletions(-)
 create mode 100644 testData/classes/pkg/TestInnerClassConstructor$Another.class
 create mode 100644 testData/classes/v11/TestInnerClassConstructor$Another.class

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 6963f1d..c529a44 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -65,9 +65,9 @@ public class NestedClassProcessor {
 
     int nameless = 0, synthetics = 0;
     for (ClassNode child : node.nested) {
+      StructClass cl = child.classStruct;
       // ensure not-empty class name
       if ((child.type == ClassNode.CLASS_LOCAL || child.type == ClassNode.CLASS_MEMBER) && child.simpleName == null) {
-        StructClass cl = child.classStruct;
         if ((child.access & CodeConstants.ACC_SYNTHETIC) != 0 || cl.isSynthetic()) {
           child.simpleName = "SyntheticClass_" + (++synthetics);
         }
@@ -78,6 +78,9 @@ public class NestedClassProcessor {
         }
         child.namelessConstructorStub = !cl.hasModifier(CodeConstants.ACC_STATIC) && cl.getMethods().size() + cl.getFields().size() == 0;
       }
+      else if (child.type == ClassNode.CLASS_ANONYMOUS && (child.access & CodeConstants.ACC_SYNTHETIC) != 0 || cl.isSynthetic()) {
+        child.namelessConstructorStub = !cl.hasModifier(CodeConstants.ACC_STATIC) && cl.getMethods().size() + cl.getFields().size() == 0;
+      }
     }
 
     for (ClassNode child : node.nested) {
@@ -180,10 +183,14 @@ public class NestedClassProcessor {
     List<ClassNode> copy = new ArrayList<ClassNode>(node.nested);
 
     for (ClassNode child : copy) {
+      if (child.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
+        continue;
+      }
+
       if ((child.type == ClassNode.CLASS_LOCAL || child.type == ClassNode.CLASS_ANONYMOUS) && child.enclosingMethod == null) {
         Set<String> setEnclosing = child.enclosingClasses;
 
-        if (setEnclosing.size() == 1) {
+        if (!setEnclosing.isEmpty()) {
           StructEnclosingMethodAttribute attr =
             (StructEnclosingMethodAttribute)child.classStruct.getAttributes().getWithKey("EnclosingMethod");
           if (attr != null &&
@@ -199,17 +206,12 @@ public class NestedClassProcessor {
         child.parent = null;
         setEnclosing.remove(node.classStruct.qualifiedName);
 
-        boolean hasEnclosing = !setEnclosing.isEmpty();
-        if (hasEnclosing) {
-          hasEnclosing = insertNestedClass(root, child);
-        }
+        boolean hasEnclosing = !setEnclosing.isEmpty() && insertNestedClass(root, child);
 
         if (!hasEnclosing) {
           if (child.type == ClassNode.CLASS_ANONYMOUS) {
-            if (!child.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
-              String message = "Unreferenced anonymous class " + child.classStruct.qualifiedName + "!";
-              DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-            }
+            String message = "Unreferenced anonymous class " + child.classStruct.qualifiedName + "!";
+            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
           }
           else if (child.type == ClassNode.CLASS_LOCAL) {
             String message = "Unreferenced local class " + child.classStruct.qualifiedName + "!";
@@ -251,6 +253,10 @@ public class NestedClassProcessor {
     int clTypes = 0;
 
     for (ClassNode nd : node.nested) {
+      if (nd.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
+        continue;
+      }
+
       if (nd.type != ClassNode.CLASS_LAMBDA &&
           (nd.access & CodeConstants.ACC_STATIC) == 0 &&
           (nd.access & CodeConstants.ACC_INTERFACE) == 0) {
@@ -258,10 +264,8 @@ public class NestedClassProcessor {
 
         Map<String, List<VarFieldPair>> mask = getMaskLocalVars(nd.getWrapper());
         if (mask.isEmpty()) {
-          if (!nd.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
-            String message = "Nested class " + nd.classStruct.qualifiedName + " has no constructor!";
-            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-          }
+          String message = "Nested class " + nd.classStruct.qualifiedName + " has no constructor!";
+          DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
         }
         else {
           mapVarMasks.put(nd.classStruct.qualifiedName, mask);
diff --git a/testData/classes/pkg/TestInnerClassConstructor$1.class b/testData/classes/pkg/TestInnerClassConstructor$1.class
index 384ce5d4577bd4552a2b6956d2ae76ecf26ffa18..07172b9a8804ea82bb1ac365a26af77275b5879d 100644
GIT binary patch
delta 54
zcmaFG_?%JT)W2Q(7#J8#7`WLP*x4C4Cki;Ra4|B-Pn;{uq+&R+BAK59D9y#d2!uc&
GzySbo`U%?r

delta 61
zcmaFP_=-{B)W2Q(7#J9g8F<(k*x4DlCJH!la5FN<7i6dFPgIa(RWW2_V3=5%%+Co_
O#l^q~glr590vrIt(hAuC

diff --git a/testData/classes/pkg/TestInnerClassConstructor$Another.class b/testData/classes/pkg/TestInnerClassConstructor$Another.class
new file mode 100644
index 0000000000000000000000000000000000000000..5178a8fb69c55046581f2e931144727cedd2c4f3
GIT binary patch
literal 856
zcmah{?@QZI6g{`CO&X)d&fm7$&2&qfX(#MkhoD8FQ1pW$_%UrCH7<K8$?N{FeOL<{
z><`!<HFh5xE5j`kxc4OQ+;i@`x!-?$`3B%ES{4?uRpPL1!N!h(T?+;5=uk0H)p<{c
zeG4@_H}JxMODL-QFm>M$_Iu;^qt=Z`RaZ)pbfO?lJF!evG8w2iX*2a*C_{BZaJ?tE
z-EQNSQ0T-%L0IX9Qd~|x^hI(L^dn)QPO#@DA|;$Zt(a};9=ElnbsbNVfw%}GHs1U1
zWsV+#kAaO9I5w8BtkFxtrvBQB0y%13t0a`8vq=~YMPlO>JOcR|G;B2C8+dKw5J!Z1
z=G5F%8LNAd5R5;_ncH0TAH+cM?6XCV33*RnuNaKSLJkQPuiNO&b^dCX|J0%P=&+r|
zH&y&gg0SX2CbD8RvqK(^B&`3-^_G`yk@pcG$I-)Pl;ekI55g+Hog>d%3DleZXXKhQ
z<o&NG+|961nW9)WrZB4vrYKEeebPcGb6n;!U=t;5!Ns-%mR$cWS!2NkJ~f+ur8)!6
dtBTA3Hn@Qe&N;4M<6LI+j58dQo2}shxu2Bn(`^6%

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInnerClassConstructor$Inner.class b/testData/classes/pkg/TestInnerClassConstructor$Inner.class
index 37e92629907b5c97760be98960d92073855dad75..460cc7fa246772c2f44ee7288017d60bfcddd47c 100644
GIT binary patch
delta 140
zcmWNKJqp4=7)0MLBx^!6o5c7Zw}_;U;63bYynxnPd5a~jU}5h8ECgG@D~Vt8W`<YH
zEw~2l=l6U88(d649tnz=kYP;8$S^ic72)}CJgr)V^Ka+3do}ZqdonjH5-OI8+OMnb
iqP}THM9zT1A}#H9x~VN1nZisA;x&CqY)|e=CfGlB-4de!

delta 128
zcmWNKO$x#=7(`!!F*c+ot+xJFg%<bXQ9O({a38uYxNzwWTzCM%D~TTiGjH`~Fn7~^
zey=xh=HM{QGO4*^Oy#IqSeBM`>TaWrg7kd&t)=no*elv}YWl1ChMbJ4Bt(Q_f6>R*
VqbWqJDG9QrP%cX1L@sJp#6RY#4+a1L

diff --git a/testData/classes/pkg/TestInnerClassConstructor.class b/testData/classes/pkg/TestInnerClassConstructor.class
index fb0d8989730ab54ff28ba8910d7d1e9ab98c7c4f..6a4810977c54f3006d49d15e74ff4e65928b43d7 100644
GIT binary patch
delta 508
zcmZXQ%St0r5Qe|%PWp7(PK+_$O}uLo$IEyhXAneOWamoB(nUZ)q9oa8<6c6ZL>CF8
z-~+f(d>C;xSlx&tdf?Pw=kon^PQ5sP-NwVe+k0S*ZI5oUhB23M4~q%Iq(_vg7}Lxc
zW<6Z8E^~qAf{^zpFmL!_STHOKez8(1SNG12YqfGsFuRrW`boJeM8gBY`Ey!1t?vkS
zE`KOQ_RgCZ19H~9JaE$V2~({n$u?gTx>^!uf>rw6#3#+N;iu0EtF0cH?p<TuXM;_{
zmd`Ingp2~2R#~pB{aou&vi9#{QT4fz(60p}qEibY^lO$;71d~=gIsGO3}|%1O<S|U
zkE?lYL~u2JhgB-1Z0Qg=`i}(tQXhPUVdxVUnl%D0S}Hh3Ip-S}Q_fRvm=P@!ylewI
zbR53H+~Jlw#8O_Hu6dnp{5J8gwc}bfq0Fe#mj0|K^s`B-l1jSzxCALZvQ&FXz5%%n
BK%f8s

delta 347
zcmZ9GJ4*vm5QV?HarbUE*RXDU<Y880;w$kT@ds#SVIkO9iUb=;;bP~1kZ?PDOA9R$
zRPYD*gDl0lDhLkDoC9ahoOupEf|K{pmp7oxZp1h>&1^_L!XwQy$GoNy5l{<RaM*OC
z6|u;YW?8eMSyiAghy8x<>frJ$%X-=1ygRr%3KB|+rj5PS7F4m2(AIPeYpmO2)hcbU
zY1m?0vtuN`tf<Rw-QKHPd*eOq8~MjoPFhY$$fU4_pd{kAN2o_3iYb}yW4Ahn5uE;6
zw->qe`cL&m3q+lv{CjLq9L`sL!ha<=9ifwONWLRIBpOoqpOB~WomCN+N0nGG5mt1$
KaVX3%LHq^e%q9>3

diff --git a/testData/classes/v11/TestInnerClassConstructor$1.class b/testData/classes/v11/TestInnerClassConstructor$1.class
index b11a30e153220b083b2262397ec5df205ba94cff..fad6e4e7f4f46628e12b2c2e25d7ddcd25c00e1b 100644
GIT binary patch
delta 75
zcmX@d_<&L1)W2Q(7?>G!8F<(k*x4DlCJN~BGcs@nSLT&uq?TkRvoml{bS#l)2C89T
YU}9ilU<J|)44gpB#lQ%JY(N$V0DDLassI20

delta 57
zcmaFBc#cuv)W2Q(7?>G!8MxUQ*w`63Ckp5>voml_^evHO0*W&*Ffp(&Z~$p821X!c
H1+o|bUF`?U

diff --git a/testData/classes/v11/TestInnerClassConstructor$Another.class b/testData/classes/v11/TestInnerClassConstructor$Another.class
new file mode 100644
index 0000000000000000000000000000000000000000..61d71db360eb86036f2920a316203a8f7e279245
GIT binary patch
literal 880
zcmah|T~8WO5IwW3EUa6l)S@k*)-LS=D)LOz#1fm3koEy%(#Hj_xQchl?xl%8%ZEbJ
zCjJ0_RMWYdh>3O0CiAs(=FFYB_vY{KYoxG)rj13swc((cWvgVNY{NuRi}egPwBFR>
zosBKLx8Pd%KuD|8Aa?f%8{P5wuyH72)sa#}?U5hH?NG)lnhaDJwFueXrBtUv1p|hC
z3S^)@6I|~ZT&Gh#BAD&)SP+)GffU~+7kv>O`u&lx@R0z5Gv^dB;o$kA$*gX(rCIG>
zIEe=0YcOK&^(W7^d*=W29pvy*3(vs|ED;Ji+8FtA*yyP!ki##NlM@j+sG>%ox;9vB
zW5>d-g9dnrmBbmk`!eJKMg;5L%FS86_s_&Y@g|asGzlqBpDyi>$3h+xie9JMo!5ET
zEw63cd-SiBke*TDT>-+1_c)IWmJ|Eq(MZDU|B)VHlW(R2z45#rGV5jb0E0gs|7{#N
z;0tYXv{IYFsMUWVRsRF?#|#UlDbjgsicFb}DY8@8SDZ+A#d3*Zz$&s>gNrw8=h!ot
q3QTNbfpw-<FO_GYIV#O)pm5*F8hZw#3#{{Ot?+AM95=p&3XFf|l-5B2

literal 0
HcmV?d00001

diff --git a/testData/classes/v11/TestInnerClassConstructor$Inner.class b/testData/classes/v11/TestInnerClassConstructor$Inner.class
index 81face133c1c0a0a4de6e6ab415c35f3a4707da9..906b5711f24d97a0f8fdc11f0f2c02278e5d0601 100644
GIT binary patch
delta 37
scmdnax}9}HBon6~11EzJ10RF%<Rm5?MuExwO!Ax@46F>|3{ngN0Enywr~m)}

delta 37
rcmdnax}9}HBoiku11AF?5b{q>V$xycncUAL&&j~R${@}l#UKCxhWrJP

diff --git a/testData/classes/v11/TestInnerClassConstructor.class b/testData/classes/v11/TestInnerClassConstructor.class
index 9cbad7f8e6e0ca2762bab8a9b4aae003965c3e4e..b203edf2f2b92bcc8d835a7af96e2be831d14eee 100644
GIT binary patch
delta 486
zcmZ9J%T60X5JgXoJ=5dK*t|n9*gVX`HkfDZ@Q5OXC=2gcfmlY0C6K^Km^~Zz$eJ&K
zg)L!;56A+<2k;LpSs|)p6r{A&eY?8q-n!lW<lXw`e_n2GiBV!Jpoek8gwJGv!;~Qx
z;4+<HhFQa0fX}#3-eSQn#ejJh3?;*&VM#y;tMz*A^vBV!Mx)jc%=h}q*+K18aQ`L*
z@9Sax@a&rq%NKTq=5bn%nio6X5FdqHbT8TFb4sISVa7&-ZwetptQb~9*7zLtNp7G_
zCFBe1hK-O-#)OO#GSP3jbbjWeJIThjs#V2@?UY{4j<`;3q&|mrH>s$maf@x_N;kqM
zUG3%3Cy8qzjC9MRM<;v!o^=WFG@Je>R?ygrB|EtLMbAhZZ|{H6gwg^n8f8q2t%r&>
zvhC8>m=6Aan?!%m;={bo7GaCzyGFU|EUBJSO3EnBAxpodt4yz+qTk{w4rs<v9HjRZ
DF<(Ac

delta 350
zcmYL^J5Iwu5Qe|C6|Zfa5F9Xh;P42~gzyTYq@kjqqoJe-RY-wF%N0=Mnwo|N3P%Dd
z2cX~%+<+4xW}SkSX8zI6Ki}+5+#l!i^Y?v%O_yVzA`Q)wOYCFO^jKy^v+Co}a9K0j
zGHKmsgH6qrW?QqPKoOh|hyA;=!F7`KlhI9Y^mO5bR1~fBTg7Qn&6YyinohtjT}70B
zSy6hc{K_8t0S6pvjskjA6>&cDtRB+`>*X|%XPIM52vK&;OBIXCVhZgs>QxHGf@CMZ
zG}dTpO$T=K-gL~D#7-a{SfnaW13D3~>D1pSeBfM-(V?5+btE$UjG2G>l;Kg!X*HR$
Rs8bdVr78*A97}YL@*lWTDI5R*

diff --git a/testData/results/TestInnerClassConstructor.dec b/testData/results/TestInnerClassConstructor.dec
index 235d50f..f15701a 100644
--- a/testData/results/TestInnerClassConstructor.dec
+++ b/testData/results/TestInnerClassConstructor.dec
@@ -1,40 +1,65 @@
 package pkg;
 
 class TestInnerClassConstructor {
-   void m() {
+   void l() {
       new TestInnerClassConstructor.Inner("text");// 5
    }// 6
 
-   void n(String var1) {
-      System.out.println("n(): " + var1);// 9
+   void m() {
+      new TestInnerClassConstructor.Another(3, 4);// 9
    }// 10
 
+   void n(String var1) {
+      System.out.println("n(): " + var1);// 13
+   }// 14
+
+   private class Another {
+      private Another(int var2, int var3) {
+         TestInnerClassConstructor.this.n(var2 + "+" + var3);// 24
+      }// 25
+   }
+
    final class Inner {
       private Inner(String var2) {
-         TestInnerClassConstructor.this.n(var2);// 14
-      }// 15
+         TestInnerClassConstructor.this.n(var2);// 18
+      }// 19
    }
 }
 
 class 'pkg/TestInnerClassConstructor' {
-   method 'm ()V' {
+   method 'l ()V' {
       5      4
       c      5
    }
 
+   method 'm ()V' {
+      5      8
+      6      8
+      c      9
+   }
+
    method 'n (Ljava/lang/String;)V' {
-      0      8
-      a      8
-      13      8
-      16      8
-      19      9
+      0      12
+      a      12
+      13      12
+      16      12
+      19      13
+   }
+}
+
+class 'pkg/TestInnerClassConstructor$Another' {
+   method '<init> (Lpkg/TestInnerClassConstructor;II)V' {
+      15      17
+      1e      17
+      21      17
+      24      18
    }
 }
 
 class 'pkg/TestInnerClassConstructor$Inner' {
    method '<init> (Lpkg/TestInnerClassConstructor;Ljava/lang/String;)V' {
-      b      13
-      e      14
+      b      23
+      e      24
    }
 }
 
@@ -43,7 +68,12 @@ Lines mapping:
 6 <-> 6
 9 <-> 9
 10 <-> 10
+13 <-> 13
 14 <-> 14
-15 <-> 15
+18 <-> 24
+19 <-> 25
+24 <-> 18
+25 <-> 19
 Not mapped:
-13
+17
+23
diff --git a/testData/src/pkg/TestInnerClassConstructor.java b/testData/src/pkg/TestInnerClassConstructor.java
index e42c319..ccc33ff 100644
--- a/testData/src/pkg/TestInnerClassConstructor.java
+++ b/testData/src/pkg/TestInnerClassConstructor.java
@@ -1,10 +1,14 @@
 package pkg;
 
 class TestInnerClassConstructor {
-  void m() {
+  void l() {
     new Inner("text");
   }
 
+  void m() {
+    new Another(3, 4);
+  }
+
   void n(String s) {
     System.out.println("n(): " + s);
   }
@@ -14,4 +18,10 @@ class TestInnerClassConstructor {
       n(s);
     }
   }
+
+  private class Another {
+    private Another(int a, int b) {
+      n(a + "+" + b);
+    }
+  }
 }

From a725e5b7b6fa328083ae783b8838309f9c4f48e9 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 28 Dec 2015 15:23:16 +0100
Subject: [PATCH 013/252] Cleanup (java decompiler test optimization)

---
 .../decompiler/BulkDecompilationTest.java     |  2 +-
 .../decompiler/DecompilerTestFixture.java     | 31 +++---
 .../java/decompiler/SingleClassesTest.java    | 81 ++++++++++++++--
 .../decompiler/SingleClassesTestBase.java     | 97 -------------------
 4 files changed, 88 insertions(+), 123 deletions(-)
 delete mode 100644 test/org/jetbrains/java/decompiler/SingleClassesTestBase.java

diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
index 0211a57..31778cb 100644
--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+++ b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
@@ -94,4 +94,4 @@ public class BulkDecompilationTest {
       throw new RuntimeException(e);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index ad36548..b3385e2 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -22,10 +22,10 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -35,11 +35,9 @@ public class DecompilerTestFixture {
   private File targetDir;
   private ConsoleDecompiler decompiler;
 
-  public void setUp() throws IOException {
-    setUp(Collections.<String, Object>emptyMap());
-  }
+  public void setUp(String... optionPairs) throws IOException {
+    assertEquals(0, optionPairs.length % 2);
 
-  public void setUp(final Map<String, Object> options) throws IOException {
     testDataDir = new File("testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("community/plugins/java-decompiler/engine/testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("plugins/java-decompiler/engine/testData");
@@ -54,15 +52,18 @@ public class DecompilerTestFixture {
 
     targetDir = new File(tempDir, "decompiled");
     assertTrue(targetDir.mkdirs());
-    decompiler = new ConsoleDecompiler(this.targetDir, new HashMap<String, Object>() {{
-      put(IFernflowerPreferences.LOG_LEVEL, "warn");
-      put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
-      put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
-      put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
-      put(IFernflowerPreferences.LITERALS_AS_IS, "1");
-      put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
-      putAll(options);
-    }});
+
+    Map<String, Object> options = new HashMap<String, Object>();
+    options.put(IFernflowerPreferences.LOG_LEVEL, "warn");
+    options.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
+    options.put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+    options.put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+    options.put(IFernflowerPreferences.LITERALS_AS_IS, "1");
+    options.put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
+    for (int i = 0; i < optionPairs.length; i += 2) {
+      options.put(optionPairs[i], optionPairs[i + 1]);
+    }
+    decompiler = new ConsoleDecompiler(targetDir, options);
   }
 
   public void tearDown() {
@@ -121,4 +122,4 @@ public class DecompilerTestFixture {
       throw new RuntimeException(e);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 0da0d3b..1ab4ea2 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -15,19 +15,34 @@
  */
 package org.jetbrains.java.decompiler;
 
+import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.*;
 
-public class SingleClassesTest extends SingleClassesTestBase {
-  @Override
-  protected Map<String, Object> getDecompilerOptions() {
-    return new HashMap<String, Object>() {{
-      put(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1");
-      put(IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1");
-    }};
+import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
+import static org.junit.Assert.assertTrue;
+
+public class SingleClassesTest {
+  private DecompilerTestFixture fixture;
+
+  @Before
+  public void setUp() throws IOException {
+    fixture = new DecompilerTestFixture();
+    fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
+                  IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1");
+  }
+
+  @After
+  public void tearDown() {
+    fixture.tearDown();
+    fixture = null;
   }
 
   @Test public void testClassFields() { doTest("pkg/TestClassFields"); }
@@ -62,4 +77,50 @@ public class SingleClassesTest extends SingleClassesTestBase {
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
   @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
   @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
-}
+
+  protected void doTest(String testFile, String... companionFiles) {
+    ConsoleDecompiler decompiler = fixture.getDecompiler();
+
+    File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
+    assertTrue(classFile.isFile());
+    for (File file : collectClasses(classFile)) {
+      decompiler.addSpace(file, true);
+    }
+
+    for (String companionFile : companionFiles) {
+      File companionClassFile = new File(fixture.getTestDataDir(), "/classes/" + companionFile + ".class");
+      assertTrue(companionClassFile.isFile());
+      for (File file : collectClasses(companionClassFile)) {
+        decompiler.addSpace(file, true);
+      }
+    }
+
+    decompiler.decompileContext();
+
+    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
+    File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
+    assertTrue(decompiledFile.isFile());
+    File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
+    assertTrue(referenceFile.isFile());
+    assertFilesEqual(referenceFile, decompiledFile);
+  }
+
+  private static List<File> collectClasses(File classFile) {
+    List<File> files = new ArrayList<File>();
+    files.add(classFile);
+
+    File parent = classFile.getParentFile();
+    if (parent != null) {
+      final String pattern = classFile.getName().replace(".class", "") + "\\$.+\\.class";
+      File[] inner = parent.listFiles(new FilenameFilter() {
+        @Override
+        public boolean accept(File dir, String name) {
+          return name.matches(pattern);
+        }
+      });
+      if (inner != null) Collections.addAll(files, inner);
+    }
+
+    return files;
+  }
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
deleted file mode 100644
index 0601f0e..0000000
--- a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler;
-
-import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
-import static org.junit.Assert.assertTrue;
-
-public abstract class SingleClassesTestBase {
-  private DecompilerTestFixture fixture;
-
-  @Before
-  public void setUp() throws IOException {
-    fixture = new DecompilerTestFixture();
-    fixture.setUp(getDecompilerOptions());
-  }
-
-  @After
-  public void tearDown() {
-    fixture.tearDown();
-    fixture = null;
-  }
-
-  protected Map<String, Object> getDecompilerOptions() {
-    return Collections.emptyMap();
-  }
-
-  protected void doTest(String testFile, String... companionFiles) {
-    ConsoleDecompiler decompiler = fixture.getDecompiler();
-
-    File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
-    assertTrue(classFile.isFile());
-    for (File file : collectClasses(classFile)) {
-      decompiler.addSpace(file, true);
-    }
-
-    for (String companionFile : companionFiles) {
-      File companionClassFile = new File(fixture.getTestDataDir(), "/classes/" + companionFile + ".class");
-      assertTrue(companionClassFile.isFile());
-      for (File file : collectClasses(companionClassFile)) {
-        decompiler.addSpace(file, true);
-      }
-    }
-
-    decompiler.decompileContext();
-
-    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
-    File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
-    assertTrue(decompiledFile.isFile());
-    File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
-    assertTrue(referenceFile.isFile());
-    assertFilesEqual(referenceFile, decompiledFile);
-  }
-
-  private static List<File> collectClasses(File classFile) {
-    List<File> files = new ArrayList<File>();
-    files.add(classFile);
-
-    File parent = classFile.getParentFile();
-    if (parent != null) {
-      final String pattern = classFile.getName().replace(".class", "") + "\\$.+\\.class";
-      File[] inner = parent.listFiles(new FilenameFilter() {
-        @Override
-        public boolean accept(File dir, String name) {
-          return name.matches(pattern);
-        }
-      });
-      if (inner != null) Collections.addAll(files, inner);
-    }
-
-    return files;
-  }
-}

From 811494ccb28c0cd4b40834c58bd6512dfad3f1ca Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 28 Dec 2015 16:36:40 +0100
Subject: [PATCH 014/252] [java decompiler] "new" expression writer
 optimization

---
 .../modules/decompiler/exps/NewExprent.java   | 119 +++++++++---------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index fb0adb7..1edd0e4 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -159,7 +159,32 @@ public class NewExprent extends Exprent {
     if (anonymous) {
       ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
 
-      buf.append("(");
+      if (!enumConst) {
+        String enclosing = null;
+
+        if (!lambda && constructor != null) {
+          enclosing = getQualifiedNewInstance(child.anonymousClassType.value, constructor.getLstParameters(), indent, tracer);
+          if (enclosing != null) {
+            buf.append(enclosing).append('.');
+          }
+        }
+
+        buf.append("new ");
+
+        String typename = ExprProcessor.getCastTypeName(child.anonymousClassType);
+        if (enclosing != null) {
+          ClassNode anonymousNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(child.anonymousClassType.value);
+          if (anonymousNode != null) {
+            typename = anonymousNode.simpleName;
+          }
+          else {
+            typename = typename.substring(typename.lastIndexOf('.') + 1);
+          }
+        }
+        buf.append(typename);
+      }
+
+      buf.append('(');
 
       if (!lambda && constructor != null) {
         InvocationExprent invSuper = child.superInvocation;
@@ -207,32 +232,7 @@ public class NewExprent extends Exprent {
         }
       }
 
-      if (!enumConst) {
-        String enclosing = null;
-        if (!lambda && constructor != null) {
-          enclosing = getQualifiedNewInstance(child.anonymousClassType.value, constructor.getLstParameters(), indent, tracer);
-        }
-
-        String typename = ExprProcessor.getCastTypeName(child.anonymousClassType);
-
-        if (enclosing != null) {
-          ClassNode anonymousNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(child.anonymousClassType.value);
-          if (anonymousNode != null) {
-            typename = anonymousNode.simpleName;
-          }
-          else {
-            typename = typename.substring(typename.lastIndexOf('.') + 1);
-          }
-        }
-
-        buf.prepend("new " + typename);
-
-        if (enclosing != null) {
-          buf.prepend(enclosing + ".");
-        }
-      }
-
-      buf.append(")");
+      buf.append(')');
 
       if (enumConst && buf.length() == 2) {
         buf.setLength(0);
@@ -257,16 +257,41 @@ public class NewExprent extends Exprent {
     }
     else if (directArrayInit) {
       VarType leftType = newType.decreaseArrayDim();
-      buf.append("{");
+      buf.append('{');
       for (int i = 0; i < lstArrayElements.size(); i++) {
         if (i > 0) {
           buf.append(", ");
         }
         ExprProcessor.getCastedExprent(lstArrayElements.get(i), leftType, buf, indent, false, tracer);
       }
-      buf.append("}");
+      buf.append('}');
     }
     else if (newType.arrayDim == 0) {
+      if (!enumConst) {
+        String enclosing = null;
+
+        if (constructor != null) {
+          enclosing = getQualifiedNewInstance(newType.value, constructor.getLstParameters(), indent, tracer);
+          if (enclosing != null) {
+            buf.append(enclosing).append('.');
+          }
+        }
+
+        buf.append("new ");
+
+        String typename = ExprProcessor.getTypeName(newType);
+        if (enclosing != null) {
+          ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
+          if (newNode != null) {
+            typename = newNode.simpleName;
+          }
+          else {
+            typename = typename.substring(typename.lastIndexOf('.') + 1);
+          }
+        }
+        buf.append(typename);
+      }
+
       if (constructor != null) {
         List<Exprent> lstParameters = constructor.getLstParameters();
 
@@ -286,7 +311,7 @@ public class NewExprent extends Exprent {
 
         int start = enumConst ? 2 : 0;
         if (!enumConst || start < lstParameters.size()) {
-          buf.append("(");
+          buf.append('(');
 
           boolean firstParam = true;
           for (int i = start; i < lstParameters.size(); i++) {
@@ -311,31 +336,7 @@ public class NewExprent extends Exprent {
             }
           }
 
-          buf.append(")");
-        }
-      }
-
-      if (!enumConst) {
-        String enclosing = null;
-        if (constructor != null) {
-          enclosing = getQualifiedNewInstance(newType.value, constructor.getLstParameters(), indent, tracer);
-        }
-
-        String typename = ExprProcessor.getTypeName(newType);
-
-        if (enclosing != null) {
-          ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
-          if (newNode != null) {
-            typename = newNode.simpleName;
-          }
-          else {
-            typename = typename.substring(typename.lastIndexOf('.') + 1);
-          }
-        }
-        buf.prepend("new " + typename);
-
-        if (enclosing != null) {
-          buf.prepend(enclosing + ".");
+          buf.append(')');
         }
       }
     }
@@ -344,11 +345,11 @@ public class NewExprent extends Exprent {
 
       if (lstArrayElements.isEmpty()) {
         for (int i = 0; i < newType.arrayDim; i++) {
-          buf.append("[");
+          buf.append('[');
           if (i < lstDims.size()) {
             buf.append(lstDims.get(i).toJava(indent, tracer));
           }
-          buf.append("]");
+          buf.append(']');
         }
       }
       else {
@@ -357,14 +358,14 @@ public class NewExprent extends Exprent {
         }
 
         VarType leftType = newType.decreaseArrayDim();
-        buf.append("{");
+        buf.append('{');
         for (int i = 0; i < lstArrayElements.size(); i++) {
           if (i > 0) {
             buf.append(", ");
           }
           ExprProcessor.getCastedExprent(lstArrayElements.get(i), leftType, buf, indent, false, tracer);
         }
-        buf.append("}");
+        buf.append('}');
       }
     }
 

From bfddced4e257b1259865151c54669f3eab095eb9 Mon Sep 17 00:00:00 2001
From: Christopher Carpenter <intermediatelanguage@gmail.com>
Date: Thu, 21 Jan 2016 01:06:45 -0500
Subject: [PATCH 015/252] Fixed renaming class elements when using the
 decompilers -ren=1 option. Fixes issue IDEA-137253

---
 .../java/decompiler/struct/consts/ConstantPool.java          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index aa9ed9c..097440b 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -150,6 +150,11 @@ public class ConstantPool implements NewClassNameBuilder {
     String descriptor = ((PrimitiveConstant)getConstant(descriptorIndex)).getString();
 
     if (interceptor != null) {
+      String oldClassName = interceptor.getOldName(className);
+      if (oldClassName != null) {
+        className = oldClassName;
+      }
+
       String newElement = interceptor.getName(className + " " + elementName + " " + descriptor);
       if (newElement != null) {
         elementName = newElement.split(" ")[1];

From c825dd68ecd7ad0880f1187c4de97787577ff43b Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 27 Jan 2016 19:06:07 +0300
Subject: [PATCH 016/252] Cleanup (formatting; minor optimization)

---
 .../struct/consts/ConstantPool.java           | 58 +++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index 097440b..5d9b881 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,20 +27,21 @@ import org.jetbrains.java.decompiler.util.DataInputFullStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.BitSet;
 import java.util.List;
 
+@SuppressWarnings("AssignmentToForLoopParameter")
 public class ConstantPool implements NewClassNameBuilder {
-
   public static final int FIELD = 1;
   public static final int METHOD = 2;
 
-  private final List<PooledConstant> pool = new ArrayList<PooledConstant>();
+  private final List<PooledConstant> pool;
   private final PoolInterceptor interceptor;
 
-
   public ConstantPool(DataInputStream in) throws IOException {
     int size = in.readUnsignedShort();
-    int[] pass = new int[size];
+    pool = new ArrayList<PooledConstant>(size);
+    BitSet[] nextPass = {new BitSet(size), new BitSet(size), new BitSet(size)};
 
     // first dummy constant
     pool.add(null);
@@ -53,54 +54,59 @@ public class ConstantPool implements NewClassNameBuilder {
         case CodeConstants.CONSTANT_Utf8:
           pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Utf8, in.readUTF()));
           break;
+
         case CodeConstants.CONSTANT_Integer:
           pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Integer, new Integer(in.readInt())));
           break;
+
         case CodeConstants.CONSTANT_Float:
           pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Float, new Float(in.readFloat())));
           break;
+
         case CodeConstants.CONSTANT_Long:
           pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Long, new Long(in.readLong())));
           pool.add(null);
           i++;
           break;
+
         case CodeConstants.CONSTANT_Double:
           pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Double, new Double(in.readDouble())));
           pool.add(null);
           i++;
           break;
+
         case CodeConstants.CONSTANT_Class:
         case CodeConstants.CONSTANT_String:
         case CodeConstants.CONSTANT_MethodType:
           pool.add(new PrimitiveConstant(tag, in.readUnsignedShort()));
-          pass[i] = 1;
+          nextPass[0].set(i);
           break;
+
+        case CodeConstants.CONSTANT_NameAndType:
+          pool.add(new LinkConstant(tag, in.readUnsignedShort(), in.readUnsignedShort()));
+          nextPass[0].set(i);
+          break;
+
         case CodeConstants.CONSTANT_Fieldref:
         case CodeConstants.CONSTANT_Methodref:
         case CodeConstants.CONSTANT_InterfaceMethodref:
-        case CodeConstants.CONSTANT_NameAndType:
         case CodeConstants.CONSTANT_InvokeDynamic:
           pool.add(new LinkConstant(tag, in.readUnsignedShort(), in.readUnsignedShort()));
-          if (tag == CodeConstants.CONSTANT_NameAndType) {
-            pass[i] = 1;
-          }
-          else {
-            pass[i] = 2;
-          }
+          nextPass[1].set(i);
           break;
+
         case CodeConstants.CONSTANT_MethodHandle:
           pool.add(new LinkConstant(tag, in.readUnsignedByte(), in.readUnsignedShort()));
-          pass[i] = 3;
+          nextPass[2].set(i);
           break;
       }
     }
 
     // resolving complex pool elements
-    for (int passIndex = 1; passIndex <= 3; passIndex++) {
-      for (int i = 1; i < size; i++) {
-        if (pass[i] == passIndex) {
-          pool.get(i).resolveConstant(this);
-        }
+    for (BitSet pass : nextPass) {
+      int idx = 0;
+      while ((idx = pass.nextSetBit(idx + 1)) > 0) {
+        pool.get(idx).resolveConstant(this);
       }
     }
 
@@ -116,6 +122,7 @@ public class ConstantPool implements NewClassNameBuilder {
         case CodeConstants.CONSTANT_Utf8:
           in.readUTF();
           break;
+
         case CodeConstants.CONSTANT_Integer:
         case CodeConstants.CONSTANT_Float:
         case CodeConstants.CONSTANT_Fieldref:
@@ -125,16 +132,19 @@ public class ConstantPool implements NewClassNameBuilder {
         case CodeConstants.CONSTANT_InvokeDynamic:
           in.discard(4);
           break;
+
         case CodeConstants.CONSTANT_Long:
         case CodeConstants.CONSTANT_Double:
           in.discard(8);
           i++;
           break;
+
         case CodeConstants.CONSTANT_Class:
         case CodeConstants.CONSTANT_String:
         case CodeConstants.CONSTANT_MethodType:
           in.discard(2);
           break;
+
         case CodeConstants.CONSTANT_MethodHandle:
           in.discard(3);
       }
@@ -155,7 +165,7 @@ public class ConstantPool implements NewClassNameBuilder {
         className = oldClassName;
       }
 
-      String newElement = interceptor.getName(className + " " + elementName + " " + descriptor);
+      String newElement = interceptor.getName(className + ' ' + elementName + ' ' + descriptor);
       if (newElement != null) {
         elementName = newElement.split(" ")[1];
       }
@@ -196,7 +206,7 @@ public class ConstantPool implements NewClassNameBuilder {
          ln.type == CodeConstants.CONSTANT_Methodref ||
          ln.type == CodeConstants.CONSTANT_InterfaceMethodref)) {
       String newClassName = buildNewClassname(ln.classname);
-      String newElement = interceptor.getName(ln.classname + " " + ln.elementname + " " + ln.descriptor);
+      String newElement = interceptor.getName(ln.classname + ' ' + ln.elementname + ' ' + ln.descriptor);
       String newDescriptor = buildNewDescriptor(ln.type == CodeConstants.CONSTANT_Fieldref, ln.descriptor);
 
       if (newClassName != null || newElement != null || newDescriptor != null) {
@@ -220,10 +230,10 @@ public class ConstantPool implements NewClassNameBuilder {
 
       if (vt.arrayDim > 0) {
         for (int i = 0; i < vt.arrayDim; i++) {
-          buffer.append("[");
+          buffer.append('[');
         }
 
-        buffer.append("L").append(newName).append(";");
+        buffer.append('L').append(newName).append(';');
       }
       else {
         buffer.append(newName);
@@ -243,4 +253,4 @@ public class ConstantPool implements NewClassNameBuilder {
       return MethodDescriptor.parseDescriptor(descriptor).buildNewDescriptor(this);
     }
   }
-}
+}
\ No newline at end of file

From 233a1547a053cdb8507a2d8d6f8f6847f8326fef Mon Sep 17 00:00:00 2001
From: Christopher Carpenter <intermediatelanguage@gmail.com>
Date: Tue, 2 Feb 2016 22:40:00 -0500
Subject: [PATCH 017/252] [Fernflower] When using -ren=1, make the default
 renamer rename classes that have names that are reserved by the windows
 namespace.

---
 .../java/decompiler/modules/renamer/ConverterHelper.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 5912e6e..8a431df 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -28,6 +28,10 @@ public class ConverterHelper implements IIdentifierRenamer {
     "protected", "throw", "byte", "extends", "instanceof", "public", "throws", "case", "false", "int", "return", "transient", "catch",
     "final", "interface", "short", "true", "char", "finally", "long", "static", "try", "class", "float", "native", "strictfp", "void",
     "const", "for", "new", "super", "volatile", "continue", "goto", "null", "switch", "while", "default", "assert", "enum"));
+  private static final Set<String> RESERVED_WINDOWS_NAMESPACE = new HashSet<String>(Arrays.asList(
+    "aux", "prn", "aux", "nul",
+    "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9",
+    "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9"));
 
   private int classCounter = 0;
   private int fieldCounter = 0;
@@ -37,7 +41,8 @@ public class ConverterHelper implements IIdentifierRenamer {
   @Override
   public boolean toBeRenamed(Type elementType, String className, String element, String descriptor) {
     String value = elementType == Type.ELEMENT_CLASS ? className : element;
-    return value == null || value.length() == 0 || value.length() <= 2 || KEYWORDS.contains(value) || Character.isDigit(value.charAt(0));
+    return value == null || value.length() == 0 || value.length() <= 2 || KEYWORDS.contains(value) || Character.isDigit(value.charAt(0))
+      || elementType == Type.ELEMENT_CLASS && RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase());
   }
 
   // TODO: consider possible conflicts with not renamed classes, fields and methods!

From 94851b6cbbbb81b36073990a83d61eb3646cb9c4 Mon Sep 17 00:00:00 2001
From: Christopher Carpenter <intermediatelanguage@gmail.com>
Date: Wed, 3 Feb 2016 16:30:06 -0500
Subject: [PATCH 018/252] Added a TODO regarding IDEA-137253.

---
 .../jetbrains/java/decompiler/struct/consts/ConstantPool.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index 5d9b881..a204910 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -208,7 +208,8 @@ public class ConstantPool implements NewClassNameBuilder {
       String newClassName = buildNewClassname(ln.classname);
       String newElement = interceptor.getName(ln.classname + ' ' + ln.elementname + ' ' + ln.descriptor);
       String newDescriptor = buildNewDescriptor(ln.type == CodeConstants.CONSTANT_Fieldref, ln.descriptor);
-
+      //TODO: Fix newElement being null caused by ln.classname being a leaf class instead of the class that declared the field/method.
+      //See the comments of IDEA-137253 for more information.
       if (newClassName != null || newElement != null || newDescriptor != null) {
         String className = newClassName == null ? ln.classname : newClassName;
         String elementName = newElement == null ? ln.elementname : newElement.split(" ")[1];

From ec51c10d08f92a708de26bf68509d20a9e456298 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 29 Feb 2016 15:31:12 +0300
Subject: [PATCH 019/252] decompiler: support java 9 bytecode version

---
 src/org/jetbrains/java/decompiler/code/CodeConstants.java | 3 ++-
 src/org/jetbrains/java/decompiler/struct/StructClass.java | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/CodeConstants.java b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
index 18d1ddb..7718ac3 100644
--- a/src/org/jetbrains/java/decompiler/code/CodeConstants.java
+++ b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ public interface CodeConstants {
   int BYTECODE_JAVA_6 = 3;
   int BYTECODE_JAVA_7 = 4;
   int BYTECODE_JAVA_8 = 5;
+  int BYTECODE_JAVA_9 = 6;
 
   // ----------------------------------------------------------------------
   // VARIABLE TYPES
diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
index cb24ff6..895e4c1 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -180,6 +180,8 @@ public class StructClass extends StructMember {
 
   public int getBytecodeVersion() {
     switch (majorVersion) {
+      case 53:
+        return CodeConstants.BYTECODE_JAVA_9;
       case 52:
         return CodeConstants.BYTECODE_JAVA_8;
       case 51:

From f12851532512439e2c951494230511e3d0c4a5bf Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 29 Feb 2016 16:21:54 +0300
Subject: [PATCH 020/252] IDEA-151950 Decompiler doesn't work for classes from
 JDK 9

---
 .../decompiler/modules/decompiler/ExprProcessor.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 9296bb3..cbc66c7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -573,9 +573,12 @@ public class ExprProcessor implements CodeConstants {
 
             if (instr.opcode == opc_invokedynamic && bootstrap != null) {
               List<PooledConstant> bootstrap_arguments = bootstrap.getMethodArguments(invoke_constant.index1);
-              LinkConstant content_method_handle = (LinkConstant)bootstrap_arguments.get(1);
-
-              dynamic_invokation_type = content_method_handle.index1;
+              if (bootstrap_arguments.size() > 1) { // INVOKEDYNAMIC is used not only for lambdas
+                PooledConstant link = bootstrap_arguments.get(1);
+                if (link instanceof LinkConstant) {
+                  dynamic_invokation_type = ((LinkConstant)link).index1;
+                }
+              }
             }
 
             InvocationExprent exprinv = new InvocationExprent(instr.opcode, invoke_constant, stack, dynamic_invokation_type, bytecode_offsets);

From 4724fd78a6e296c27aae91182afeebc84c0c2161 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 1 Mar 2016 18:04:29 +0300
Subject: [PATCH 021/252] IDEA-151950 Decompiler doesn't work for classes from
 JDK 9 - support java 9 string concatenation

---
 .../decompiler/ConcatenationHelper.java       |  69 ++++++++++++++++--
 .../modules/decompiler/ExprProcessor.java     |  13 +---
 .../decompiler/exps/InvocationExprent.java    |  35 ++++++---
 .../java/decompiler/SingleClassesTest.java    |   4 +-
 .../classes/java9/TestJava9StringConcat.class | Bin 0 -> 871 bytes
 testData/classes/pkg/TestStringConcat.class   | Bin 0 -> 740 bytes
 testData/results/TestJava9StringConcat.dec    |  27 +++++++
 testData/results/TestStringConcat.dec         |  31 ++++++++
 testData/src/java9/TestJava9StringConcat.java |  26 +++++++
 testData/src/pkg/TestStringConcat.class       | Bin 0 -> 740 bytes
 testData/src/pkg/TestStringConcat.java        |  26 +++++++
 11 files changed, 206 insertions(+), 25 deletions(-)
 create mode 100644 testData/classes/java9/TestJava9StringConcat.class
 create mode 100644 testData/classes/pkg/TestStringConcat.class
 create mode 100644 testData/results/TestJava9StringConcat.dec
 create mode 100644 testData/results/TestStringConcat.dec
 create mode 100644 testData/src/java9/TestJava9StringConcat.java
 create mode 100644 testData/src/pkg/TestStringConcat.class
 create mode 100644 testData/src/pkg/TestStringConcat.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
index 74ef0a2..7d7b33d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,15 @@ package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
+import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
+import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 public class ConcatenationHelper {
 
@@ -52,6 +56,12 @@ public class ConcatenationHelper {
           exprTmp = iex.getInstance();
         }
       }
+      else if ("makeConcatWithConstants".equals(iex.getName())) { // java 9 style
+        List<Exprent> parameters = extractParameters(iex.getBootstrapArguments(), iex);
+        if (parameters.size() >= 2) {
+          return createConcatExprent(parameters, expr.bytecode);
+        }
+      }
     }
 
     if (exprTmp == null) {
@@ -125,20 +135,69 @@ public class ConcatenationHelper {
         lstOperands.set(i, rep);
       }
     }
+    return createConcatExprent(lstOperands, expr.bytecode);
+  }
 
+  private static Exprent createConcatExprent(List<Exprent> lstOperands, Set<Integer> bytecode) {
     // build exprent to return
     Exprent func = lstOperands.get(0);
 
     for (int i = 1; i < lstOperands.size(); i++) {
-      List<Exprent> lstTmp = new ArrayList<Exprent>();
-      lstTmp.add(func);
-      lstTmp.add(lstOperands.get(i));
-      func = new FunctionExprent(FunctionExprent.FUNCTION_STR_CONCAT, lstTmp, expr.bytecode);
+      func = new FunctionExprent(FunctionExprent.FUNCTION_STR_CONCAT, Arrays.asList(func, lstOperands.get(i)), bytecode);
     }
 
     return func;
   }
 
+  // See StringConcatFactory in jdk sources
+  private static final char TAG_ARG = '\u0001';
+  private static final char TAG_CONST = '\u0002';
+
+  private static List<Exprent> extractParameters(List<PooledConstant> bootstrapArguments, InvocationExprent expr) {
+    List<Exprent> parameters = expr.getLstParameters();
+    if (bootstrapArguments != null) {
+      PooledConstant constant = bootstrapArguments.get(0);
+      if (constant.type == CodeConstants.CONSTANT_String) {
+        String recipe = ((PrimitiveConstant)constant).getString();
+
+        List<Exprent> res = new ArrayList<>();
+        StringBuilder acc = new StringBuilder();
+        int parameterId = 0;
+        for (int i = 0; i < recipe.length(); i++) {
+          char c = recipe.charAt(i);
+
+          if (c == TAG_CONST || c == TAG_ARG) {
+            // Detected a special tag, flush all accumulated characters
+            // as a constant first:
+            if (acc.length() > 0) {
+              res.add(new ConstExprent(VarType.VARTYPE_STRING, acc.toString(), expr.bytecode));
+              acc.setLength(0);
+            }
+            if (c == TAG_CONST) {
+              // skip for now
+            }
+            if (c == TAG_ARG) {
+              res.add(parameters.get(parameterId++));
+            }
+          }
+          else {
+            // Not a special characters, this is a constant embedded into
+            // the recipe itself.
+            acc.append(c);
+          }
+        }
+
+        // Flush the remaining characters as constant:
+        if (acc.length() > 0) {
+          res.add(new ConstExprent(VarType.VARTYPE_STRING, acc.toString(), expr.bytecode));
+        }
+
+        return res;
+      }
+    }
+    return new ArrayList<>(parameters);
+  }
+
   private static boolean isAppendConcat(InvocationExprent expr, VarType cltype) {
 
     if ("append".equals(expr.getName())) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index cbc66c7..008d0bb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -567,21 +567,14 @@ public class ExprProcessor implements CodeConstants {
         case opc_invokeinterface:
         case opc_invokedynamic:
           if (instr.opcode != opc_invokedynamic || instr.bytecode_version >= CodeConstants.BYTECODE_JAVA_7) {
-
             LinkConstant invoke_constant = pool.getLinkConstant(instr.getOperand(0));
-            int dynamic_invokation_type = -1;
 
+            List<PooledConstant> bootstrap_arguments = null;
             if (instr.opcode == opc_invokedynamic && bootstrap != null) {
-              List<PooledConstant> bootstrap_arguments = bootstrap.getMethodArguments(invoke_constant.index1);
-              if (bootstrap_arguments.size() > 1) { // INVOKEDYNAMIC is used not only for lambdas
-                PooledConstant link = bootstrap_arguments.get(1);
-                if (link instanceof LinkConstant) {
-                  dynamic_invokation_type = ((LinkConstant)link).index1;
-                }
-              }
+              bootstrap_arguments = bootstrap.getMethodArguments(invoke_constant.index1);
             }
 
-            InvocationExprent exprinv = new InvocationExprent(instr.opcode, invoke_constant, stack, dynamic_invokation_type, bytecode_offsets);
+            InvocationExprent exprinv = new InvocationExprent(instr.opcode, invoke_constant, bootstrap_arguments, stack, bytecode_offsets);
             if (exprinv.getDescriptor().ret.type == CodeConstants.TYPE_VOID) {
               exprlist.add(exprinv);
             }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 294a115..3ceb99c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,6 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -36,6 +29,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
@@ -45,6 +39,9 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
+import java.util.*;
+import java.util.Map.Entry;
+
 public class InvocationExprent extends Exprent {
 
   public static final int INVOKE_SPECIAL = 1;
@@ -69,16 +66,22 @@ public class InvocationExprent extends Exprent {
   private String invokeDynamicClassSuffix;
   private int invocationTyp = INVOKE_VIRTUAL;
   private List<Exprent> lstParameters = new ArrayList<Exprent>();
+  private List<PooledConstant> bootstrapArguments;
 
   public InvocationExprent() {
     super(EXPRENT_INVOCATION);
   }
 
-  public InvocationExprent(int opcode, LinkConstant cn, ListStack<Exprent> stack, int dynamicInvocationType, Set<Integer> bytecodeOffsets) {
+  public InvocationExprent(int opcode,
+                           LinkConstant cn,
+                           List<PooledConstant> bootstrapArguments,
+                           ListStack<Exprent> stack,
+                           Set<Integer> bytecodeOffsets) {
     this();
 
     name = cn.elementname;
     classname = cn.classname;
+    this.bootstrapArguments = bootstrapArguments;
 
     switch (opcode) {
       case CodeConstants.opc_invokestatic:
@@ -115,6 +118,15 @@ public class InvocationExprent extends Exprent {
     }
 
     if (opcode == CodeConstants.opc_invokedynamic) {
+      int dynamicInvocationType = -1;
+      if (bootstrapArguments != null) {
+        if (bootstrapArguments.size() > 1) { // INVOKEDYNAMIC is used not only for lambdas
+          PooledConstant link = bootstrapArguments.get(1);
+          if (link instanceof LinkConstant) {
+            dynamicInvocationType = ((LinkConstant)link).index1;
+          }
+        }
+      }
       if (dynamicInvocationType == CodeConstants.CONSTANT_MethodHandle_REF_invokeStatic) {
         isStatic = true;
       }
@@ -154,6 +166,7 @@ public class InvocationExprent extends Exprent {
     ExprProcessor.copyEntries(lstParameters);
 
     addBytecodeOffsets(expr.bytecode);
+    bootstrapArguments = expr.getBootstrapArguments();
   }
 
   @Override
@@ -492,6 +505,10 @@ public class InvocationExprent extends Exprent {
     return invokeDynamicClassSuffix;
   }
 
+  public List<PooledConstant> getBootstrapArguments() {
+    return bootstrapArguments;
+  }
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 1ab4ea2..b8869b0 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,6 +77,8 @@ public class SingleClassesTest {
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
   @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
   @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
+  @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
+  @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/java9/TestJava9StringConcat.class b/testData/classes/java9/TestJava9StringConcat.class
new file mode 100644
index 0000000000000000000000000000000000000000..721a0ed9499e46d3ea2ea1853198faba1186a168
GIT binary patch
literal 871
zcmaJ<O>fgc5Pg#-aq6Z`TMGS3OG{IlP?-qCB?{s|q>7>dheUATv`JR28+SLdH<kKN
z_!)3Q%7Guik3!7WmTFoHA7*C9@4cCw+24O=zW}_#k&6PBS2<o=1>uo{bq5=S;%i^|
z<_%%4-uO(&cl1aSDqUa6kJHP64EtgbaHe2nWL^-C>fH-*C7OXyXU(1oeRbA8ZQRc#
zjF*H~79&OYG`NsM)6UdzdwLoU<%w@w*y?i&@40v@uG`USD9m%)P8mfwgypwdo5+M>
z@<Ez&J&GztY?iQ9#x@p8s9L{B*tV2bGgFR5ZtoYj=3)oCgd7oJ{Zfo&T=<J`&N+&V
zP$nYG*U2N#^QhtAu`P5!sNG8W>PnAgGO<|TL=24%uN@rn8oFAKrxQZ?R4EyD0ue=$
zRllW&muSRydneQ=kWnorwo?O5wvx*HL+oEqWCr|e3ZJo(M4}^tpywOecJP#Nc<+8$
zy%Bc*kHbFl{5tJ7$8VEY$+pC&9rnb&@a!k(2M0W6w#A#Iea0>p*jnfwa!dwF$JH5!
z_<jey#<(&T6ZAe~^Ng53u6i@ey9?jo<PrmNsNe~Emx+6*ai^PD;qwyzu?;-9u@C<O
DTg291

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestStringConcat.class b/testData/classes/pkg/TestStringConcat.class
new file mode 100644
index 0000000000000000000000000000000000000000..029207376cef59555729fc47605dda16cd3b41b5
GIT binary patch
literal 740
zcmZ`%O;5r=5PeI5){24!1Qk^LqChIqcrh3cl9-qfJwQx67HCKjTT+X^OD`qS#2?^~
zGR{g33bo0;-I?us^JcOipRex#PEeMygsg})86jjjtaI4lkdu&?uqk1SN81t#B6dXV
zGDOcz%XH5f1hsU_5U$%@gCX89E#rFh&^DZw-X2gU;u??c5kpaJ^z|pbI?%0Nwdp#h
z)vH~V=5s#dnBg>t@r!WN?i(Gq7N{XN?UB<lE=_JB-69K<l6Bka=<XqR62mg$44GM1
z7bA1fHJljsu+QNjh9Xo3#+OF@YMRFLB?@V!hWEYdYypPERCeN%CZ-REhSg=z0vem|
z!uL^Q$f*H?nqEt;J!y{2sPj4`@TcIvWBXA=0Wo?J{1d?Vln4_P<!NWMN6KTc7dkMk
z5Jta~3Za4|A^){PuSK9e`G(Nl7(&HEIOieaA^JQ+Oc5o8v`?%PG0X*gq9PKLvlYpg
XP!{N*d61PwIs^!2NotiOLdbjpIgF-t

literal 0
HcmV?d00001

diff --git a/testData/results/TestJava9StringConcat.dec b/testData/results/TestJava9StringConcat.dec
new file mode 100644
index 0000000..389bb85
--- /dev/null
+++ b/testData/results/TestJava9StringConcat.dec
@@ -0,0 +1,27 @@
+package java9;
+
+public class TestJava9StringConcat {
+   public String test1(String var1, int var2) {
+      return var1 + var2;// 20
+   }
+
+   public String test2(String var1, int var2, Object var3) {
+      return "(" + var1 + "-" + var2 + "---" + var3 + ")";// 24
+   }
+}
+
+class 'java9/TestJava9StringConcat' {
+   method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
+      2      4
+      7      4
+   }
+
+   method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
+      3      8
+      8      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+24 <-> 9
diff --git a/testData/results/TestStringConcat.dec b/testData/results/TestStringConcat.dec
new file mode 100644
index 0000000..b3fc995
--- /dev/null
+++ b/testData/results/TestStringConcat.dec
@@ -0,0 +1,31 @@
+package pkg;
+
+public class TestStringConcat {
+   public String test1(String var1, int var2) {
+      return var1 + var2;// 20
+   }
+
+   public String test2(String var1, int var2, Object var3) {
+      return "(" + var1 + "-" + var2 + "---" + var3 + ")";// 24
+   }
+}
+
+class 'pkg/TestStringConcat' {
+   method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
+      f      4
+      12      4
+   }
+
+   method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
+      7      8
+      10      8
+      19      8
+      22      8
+      27      8
+      2a      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+24 <-> 9
diff --git a/testData/src/java9/TestJava9StringConcat.java b/testData/src/java9/TestJava9StringConcat.java
new file mode 100644
index 0000000..9e19596
--- /dev/null
+++ b/testData/src/java9/TestJava9StringConcat.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package java9;
+
+public class TestJava9StringConcat {
+  public String test1(String prefix, int a) {
+    return prefix + a;
+  }
+
+  public String test2(String var, int b, Object c) {
+    return "(" + var + "-" + b + "---" + c + ")";
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestStringConcat.class b/testData/src/pkg/TestStringConcat.class
new file mode 100644
index 0000000000000000000000000000000000000000..029207376cef59555729fc47605dda16cd3b41b5
GIT binary patch
literal 740
zcmZ`%O;5r=5PeI5){24!1Qk^LqChIqcrh3cl9-qfJwQx67HCKjTT+X^OD`qS#2?^~
zGR{g33bo0;-I?us^JcOipRex#PEeMygsg})86jjjtaI4lkdu&?uqk1SN81t#B6dXV
zGDOcz%XH5f1hsU_5U$%@gCX89E#rFh&^DZw-X2gU;u??c5kpaJ^z|pbI?%0Nwdp#h
z)vH~V=5s#dnBg>t@r!WN?i(Gq7N{XN?UB<lE=_JB-69K<l6Bka=<XqR62mg$44GM1
z7bA1fHJljsu+QNjh9Xo3#+OF@YMRFLB?@V!hWEYdYypPERCeN%CZ-REhSg=z0vem|
z!uL^Q$f*H?nqEt;J!y{2sPj4`@TcIvWBXA=0Wo?J{1d?Vln4_P<!NWMN6KTc7dkMk
z5Jta~3Za4|A^){PuSK9e`G(Nl7(&HEIOieaA^JQ+Oc5o8v`?%PG0X*gq9PKLvlYpg
XP!{N*d61PwIs^!2NotiOLdbjpIgF-t

literal 0
HcmV?d00001

diff --git a/testData/src/pkg/TestStringConcat.java b/testData/src/pkg/TestStringConcat.java
new file mode 100644
index 0000000..1a77677
--- /dev/null
+++ b/testData/src/pkg/TestStringConcat.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public class TestStringConcat {
+  public String test1(String prefix, int a) {
+    return prefix + a;
+  }
+
+  public String test2(String var, int b, Object c) {
+    return "(" + var + "-" + b + "---" + c + ")";
+  }
+}
\ No newline at end of file

From ba16ca4dfcac0d233551cf4807ed4a7c230cb2db Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 1 Mar 2016 17:44:22 +0100
Subject: [PATCH 022/252] [java decompiler] engine target level set back to
 Java 6

---
 java-decompiler-engine.iml                                    | 2 +-
 .../decompiler/modules/decompiler/ConcatenationHelper.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-decompiler-engine.iml b/java-decompiler-engine.iml
index 5880ebf..f5977f4 100644
--- a/java-decompiler-engine.iml
+++ b/java-decompiler-engine.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
index 7d7b33d..90d2732 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
@@ -160,7 +160,7 @@ public class ConcatenationHelper {
       if (constant.type == CodeConstants.CONSTANT_String) {
         String recipe = ((PrimitiveConstant)constant).getString();
 
-        List<Exprent> res = new ArrayList<>();
+        List<Exprent> res = new ArrayList<Exprent>();
         StringBuilder acc = new StringBuilder();
         int parameterId = 0;
         for (int i = 0; i < recipe.length(); i++) {
@@ -195,7 +195,7 @@ public class ConcatenationHelper {
         return res;
       }
     }
-    return new ArrayList<>(parameters);
+    return new ArrayList<Exprent>(parameters);
   }
 
   private static boolean isAppendConcat(InvocationExprent expr, VarType cltype) {

From cb72744cdb13a69849d8a96f55e024c2b0951473 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 2 Mar 2016 15:41:33 +0300
Subject: [PATCH 023/252] removed misplaced test file

---
 testData/src/pkg/TestStringConcat.class | Bin 740 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 testData/src/pkg/TestStringConcat.class

diff --git a/testData/src/pkg/TestStringConcat.class b/testData/src/pkg/TestStringConcat.class
deleted file mode 100644
index 029207376cef59555729fc47605dda16cd3b41b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 740
zcmZ`%O;5r=5PeI5){24!1Qk^LqChIqcrh3cl9-qfJwQx67HCKjTT+X^OD`qS#2?^~
zGR{g33bo0;-I?us^JcOipRex#PEeMygsg})86jjjtaI4lkdu&?uqk1SN81t#B6dXV
zGDOcz%XH5f1hsU_5U$%@gCX89E#rFh&^DZw-X2gU;u??c5kpaJ^z|pbI?%0Nwdp#h
z)vH~V=5s#dnBg>t@r!WN?i(Gq7N{XN?UB<lE=_JB-69K<l6Bka=<XqR62mg$44GM1
z7bA1fHJljsu+QNjh9Xo3#+OF@YMRFLB?@V!hWEYdYypPERCeN%CZ-REhSg=z0vem|
z!uL^Q$f*H?nqEt;J!y{2sPj4`@TcIvWBXA=0Wo?J{1d?Vln4_P<!NWMN6KTc7dkMk
z5Jta~3Za4|A^){PuSK9e`G(Nl7(&HEIOieaA^JQ+Oc5o8v`?%PG0X*gq9PKLvlYpg
XP!{N*d61PwIs^!2NotiOLdbjpIgF-t


From 1b23240c84df4a68216ad8a8110a8177814f7e67 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 2 Mar 2016 17:53:25 +0300
Subject: [PATCH 024/252] decompiler: fixed SOE if referenced method name is
 the same as current

---
 .../decompiler/main/rels/LambdaProcessor.java |   6 ++--
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../pkg/TestMethodReferenceSameName$R1.class  | Bin 0 -> 444 bytes
 .../pkg/TestMethodReferenceSameName.class     | Bin 0 -> 1000 bytes
 .../results/TestMethodReferenceSameName.dec   |  34 ++++++++++++++++++
 .../src/pkg/TestMethodReferenceSameName.java  |  26 ++++++++++++++
 6 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 testData/classes/pkg/TestMethodReferenceSameName$R1.class
 create mode 100644 testData/classes/pkg/TestMethodReferenceSameName.class
 create mode 100644 testData/results/TestMethodReferenceSameName.dec
 create mode 100644 testData/src/pkg/TestMethodReferenceSameName.java

diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
index 0704efd..b5ac0fb 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,7 +115,9 @@ public class LambdaProcessor {
               node_lambda.parent = node;
 
               clProcessor.getMapRootClasses().put(node_lambda.simpleName, node_lambda);
-              mapMethodsLambda.put(node_lambda.lambdaInformation.content_method_key, node_lambda.simpleName);
+              if (!node_lambda.lambdaInformation.is_method_reference) {
+                mapMethodsLambda.put(node_lambda.lambdaInformation.content_method_key, node_lambda.simpleName);
+              }
             }
           }
         }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index b8869b0..6ef71c0 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -79,6 +79,7 @@ public class SingleClassesTest {
   @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
   @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
   @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
+  @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestMethodReferenceSameName$R1.class b/testData/classes/pkg/TestMethodReferenceSameName$R1.class
new file mode 100644
index 0000000000000000000000000000000000000000..895110b36fa6faecdbecbedb8b0db49a57213437
GIT binary patch
literal 444
zcmaKo%Syvg5QhIrVq#;o@s5ZRq>Ea?D!5bJ6a=AGXp8%kbZS%56G&3u%Y_Iod;lLx
zoFlGWWHJBTzB9v_ukVjf09V*=z(&)DgV4j4hh2hO&C;@UK{)D<xvU<zn&p!rPq|>7
z@JKCqAa*U_O{&xCmJqdT$<rr-)5|AJX!cXhgXJRTVyxm!D)uzbMcW4QNBOcy_%1b#
zsAl>3T)n6OD{upN2t4c&j%)bV@RDE|3GTJ#qL-<%<dP7YLETL0=k8-X=cFPW*33a9
z*K*`=6ozKIM3$I`RS+5yok(sfe&_5B)Om;XDw+ID)D;gQfi(nw{K0Qmi2qna#;i-z
P!UlH4`|`lXCboeeX?b7L

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodReferenceSameName.class b/testData/classes/pkg/TestMethodReferenceSameName.class
new file mode 100644
index 0000000000000000000000000000000000000000..600e5518dce170a639efdd7f0eb938c1375692a8
GIT binary patch
literal 1000
zcmbVLU2hUW6g?NpE?rirw0>Z1#Yz=Wi&f(b#s^7^Cfk|-(fByPfZHxJWIvkpXPFp{
zeeeeuf0OYp)UZagCO*u}nKSpEnR{mD+mExa03PF!1rr;qFmNeGm&?p<7H}O~Cbmu7
zFi|CBy88tCl~U60cp?a7Kp>w`b^0<04`ldWkGgU!eW`}BC#Ld{Tdlj_CKyj$<%Z7)
z*?Qv*VWp!-l2CG7B@d(NK>B?#@R-StwI*0S9r;7~!i}kFium4<I1x53plG82+r~}o
z5Z0b+9R{H<W{WcgB?GtCP%Pz8v$2cYCho*zk+7K}&O)(#%M)tSdObLj!;r9@lE9@B
z@)H@(-65>k8_rT;PPQ%7(Xfz5lZ*8uMR-#Gmwic<ZlqLf6?<A<YX4$Q+_iBJEgKi(
z>UNe9t~$}jvgL^BU?kWUF&4v6`=^A$bU8D@6&Q}z$I*=Ny`DJ!xxm8FmqLv^8Ppb$
z?L=5F^j$ScGQTDEPiOM~78hHl=O&Fh-?k$>ujhucZQ>ze_YXt<RuA8DdK^D9gMSG?
z-1yybpJB|;koywPws?%!a?Q`64-EJ%ac|5?{z&olFpfhX%u|7l=0{}SeM0u_8CHNV
t$Pt#A7Durh)>$Kq_;+R)TRfH-<(XY&e4o|!P{9?(HtS#I*b1(p@)O!a0^a}t

literal 0
HcmV?d00001

diff --git a/testData/results/TestMethodReferenceSameName.dec b/testData/results/TestMethodReferenceSameName.dec
new file mode 100644
index 0000000..3449a8c
--- /dev/null
+++ b/testData/results/TestMethodReferenceSameName.dec
@@ -0,0 +1,34 @@
+public class TestMethodReferenceSameName {
+   TestMethodReferenceSameName.R1 r;
+
+   private void foo() {
+      TestMethodReferenceSameName.R1 var10000 = this.r;// 5
+      this.r.getClass();
+      (var10000::foo).run();
+   }// 6
+
+   class R1 {
+      void foo() {
+      }// 9
+   }
+}
+
+class 'TestMethodReferenceSameName' {
+   method 'foo ()V' {
+      1      4
+      5      5
+      e      6
+      13      7
+   }
+}
+
+class 'TestMethodReferenceSameName$R1' {
+   method 'foo ()V' {
+      0      11
+   }
+}
+
+Lines mapping:
+5 <-> 5
+6 <-> 8
+9 <-> 12
diff --git a/testData/src/pkg/TestMethodReferenceSameName.java b/testData/src/pkg/TestMethodReferenceSameName.java
new file mode 100644
index 0000000..58d18d3
--- /dev/null
+++ b/testData/src/pkg/TestMethodReferenceSameName.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class TestMethodReferenceSameName {
+  R1 r;
+
+  private void foo() {
+    ((Runnable)r::foo).run();
+  }
+
+  class R1 {
+    void foo() {}
+  }
+}

From 876740dd0e9804ec2db08b13f06a5481efa959f6 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 2 Mar 2016 20:44:56 +0300
Subject: [PATCH 025/252] decompiler: fixed incorrect method references from
 single letter classes

---
 .../java/decompiler/main/ClassWriter.java     |   4 +--
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/R.class                  | Bin 0 -> 250 bytes
 .../pkg/TestMethodReferenceLetterClass.class  | Bin 0 -> 839 bytes
 .../TestMethodReferenceLetterClass.dec        |  18 ++++++++++++
 .../pkg/TestMethodReferenceLetterClass.java   |  27 ++++++++++++++++++
 6 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 testData/classes/pkg/R.class
 create mode 100644 testData/classes/pkg/TestMethodReferenceLetterClass.class
 create mode 100644 testData/results/TestMethodReferenceLetterClass.dec
 create mode 100644 testData/src/pkg/TestMethodReferenceLetterClass.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index b55f29d..dc0f3fc 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ public class ClassWriter {
         }
         else {
           // reference to a static method
-          buffer.append(ExprProcessor.getCastTypeName(new VarType(node.lambdaInformation.content_class_name, false)));
+          buffer.append(ExprProcessor.getCastTypeName(new VarType(node.lambdaInformation.content_class_name, true)));
         }
 
         buffer.append("::");
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 6ef71c0..e3a6f56 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -80,6 +80,7 @@ public class SingleClassesTest {
   @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
   @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
   @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
+  @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/R.class b/testData/classes/pkg/R.class
new file mode 100644
index 0000000000000000000000000000000000000000..7c9c9e22c83c2a30917e4935a229eedcab9d1397
GIT binary patch
literal 250
zcmZWjyGq1R5IvKp#$DZ3K@e=z!ZenPO<=3ILJamd$wU)kF5KMsUsl2vet;h(&b8Ra
zftmA|Q=IRg-4}p694GK`6k`!%Nr=|n*x7r6e|7y#2r}I;;Uw=y-p+3on^IMSIDV@&
zA$iiXsd>{m>$2p@KCpe&O~EZ29&66oS~l6Brs=j<?`nYnA%P0Q%IS1a<4gKj^;}zA
tz>_L&JXr}s`UpE0B*F0J6Z9d35X+7J%u`_p`>0bc`Y(1S_MtpHB)>#BD&YVC

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodReferenceLetterClass.class b/testData/classes/pkg/TestMethodReferenceLetterClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..74bb32df8d438abca6a2b7ee6fc4e0a96342aef2
GIT binary patch
literal 839
zcmbVKO>fgc5Pg$0ad8a^Eh(REY12}t2Ylfc#DPc%Bm+_s^}cZ?#jUd&+3QOES)7o1
z;0GXn6JlIPBz!0bEO}?<&6}B>+4=V4`YV7JIB~HCZ&UP52U`yA5$Z2v9otugs^2*!
zto6*835_t;{2`x?I321{B1m;)48a|kJdOBGTtMw1XZAhYPiEZb38$<h4%u2xdx^@j
z=jZBDd8naIXudYaW;Ru`lAkr|Xf?6jsNsGS4?H}?Bf{?Lgp#I686--d1s_M}99b8S
z@r2Ow!#_RU&Z&zX>`I4z*cVF_6-7L=ggw7g@^c#}!6es_jg1a^MrZky)2@R(4^MIE
z;K;+X;{FGV^s&A)7aW9YIvOkKMom;?O?pMxm@X^_z7!0NxyWY(@1553sc=U4zI@$z
zzH%;al^!RY9hQOJrLG1xjrG|w@>}5WYR3QPEK9DAosa8g@bj`gl_Z1Ma+g4TS&xY^
z4myORzb5ss&g89E^RSPq>}v5<K*bWt>4>!>l0?={zJNZ9LRgoxa06TN-}*&u3sw=t
qxh_PwAiFnkONiT2#T7~g8)%DkC1fARIFN<BEw(529pN<4#ND5+3)-mw

literal 0
HcmV?d00001

diff --git a/testData/results/TestMethodReferenceLetterClass.dec b/testData/results/TestMethodReferenceLetterClass.dec
new file mode 100644
index 0000000..0491efa
--- /dev/null
+++ b/testData/results/TestMethodReferenceLetterClass.dec
@@ -0,0 +1,18 @@
+import java.util.function.Consumer;
+
+public class TestMethodReferenceLetterClass {
+   void boo() {
+      Consumer var1 = R::foo;// 21
+   }// 22
+}
+
+class 'TestMethodReferenceLetterClass' {
+   method 'boo ()V' {
+      5      4
+      6      5
+   }
+}
+
+Lines mapping:
+21 <-> 5
+22 <-> 6
diff --git a/testData/src/pkg/TestMethodReferenceLetterClass.java b/testData/src/pkg/TestMethodReferenceLetterClass.java
new file mode 100644
index 0000000..5f290d8
--- /dev/null
+++ b/testData/src/pkg/TestMethodReferenceLetterClass.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.function.Consumer;
+
+public class TestMethodReferenceLetterClass {
+  void boo() {
+    Consumer<R> foo = R::foo;
+  }
+}
+
+class R {
+  void foo() {}
+}
\ No newline at end of file

From df863df9c1efc9e8d7850066a6820962e0ffefef Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 3 Mar 2016 12:16:46 +0100
Subject: [PATCH 026/252] [java decompiler] engine source/target level set to
 Java 8

---
 build.xml                  | 2 +-
 java-decompiler-engine.iml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 7986eb4..3088f83 100644
--- a/build.xml
+++ b/build.xml
@@ -26,7 +26,7 @@
 
   <target name="compile" depends="init,clean">
     <mkdir dir="${out}"/>
-    <javac srcdir="${src}" destdir="${out}" source="1.6" target="1.6" encoding="UTF-8" debug="true" includeantruntime="false"/>
+    <javac srcdir="${src}" destdir="${out}" source="1.8" target="1.8" encoding="UTF-8" debug="true" includeantruntime="false"/>
   </target>
 
   <target name="dist" depends="init,compile">
diff --git a/java-decompiler-engine.iml b/java-decompiler-engine.iml
index f5977f4..5880ebf 100644
--- a/java-decompiler-engine.iml
+++ b/java-decompiler-engine.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

From cfe1448b2b0f00bdda2434726ab15b1030519f89 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 3 Mar 2016 13:45:52 +0100
Subject: [PATCH 027/252] Cleanup (unneeded anonymous classes)

---
 .../java/decompiler/main/ClassWriter.java     | 28 +++----
 .../main/extern/IFernflowerPreferences.java   | 74 ++++++++++---------
 .../modules/decompiler/exps/ConstExprent.java | 28 +++----
 3 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index dc0f3fc..b438695 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -980,19 +980,21 @@ public class ClassWriter {
     }
   }
 
-  private static final Map<Integer, String> MODIFIERS = new LinkedHashMap<Integer, String>() {{
-    put(CodeConstants.ACC_PUBLIC, "public");
-    put(CodeConstants.ACC_PROTECTED, "protected");
-    put(CodeConstants.ACC_PRIVATE, "private");
-    put(CodeConstants.ACC_ABSTRACT, "abstract");
-    put(CodeConstants.ACC_STATIC, "static");
-    put(CodeConstants.ACC_FINAL, "final");
-    put(CodeConstants.ACC_STRICT, "strictfp");
-    put(CodeConstants.ACC_TRANSIENT, "transient");
-    put(CodeConstants.ACC_VOLATILE, "volatile");
-    put(CodeConstants.ACC_SYNCHRONIZED, "synchronized");
-    put(CodeConstants.ACC_NATIVE, "native");
-  }};
+  private static final Map<Integer, String> MODIFIERS;
+  static {
+    MODIFIERS = new LinkedHashMap<>();
+    MODIFIERS.put(CodeConstants.ACC_PUBLIC, "public");
+    MODIFIERS.put(CodeConstants.ACC_PROTECTED, "protected");
+    MODIFIERS.put(CodeConstants.ACC_PRIVATE, "private");
+    MODIFIERS.put(CodeConstants.ACC_ABSTRACT, "abstract");
+    MODIFIERS.put(CodeConstants.ACC_STATIC, "static");
+    MODIFIERS.put(CodeConstants.ACC_FINAL, "final");
+    MODIFIERS.put(CodeConstants.ACC_STRICT, "strictfp");
+    MODIFIERS.put(CodeConstants.ACC_TRANSIENT, "transient");
+    MODIFIERS.put(CodeConstants.ACC_VOLATILE, "volatile");
+    MODIFIERS.put(CodeConstants.ACC_SYNCHRONIZED, "synchronized");
+    MODIFIERS.put(CodeConstants.ACC_NATIVE, "native");
+  }
 
   private static final int CLASS_ALLOWED =
     CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_ABSTRACT |
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index cd6333b..c1ceecd 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,37 +59,43 @@ public interface IFernflowerPreferences {
   String LINE_SEPARATOR_WIN = "\r\n";
   String LINE_SEPARATOR_UNX = "\n";
 
-  Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
-    put(REMOVE_BRIDGE, "1");
-    put(REMOVE_SYNTHETIC, "0");
-    put(DECOMPILE_INNER, "1");
-    put(DECOMPILE_CLASS_1_4, "1");
-    put(DECOMPILE_ASSERTIONS, "1");
-    put(HIDE_EMPTY_SUPER, "1");
-    put(HIDE_DEFAULT_CONSTRUCTOR, "1");
-    put(DECOMPILE_GENERIC_SIGNATURES, "0");
-    put(NO_EXCEPTIONS_RETURN, "1");
-    put(DECOMPILE_ENUM, "1");
-    put(REMOVE_GET_CLASS_NEW, "1");
-    put(LITERALS_AS_IS, "0");
-    put(BOOLEAN_TRUE_ONE, "1");
-    put(ASCII_STRING_CHARACTERS, "0");
-    put(SYNTHETIC_NOT_SET, "1");
-    put(UNDEFINED_PARAM_TYPE_OBJECT, "1");
-    put(USE_DEBUG_VAR_NAMES, "1");
-    put(REMOVE_EMPTY_RANGES, "1");
-    put(FINALLY_DEINLINE, "1");
-    put(IDEA_NOT_NULL_ANNOTATION, "1");
-    put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
-    put(BYTECODE_SOURCE_MAPPING, "0");
+  Map<String, Object> DEFAULTS = getDefaults();
 
-    put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-    put(MAX_PROCESSING_METHOD, "0");
-    put(RENAME_ENTITIES, "0");
-    put(NEW_LINE_SEPARATOR, (InterpreterUtil.IS_WINDOWS ? "0" : "1"));
-    put(INDENT_STRING, "   ");
-    put(BANNER, "");
-    put(UNIT_TEST_MODE, "0");
-    put(DUMP_ORIGINAL_LINES, "0");
-  }});
-}
+  static Map<String, Object> getDefaults() {
+    Map<String, Object> defaults = new HashMap<>();
+
+    defaults.put(REMOVE_BRIDGE, "1");
+    defaults.put(REMOVE_SYNTHETIC, "0");
+    defaults.put(DECOMPILE_INNER, "1");
+    defaults.put(DECOMPILE_CLASS_1_4, "1");
+    defaults.put(DECOMPILE_ASSERTIONS, "1");
+    defaults.put(HIDE_EMPTY_SUPER, "1");
+    defaults.put(HIDE_DEFAULT_CONSTRUCTOR, "1");
+    defaults.put(DECOMPILE_GENERIC_SIGNATURES, "0");
+    defaults.put(NO_EXCEPTIONS_RETURN, "1");
+    defaults.put(DECOMPILE_ENUM, "1");
+    defaults.put(REMOVE_GET_CLASS_NEW, "1");
+    defaults.put(LITERALS_AS_IS, "0");
+    defaults.put(BOOLEAN_TRUE_ONE, "1");
+    defaults.put(ASCII_STRING_CHARACTERS, "0");
+    defaults.put(SYNTHETIC_NOT_SET, "1");
+    defaults.put(UNDEFINED_PARAM_TYPE_OBJECT, "1");
+    defaults.put(USE_DEBUG_VAR_NAMES, "1");
+    defaults.put(REMOVE_EMPTY_RANGES, "1");
+    defaults.put(FINALLY_DEINLINE, "1");
+    defaults.put(IDEA_NOT_NULL_ANNOTATION, "1");
+    defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
+    defaults.put(BYTECODE_SOURCE_MAPPING, "0");
+
+    defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
+    defaults.put(MAX_PROCESSING_METHOD, "0");
+    defaults.put(RENAME_ENTITIES, "0");
+    defaults.put(NEW_LINE_SEPARATOR, (InterpreterUtil.IS_WINDOWS ? "0" : "1"));
+    defaults.put(INDENT_STRING, "   ");
+    defaults.put(BANNER, "");
+    defaults.put(UNIT_TEST_MODE, "0");
+    defaults.put(DUMP_ORIGINAL_LINES, "0");
+
+    return Collections.unmodifiableMap(defaults);
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 4b9b687..8fcf176 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
@@ -33,16 +32,18 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class ConstExprent extends Exprent {
-  private static final Map<Integer, String> ESCAPES = new HashMap<Integer, String>() {{
-    put(new Integer(0x8), "\\b");   /* \u0008: backspace BS */
-    put(new Integer(0x9), "\\t");   /* \u0009: horizontal tab HT */
-    put(new Integer(0xA), "\\n");   /* \u000a: linefeed LF */
-    put(new Integer(0xC), "\\f");   /* \u000c: form feed FF */
-    put(new Integer(0xD), "\\r");   /* \u000d: carriage return CR */
-    put(new Integer(0x22), "\\\""); /* \u0022: double quote " */
-    put(new Integer(0x27), "\\\'"); /* \u0027: single quote ' */
-    put(new Integer(0x5C), "\\\\"); /* \u005c: backslash \ */
-  }};
+  private static final Map<Integer, String> ESCAPES;
+  static {
+    ESCAPES = new HashMap<>();
+    ESCAPES.put(new Integer(0x8), "\\b");   /* \u0008: backspace BS */
+    ESCAPES.put(new Integer(0x9), "\\t");   /* \u0009: horizontal tab HT */
+    ESCAPES.put(new Integer(0xA), "\\n");   /* \u000a: linefeed LF */
+    ESCAPES.put(new Integer(0xC), "\\f");   /* \u000c: form feed FF */
+    ESCAPES.put(new Integer(0xD), "\\r");   /* \u000d: carriage return CR */
+    ESCAPES.put(new Integer(0x22), "\\\""); /* \u0022: double quote " */
+    ESCAPES.put(new Integer(0x27), "\\\'"); /* \u0027: single quote ' */
+    ESCAPES.put(new Integer(0x5C), "\\\\"); /* \u005c: backslash \ */
+  }
 
   private VarType constType;
   private final Object value;
@@ -432,5 +433,4 @@ public class ConstExprent extends Exprent {
     
     return true;
   }
-  
-}
+}
\ No newline at end of file

From 5795c1d9e0076e1732df1b9673e69e2ec39dec47 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 4 Mar 2016 15:32:42 +0100
Subject: [PATCH 028/252] [tests] test cases added

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestMemberAnnotations$A.class | Bin 0 -> 438 bytes
 .../classes/pkg/TestMemberAnnotations.class   | Bin 0 -> 619 bytes
 testData/results/TestMemberAnnotations.dec    |  34 ++++++++++++++++++
 testData/src/pkg/TestMemberAnnotations.java   |  13 +++++++
 5 files changed, 48 insertions(+)
 create mode 100644 testData/classes/pkg/TestMemberAnnotations$A.class
 create mode 100644 testData/classes/pkg/TestMemberAnnotations.class
 create mode 100644 testData/results/TestMemberAnnotations.dec
 create mode 100644 testData/src/pkg/TestMemberAnnotations.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index e3a6f56..5647ab8 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -81,6 +81,7 @@ public class SingleClassesTest {
   @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
   @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
+  @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestMemberAnnotations$A.class b/testData/classes/pkg/TestMemberAnnotations$A.class
new file mode 100644
index 0000000000000000000000000000000000000000..f7fa7905d1df87219b377e5d8ec65948f42139ea
GIT binary patch
literal 438
zcmah_yG{c!5S+~eha*4&p#Taf&<Pr@p`(g;NRbGjB+xt2a&mBd(b*S?U!&jy_$b7t
z;ZlGoM)r(nJ-hq)_5K0i0(%PE3OfqBg!)3;f(f0|v%9HY=)`K5Cc}^$mtGRuUFWi(
zgUQ@Azv#jS0tnGCEAk278Y`s-Ble-svoYtT+n+CgBkT_f7tD;GjW=V<D+a>xN}~SB
zNd_EPYBDGJ@jsTw%$muY7}enEe$?yVD0B#i^Vc-_wX2gZfdtK-bDUpU?LB)!s~r7d
zJmrZ@c~nX(y_NmTXn&@}%N<n&RoOSy2sPA&tqH4oD3Kd-tzaFIoSX8rA*eB$LfRrl
KLJ3=F#f@(Xy?7)5

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMemberAnnotations.class b/testData/classes/pkg/TestMemberAnnotations.class
new file mode 100644
index 0000000000000000000000000000000000000000..cb09ec42b752ea4b02021fb65ee398f219fe1a59
GIT binary patch
literal 619
zcmZ`#O-n*S6g}g&_A2|%%)W?77rALy1R?~2eNf`M(I%OCj`7|+e^r|x2wL<5`ccst
zYmrimnS1Y?Gw0lUKR(~y0UTmGhXmHMh@+IoMjD%GYzc^(fY&fa1$AGBp$Y|(^^5cC
z7NLf~bbVk#D~)YSKT>fDRRjuGk+Hh3+B(!7U)78mSZOtx0;T5TL$BIWp*>UmjtYK(
zyR{>V51kNW*9p_)j`^Kd{;fdjSQ~9m1mgSUwm_mjxFvJ8sf{|1oLEcJj=+AS%-&Lg
zvQc0JcE<a;l!5FkJLXMI8T15l*MlhNs#EQB*8Xhs;9d@;hj}b`$Ro>f|D8x6@5ohO
znqKvybFaFbsQ52^w}vgQKfx`=P(TJ*#@wiyg2y-oZk%T(#4I7YvzP$p2*7nmXpvco
zQ7|SeuMp2n1eSQGz8^;_%QSV=9aiphu2^|N>?U8id79vRlWr?mCB<_VKaCYAvBtL;
Oiby*#LP;8=_A*}twS2Px

literal 0
HcmV?d00001

diff --git a/testData/results/TestMemberAnnotations.dec b/testData/results/TestMemberAnnotations.dec
new file mode 100644
index 0000000..1e3a41c
--- /dev/null
+++ b/testData/results/TestMemberAnnotations.dec
@@ -0,0 +1,34 @@
+package pkg;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+class TestMemberAnnotations {
+   @TestMemberAnnotations.A("const")
+   public static final int CONST = 42;
+   @TestMemberAnnotations.A("field")
+   private int f;
+
+   @TestMemberAnnotations.A("return")
+   private int f(@TestMemberAnnotations.A("arg") int var1) {
+      return var1 + this.f + 42;// 12
+   }
+
+   @Retention(RetentionPolicy.RUNTIME)
+   @interface A {
+      String value() default "";
+   }
+}
+
+class 'pkg/TestMemberAnnotations' {
+   method 'f (I)I' {
+      2      13
+      5      13
+      6      13
+      8      13
+      9      13
+   }
+}
+
+Lines mapping:
+12 <-> 14
diff --git a/testData/src/pkg/TestMemberAnnotations.java b/testData/src/pkg/TestMemberAnnotations.java
new file mode 100644
index 0000000..b7c7da9
--- /dev/null
+++ b/testData/src/pkg/TestMemberAnnotations.java
@@ -0,0 +1,13 @@
+package pkg;
+
+import java.lang.annotation.*;
+
+class TestMemberAnnotations {
+  @Retention(RetentionPolicy.RUNTIME)
+  @interface A { String value() default ""; }
+
+  @A("const") public static final int CONST = 42;
+  @A("field") private int f;
+
+  @A("return") private int f(@A("arg") int i) { return i + f + CONST; }
+}
\ No newline at end of file

From 7cf7bec4b68a70b7da6aed3cd41a375e67364626 Mon Sep 17 00:00:00 2001
From: Alexandru-Constantin Bledea <contact@apixandru.com>
Date: Mon, 7 Mar 2016 21:00:21 +0200
Subject: [PATCH 029/252] prevent static field name clashes in local methods

---
 .../modules/decompiler/exps/FieldExprent.java |   8 ++-
 .../java/decompiler/util/StructUtils.java     |  65 ++++++++++++++++++
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 .../classes/pkg/TestStaticNameClash.class     | Bin 0 -> 443 bytes
 testData/results/TestStaticNameClash.dec      |  20 ++++++
 testData/src/pkg/TestStaticNameClash.java     |  15 ++++
 6 files changed, 108 insertions(+), 3 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/util/StructUtils.java
 create mode 100644 testData/classes/pkg/TestStaticNameClash.class
 create mode 100644 testData/results/TestStaticNameClash.dec
 create mode 100644 testData/src/pkg/TestStaticNameClash.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 4ac8123..28002ff 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -28,9 +28,9 @@ import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.StructUtils;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
@@ -84,13 +84,17 @@ public class FieldExprent extends Exprent {
     return new FieldExprent(name, classname, isStatic, instance == null ? null : instance.copy(), descriptor, bytecode);
   }
 
+  private boolean isAmbiguous() {
+    return StructUtils.getCurrentMethodLocalVariableNames().contains(name);
+  }
+
   @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
     if (isStatic) {
       ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
-      if (node == null || !classname.equals(node.classStruct.qualifiedName)) {
+      if (node == null || !classname.equals(node.classStruct.qualifiedName) || isAmbiguous()) {
         buf.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(classname)));
         buf.append(".");
       }
diff --git a/src/org/jetbrains/java/decompiler/util/StructUtils.java b/src/org/jetbrains/java/decompiler/util/StructUtils.java
new file mode 100644
index 0000000..d7dad68
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/util/StructUtils.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.java.decompiler.util;
+
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.struct.StructMember;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.jetbrains.java.decompiler.main.DecompilerContext.CURRENT_METHOD_WRAPPER;
+import static org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE;
+
+/**
+ * @author Alexandru-Constantin Bledea
+ * @since March 07, 2016
+ */
+public final class StructUtils {
+
+  private StructUtils() {
+  }
+
+  /**
+   * @return the local variables of the current method
+   */
+  public static List<String> getCurrentMethodLocalVariableNames() {
+    final MethodWrapper method = (MethodWrapper) DecompilerContext.getProperty(CURRENT_METHOD_WRAPPER);
+    if (null == method) {
+      return Collections.emptyList();
+    }
+    return getLocalVariables(method.methodStruct);
+  }
+
+  /**
+   * @param structMember the struct member from which to extract the local variables
+   * @return the local variables of the struct member
+   */
+  public static List<String> getLocalVariables(final StructMember structMember) {
+    final VBStyleCollection<StructGeneralAttribute, String> methodStruct = structMember.getAttributes();
+    final StructGeneralAttribute generalAttribute = methodStruct.getWithKey(ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+    if (generalAttribute instanceof StructLocalVariableTableAttribute) {
+      final StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute) generalAttribute;
+      return Collections.unmodifiableList(new ArrayList<>(table.getMapVarNames().values()));
+    }
+    return Collections.emptyList();
+  }
+
+}
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 5647ab8..e39bb3a 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -82,6 +82,7 @@ public class SingleClassesTest {
   @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
+  @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
@@ -128,4 +129,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
\ No newline at end of file
+}
diff --git a/testData/classes/pkg/TestStaticNameClash.class b/testData/classes/pkg/TestStaticNameClash.class
new file mode 100644
index 0000000000000000000000000000000000000000..16a1da3eaa4b6d04a9ca9552b68470b096425ceb
GIT binary patch
literal 443
zcmZ`#%T9wp6g@*J6pB{S`dGTFE@YuQjhiN}NHwA9e!vNxN`b)C#LqG=OkDT@ew6VJ
z7;B<#=H7emoX5=j$Lkw_bL_b=;XCMH$HuOWAw#dMic(bSk--la{DB7<&(k1MmCVx%
z2J2GhQe820M#nP-b6ngBhCwKEF<C8RQB8TA5#onM!m}B#q@KS(Q_W?~a2S^NX)qPF
ziWFBenee3;XS|-1e!mv#_B+CG^gDyLb)#ZcCE{9YtAjt3PIYt-HhLbquo(9Lv1Hg<
zzw#zth(zItKE$LCVsJE>I)i%BY7iix$_VYAynsD5YnM)|0d4fD_u30oH)wLOi2)%F
c^=DLD@-vJz*(DE6Gl}q1p!KJev^B8(3F<yra{vGU

literal 0
HcmV?d00001

diff --git a/testData/results/TestStaticNameClash.dec b/testData/results/TestStaticNameClash.dec
new file mode 100644
index 0000000..b01049c
--- /dev/null
+++ b/testData/results/TestStaticNameClash.dec
@@ -0,0 +1,20 @@
+package pkg;
+
+public class TestStaticNameClash {
+   public static String property;
+
+   public static void setProperty(String property) {
+      TestStaticNameClash.property = property;// 12
+   }// 13
+}
+
+class 'pkg/TestStaticNameClash' {
+   method 'setProperty (Ljava/lang/String;)V' {
+      1      6
+      4      7
+   }
+}
+
+Lines mapping:
+12 <-> 7
+13 <-> 8
diff --git a/testData/src/pkg/TestStaticNameClash.java b/testData/src/pkg/TestStaticNameClash.java
new file mode 100644
index 0000000..ced8f12
--- /dev/null
+++ b/testData/src/pkg/TestStaticNameClash.java
@@ -0,0 +1,15 @@
+package pkg;
+
+/**
+ * @author Alexandru-Constantin Bledea
+ * @since March 07, 2016
+ */
+public class TestStaticNameClash {
+
+    public static String property;
+
+    public static void setProperty(final String property) {
+        TestStaticNameClash.property = property;
+    }
+
+}

From 23da5d99d2c4cc523067da0f3c1bb2a931dd47eb Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 16 Mar 2016 11:22:21 +0100
Subject: [PATCH 030/252] Cleanup (I/O ops in java-decompiler)

---
 .../main/decompiler/ConsoleDecompiler.java    | 38 +++--------
 .../java/decompiler/struct/ContextUnit.java   | 10 +--
 .../java/decompiler/struct/StructContext.java | 29 +++------
 .../java/decompiler/struct/StructMember.java  | 10 +--
 .../decompiler/struct/lazy/LazyLoader.java    | 31 +++------
 .../decompiler/util/DataInputFullStream.java  | 31 ++-------
 .../java/decompiler/util/InterpreterUtil.java | 64 ++++++++-----------
 .../decompiler/BulkDecompilationTest.java     | 26 +++-----
 8 files changed, 78 insertions(+), 161 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 7924b1c..ea08023 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -150,17 +150,11 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       return InterpreterUtil.getBytes(file);
     }
     else {
-      ZipFile archive = new ZipFile(file);
-      try {
+      try (ZipFile archive = new ZipFile(file)) {
         ZipEntry entry = archive.getEntry(internalPath);
-        if (entry == null) {
-          throw new IOException("Entry not found: " + internalPath);
-        }
+        if (entry == null) throw new IOException("Entry not found: " + internalPath);
         return InterpreterUtil.getBytes(archive, entry);
       }
-      finally {
-        archive.close();
-      }
     }
   }
 
@@ -193,14 +187,8 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   @Override
   public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
     File file = new File(getAbsolutePath(path), entryName);
-    try {
-      Writer out = new OutputStreamWriter(new FileOutputStream(file), "UTF8");
-      try {
-        out.write(content);
-      }
-      finally {
-        out.close();
-      }
+    try (Writer out = new OutputStreamWriter(new FileOutputStream(file), "UTF8")) {
+      out.write(content);
     }
     catch (IOException ex) {
       DecompilerContext.getLogger().writeMessage("Cannot write class file " + file, ex);
@@ -238,21 +226,15 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       return;
     }
 
-    try {
-      ZipFile srcArchive = new ZipFile(new File(source));
-      try {
-        ZipEntry entry = srcArchive.getEntry(entryName);
-        if (entry != null) {
-          InputStream in = srcArchive.getInputStream(entry);
+    try (ZipFile srcArchive = new ZipFile(new File(source))) {
+      ZipEntry entry = srcArchive.getEntry(entryName);
+      if (entry != null) {
+        try (InputStream in = srcArchive.getInputStream(entry)) {
           ZipOutputStream out = mapArchiveStreams.get(file);
           out.putNextEntry(new ZipEntry(entryName));
           InterpreterUtil.copyStream(in, out);
-          in.close();
         }
       }
-      finally {
-        srcArchive.close();
-      }
     }
     catch (IOException ex) {
       String message = "Cannot copy entry " + entryName + " from " + source + " to " + file;
@@ -306,4 +288,4 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       DecompilerContext.getLogger().writeMessage("Cannot close " + file, IFernflowerLogger.Severity.WARN);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
index 850c3d8..69125e1 100644
--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,13 +78,9 @@ public class ContextUnit {
       String oldName = cl.qualifiedName;
 
       StructClass newCl;
-      DataInputFullStream in = loader.getClassStream(oldName);
-      try {
+      try (DataInputFullStream in = loader.getClassStream(oldName)) {
         newCl = new StructClass(in, cl.isOwn(), loader);
       }
-      finally {
-        in.close();
-      }
 
       lstClasses.add(newCl);
 
@@ -168,4 +164,4 @@ public class ContextUnit {
   public List<StructClass> getClasses() {
     return classes;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
index 7bfb139..d47de60 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,17 +119,11 @@ public class StructContext {
       }
 
       if (filename.endsWith(".class")) {
-        try {
-          DataInputFullStream in = loader.getClassStream(file.getAbsolutePath(), null);
-          try {
-            StructClass cl = new StructClass(in, isOwn, loader);
-            classes.put(cl.qualifiedName, cl);
-            unit.addClass(cl, filename);
-            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(LazyLoader.Link.CLASS, file.getAbsolutePath(), null));
-          }
-          finally {
-            in.close();
-          }
+        try (DataInputFullStream in = loader.getClassStream(file.getAbsolutePath(), null)) {
+          StructClass cl = new StructClass(in, isOwn, loader);
+          classes.put(cl.qualifiedName, cl);
+          unit.addClass(cl, filename);
+          loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(LazyLoader.Link.CLASS, file.getAbsolutePath(), null));
         }
         catch (IOException ex) {
           String message = "Corrupted class file: " + file;
@@ -143,10 +137,8 @@ public class StructContext {
   }
 
   private void addArchive(String path, File file, int type, boolean isOwn) throws IOException {
-    @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
-    ZipFile archive = type == ContextUnit.TYPE_JAR ? new JarFile(file) : new ZipFile(file);
-
-    try {
+    //noinspection IOResourceOpenedButNotSafelyClosed
+    try (ZipFile archive = type == ContextUnit.TYPE_JAR ? new JarFile(file) : new ZipFile(file)) {
       Enumeration<? extends ZipEntry> entries = archive.entries();
       while (entries.hasMoreElements()) {
         ZipEntry entry = entries.nextElement();
@@ -178,12 +170,9 @@ public class StructContext {
         }
       }
     }
-    finally {
-      archive.close();
-    }
   }
 
   public Map<String, StructClass> getClasses() {
     return classes;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index f681e19..bc8b931 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,15 +73,15 @@ public class StructMember {
 
   protected StructGeneralAttribute readAttribute(DataInputFullStream in, ConstantPool pool, String name) throws IOException {
     StructGeneralAttribute attribute = StructGeneralAttribute.createAttribute(name);
+    int length = in.readInt();
     if (attribute == null) {
-      in.discard(in.readInt());
+      in.discard(length);
     }
     else {
-      byte[] data = new byte[in.readInt()];
-      in.readFull(data);
+      byte[] data = in.read(length);
       attribute.setInfo(data);
       attribute.initContent(pool);
     }
     return attribute;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
index d75c93d..40944c1 100644
--- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,17 +47,13 @@ public class LazyLoader {
   }
 
   public ConstantPool loadPool(String classname) {
-    try {
-      DataInputFullStream in = getClassStream(classname);
-      if (in == null) return null;
-
-      try {
+    try (DataInputFullStream in = getClassStream(classname)) {
+      if (in != null) {
         in.discard(8);
         return new ConstantPool(in);
       }
-      finally {
-        in.close();
-      }
+
+      return null;
     }
     catch (IOException ex) {
       throw new RuntimeException(ex);
@@ -67,11 +63,8 @@ public class LazyLoader {
   public byte[] loadBytecode(StructMethod mt, int codeFullLength) {
     String className = mt.getClassStruct().qualifiedName;
 
-    try {
-      DataInputFullStream in = getClassStream(className);
-      if (in == null) return null;
-
-      try {
+    try (DataInputFullStream in = getClassStream(className)) {
+      if (in != null) {
         in.discard(8);
 
         ConstantPool pool = mt.getClassStruct().getPool();
@@ -118,17 +111,13 @@ public class LazyLoader {
             }
 
             in.discard(12);
-            byte[] code = new byte[codeFullLength];
-            in.readFull(code);
-            return code;
+
+            return in.read(codeFullLength);
           }
 
           break;
         }
       }
-      finally {
-        in.close();
-      }
 
       return null;
     }
@@ -170,4 +159,4 @@ public class LazyLoader {
       this.internalPath = internalPath;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java b/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
index 011edde..ac71e20 100644
--- a/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
+++ b/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,36 +20,15 @@ import java.io.DataInputStream;
 import java.io.IOException;
 
 public class DataInputFullStream extends DataInputStream {
-
   public DataInputFullStream(byte[] bytes) {
     super(new ByteArrayInputStream(bytes));
   }
 
-  public int readFull(byte[] b) throws IOException {
-    int length = b.length;
-    byte[] temp = new byte[length];
-    int pos = 0;
-
-    int bytes_read;
-    while (true) {
-      bytes_read = read(temp, 0, length - pos);
-      if (bytes_read == -1) {
-        return -1;
-      }
-
-      System.arraycopy(temp, 0, b, pos, bytes_read);
-      pos += bytes_read;
-      if (pos == length) {
-        break;
-      }
-    }
-
-    return length;
+  public byte[] read(int n) throws IOException {
+    return InterpreterUtil.readBytes(this, n);
   }
 
   public void discard(int n) throws IOException {
-    if (super.skip(n) != n) {
-      throw new IOException("Skip failed");
-    }
+    InterpreterUtil.discardBytes(this, n);
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
index 8ec1aaa..8130145 100644
--- a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 
 import java.io.*;
-import java.nio.channels.FileChannel;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -31,27 +30,11 @@ public class InterpreterUtil {
 
   public static final int[] EMPTY_INT_ARRAY = new int[0];
 
-  private static final int CHANNEL_WINDOW_SIZE = IS_WINDOWS ? 64 * 1024 * 1024 - (32 * 1024) : 64 * 1024 * 1024;  // magic number for Windows
   private static final int BUFFER_SIZE = 16 * 1024;
 
-  public static void copyFile(File in, File out) throws IOException {
-    FileInputStream inStream = new FileInputStream(in);
-    try {
-      FileOutputStream outStream = new FileOutputStream(out);
-      try {
-        FileChannel inChannel = inStream.getChannel();
-        FileChannel outChannel = outStream.getChannel();
-        long size = inChannel.size(), position = 0;
-        while (position < size) {
-          position += inChannel.transferTo(position, CHANNEL_WINDOW_SIZE, outChannel);
-        }
-      }
-      finally {
-        outStream.close();
-      }
-    }
-    finally {
-      inStream.close();
+  public static void copyFile(File source, File target) throws IOException {
+    try (FileInputStream in = new FileInputStream(source); FileOutputStream out = new FileOutputStream(target)) {
+      copyStream(in, out);
     }
   }
 
@@ -64,28 +47,35 @@ public class InterpreterUtil {
   }
 
   public static byte[] getBytes(ZipFile archive, ZipEntry entry) throws IOException {
-    return readAndClose(archive.getInputStream(entry), (int)entry.getSize());
+    try (InputStream stream = archive.getInputStream(entry)) {
+      return readBytes(stream, (int)entry.getSize());
+    }
   }
 
   public static byte[] getBytes(File file) throws IOException {
-    return readAndClose(new FileInputStream(file), (int)file.length());
+    try (FileInputStream stream = new FileInputStream(file)) {
+      return readBytes(stream, (int)file.length());
+    }
   }
 
-  private static byte[] readAndClose(InputStream stream, int length) throws IOException {
-    try {
-      byte[] bytes = new byte[length];
-      int n = 0, off = 0;
-      while (n < length) {
-        int count = stream.read(bytes, off + n, length - n);
-        if (count < 0) {
-          throw new IOException("premature end of stream");
-        }
-        n += count;
+  public static byte[] readBytes(InputStream stream, int length) throws IOException {
+    byte[] bytes = new byte[length];
+
+    int n = 0, off = 0;
+    while (n < length) {
+      int count = stream.read(bytes, off + n, length - n);
+      if (count < 0) {
+        throw new IOException("premature end of stream");
       }
-      return bytes;
+      n += count;
     }
-    finally {
-      stream.close();
+
+    return bytes;
+  }
+
+  public static void discardBytes(InputStream stream, int length) throws IOException {
+    if (stream.skip(length) != length) {
+      throw new IOException("premature end of stream");
     }
   }
 
@@ -159,4 +149,4 @@ public class InterpreterUtil {
   public static String makeUniqueKey(String name, String descriptor1, String descriptor2) {
     return name + ' ' + descriptor1 + ' ' + descriptor2;
   }
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
index 31778cb..7837905 100644
--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+++ b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,26 +69,18 @@ public class BulkDecompilationTest {
   }
 
   private static void unpack(File archive, File targetDir) {
-    try {
-      ZipFile zip = new ZipFile(archive);
-      try {
-        Enumeration<? extends ZipEntry> entries = zip.entries();
-        while (entries.hasMoreElements()) {
-          ZipEntry entry = entries.nextElement();
-          if (!entry.isDirectory()) {
-            File file = new File(targetDir, entry.getName());
-            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
-            InputStream in = zip.getInputStream(entry);
-            OutputStream out = new FileOutputStream(file);
+    try (ZipFile zip = new ZipFile(archive)) {
+      Enumeration<? extends ZipEntry> entries = zip.entries();
+      while (entries.hasMoreElements()) {
+        ZipEntry entry = entries.nextElement();
+        if (!entry.isDirectory()) {
+          File file = new File(targetDir, entry.getName());
+          assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
+          try (InputStream in = zip.getInputStream(entry); OutputStream out = new FileOutputStream(file)) {
             InterpreterUtil.copyStream(in, out);
-            out.close();
-            in.close();
           }
         }
       }
-      finally {
-        zip.close();
-      }
     }
     catch (IOException e) {
       throw new RuntimeException(e);

From 35259c3e202294d1725666e544faa9ed95fdc272 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 16 Mar 2016 11:49:15 +0100
Subject: [PATCH 031/252] Cleanup (formatting)

---
 test/org/jetbrains/java/decompiler/SingleClassesTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index e39bb3a..c5bcf8c 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -129,4 +129,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
+}
\ No newline at end of file

From 35569de64fd2c7eaf31cc15521a5605a32bfa44f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 16 Mar 2016 12:20:26 +0100
Subject: [PATCH 032/252] [java-decompiler] build script corrected

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 3088f83..d23cf1f 100644
--- a/build.xml
+++ b/build.xml
@@ -39,7 +39,7 @@
 
   <target name="test-compile" depends="init,compile">
     <mkdir dir="${test-out}"/>
-    <javac srcdir="${test-src}" destdir="${test-out}" source="1.6" target="1.6" encoding="UTF-8" debug="true" includeantruntime="false">
+    <javac srcdir="${test-src}" destdir="${test-out}" source="1.8" target="1.8" encoding="UTF-8" debug="true" includeantruntime="false">
       <classpath path="${out}"/>
       <classpath refid="junit"/>
     </javac>

From f643b1c870eb4f29f52109d8aee312f5042a79c4 Mon Sep 17 00:00:00 2001
From: Christopher Carpenter <intermediatelanguage@gmail.com>
Date: Mon, 14 Mar 2016 01:55:49 -0400
Subject: [PATCH 033/252] Made ClassReference14Processor static similar to how
 InitializerProcessor and EnumProcessor are setup. This gets rid of a lot of
 unnecessary InvocationExprent creation.

---
 .../main/ClassReference14Processor.java       | 32 +++---------
 .../java/decompiler/main/ClassWriter.java     | 52 +++++++++++++------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 677f457..a36c88e 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -38,12 +38,11 @@ import java.util.Map.Entry;
 
 public class ClassReference14Processor {
 
-  public final ExitExprent bodyexprent;
+  public static final ExitExprent bodyexprent;
 
-  public final ExitExprent handlerexprent;
+  public static final ExitExprent handlerexprent;
 
-
-  public ClassReference14Processor() {
+  static {
 
     InvocationExprent invfor = new InvocationExprent();
     invfor.setName("forName");
@@ -65,7 +64,7 @@ public class ClassReference14Processor {
     constr.setDescriptor(MethodDescriptor.parseDescriptor("()V"));
 
     NewExprent newexpr =
-      new NewExprent(new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/NoClassDefFoundError"), new ArrayList<Exprent>(), null);
+      new NewExprent(new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/NoClassDefFoundError"), new ArrayList<>(), null);
     newexpr.setConstructor(constr);
 
     InvocationExprent invcause = new InvocationExprent();
@@ -82,32 +81,13 @@ public class ClassReference14Processor {
                                      null, null);
   }
 
-
-  public void processClassReferences(ClassNode node) {
-
-    ClassWrapper wrapper = node.getWrapper();
-
-    //		int major_version = wrapper.getClassStruct().major_version;
-    //		int minor_version = wrapper.getClassStruct().minor_version;
-    //
-    //		if(major_version > 48 || (major_version == 48 && minor_version > 0)) {
-    //			// version 1.5 or above
-    //			return;
-    //		}
-
-    if (wrapper.getClassStruct().isVersionGE_1_5()) {
-      // version 1.5 or above
-      return;
-    }
-
+  public static void processClassReferences(ClassNode node) {
     // find the synthetic method Class class$(String) if present
     HashMap<ClassWrapper, MethodWrapper> mapClassMeths = new HashMap<ClassWrapper, MethodWrapper>();
     mapClassMethods(node, mapClassMeths);
-
     if (mapClassMeths.isEmpty()) {
       return;
     }
-
     HashSet<ClassWrapper> setFound = new HashSet<ClassWrapper>();
     processClassRec(node, mapClassMeths, setFound);
 
@@ -173,7 +153,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private void mapClassMethods(ClassNode node, Map<ClassWrapper, MethodWrapper> map) {
+  private static void mapClassMethods(ClassNode node, Map<ClassWrapper, MethodWrapper> map) {
     boolean noSynthFlag = DecompilerContext.getOption(IFernflowerPreferences.SYNTHETIC_NOT_SET);
 
     ClassWrapper wrapper = node.getWrapper();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index b438695..0b016dd 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -43,14 +43,14 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.gen.generics.*;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 public class ClassWriter {
-  private final ClassReference14Processor ref14processor;
   private final PoolInterceptor interceptor;
 
   public ClassWriter() {
-    ref14processor = new ClassReference14Processor();
     interceptor = DecompilerContext.getPoolInterceptor();
   }
 
@@ -60,8 +60,10 @@ public class ClassWriter {
 
     InitializerProcessor.extractInitializers(wrapper);
 
-    if (node.type == ClassNode.CLASS_ROOT && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4)) {
-      ref14processor.processClassReferences(node);
+    if (node.type == ClassNode.CLASS_ROOT &&
+        !cl.isVersionGE_1_5() &&
+        DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4)) {
+      ClassReference14Processor.processClassReferences(node);
     }
 
     if (cl.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM)) {
@@ -273,7 +275,8 @@ public class ClassWriter {
   }
 
   private static void addTracer(StructClass cls, StructMethod method, BytecodeMappingTracer tracer) {
-    StructLineNumberTableAttribute table = (StructLineNumberTableAttribute)method.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
+    StructLineNumberTableAttribute table =
+      (StructLineNumberTableAttribute)method.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
     tracer.setLineNumberTable(table);
     String key = InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor());
     DecompilerContext.getBytecodeSourceMapper().addTracer(cls.qualifiedName, key, tracer);
@@ -385,7 +388,12 @@ public class ClassWriter {
     buffer.append('{').appendLineSeparator();
   }
 
-  private void fieldToJava(ClassWrapper wrapper, StructClass cl, StructField fd, TextBuffer buffer, int indent, BytecodeMappingTracer tracer) {
+  private void fieldToJava(ClassWrapper wrapper,
+                           StructClass cl,
+                           StructField fd,
+                           TextBuffer buffer,
+                           int indent,
+                           BytecodeMappingTracer tracer) {
     int start = buffer.length();
     boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
     boolean isDeprecated = fd.getAttributes().containsKey("Deprecated");
@@ -571,7 +579,9 @@ public class ClassWriter {
         changed = true;
         res.append("_");
       }
-      else res.append(c);
+      else {
+        res.append(c);
+      }
     }
     if (!changed) {
       return name;
@@ -661,7 +671,7 @@ public class ClassWriter {
             int actualParams = md.params.length;
             List<VarVersionPair> sigFields = methodWrapper.signatureFields;
             if (sigFields != null) {
-               actualParams = 0;
+              actualParams = 0;
               for (VarVersionPair field : methodWrapper.signatureFields) {
                 if (field == null) {
                   actualParams++;
@@ -670,7 +680,8 @@ public class ClassWriter {
             }
             else if (isEnum && init) actualParams -= 2;
             if (actualParams != descriptor.params.size()) {
-              String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
+              String message =
+                "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
               DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
               descriptor = null;
             }
@@ -732,7 +743,8 @@ public class ClassWriter {
             if (descriptor != null) {
               GenericType parameterType = descriptor.params.get(i);
 
-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+              boolean isVarArg =
+                (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
@@ -752,7 +764,8 @@ public class ClassWriter {
             else {
               VarType parameterType = md.params[i];
 
-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+              boolean isVarArg =
+                (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
@@ -961,7 +974,8 @@ public class ClassWriter {
   }
 
   private static final String[] PARAMETER_ANNOTATION_ATTRIBUTES = {
-    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
+    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS,
+    StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
 
   private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, int param) {
 
@@ -981,6 +995,7 @@ public class ClassWriter {
   }
 
   private static final Map<Integer, String> MODIFIERS;
+
   static {
     MODIFIERS = new LinkedHashMap<>();
     MODIFIERS.put(CodeConstants.ACC_PUBLIC, "public");
@@ -1003,8 +1018,15 @@ public class ClassWriter {
     CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_STATIC |
     CodeConstants.ACC_FINAL | CodeConstants.ACC_TRANSIENT | CodeConstants.ACC_VOLATILE;
   private static final int METHOD_ALLOWED =
-    CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_ABSTRACT |
-    CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_SYNCHRONIZED | CodeConstants.ACC_NATIVE | CodeConstants.ACC_STRICT;
+    CodeConstants.ACC_PUBLIC |
+    CodeConstants.ACC_PROTECTED |
+    CodeConstants.ACC_PRIVATE |
+    CodeConstants.ACC_ABSTRACT |
+    CodeConstants.ACC_STATIC |
+    CodeConstants.ACC_FINAL |
+    CodeConstants.ACC_SYNCHRONIZED |
+    CodeConstants.ACC_NATIVE |
+    CodeConstants.ACC_STRICT;
 
   private static final int CLASS_EXCLUDED = CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_STATIC;
   private static final int FIELD_EXCLUDED = CodeConstants.ACC_PUBLIC | CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL;

From c32fce0d025b222e2ade9b95cdd90be3c8a15f70 Mon Sep 17 00:00:00 2001
From: Christopher Carpenter <intermediatelanguage@gmail.com>
Date: Mon, 14 Mar 2016 02:02:36 -0400
Subject: [PATCH 034/252] Fixed a typo in a comment and in a method name. Made
 ClassWriter.invokeProcessors static since it no longer relies on any
 non-static fields.

---
 .../java/decompiler/code/cfg/BasicBlock.java  |  2 +-
 .../java/decompiler/main/ClassWriter.java     |  2 +-
 .../modules/decompiler/ExprProcessor.java     | 22 +++++++++++--------
 .../decompiler/stats/BasicBlockStatement.java |  4 +++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
index 2e29529..0bbaf72 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -118,7 +118,7 @@ public class BasicBlock implements IGraphNode {
     block.removePredecessor(this);
   }
 
-  // FIXME: unify block comparisons: id or direkt equality
+  // FIXME: unify block comparisons: id or direct equality
   public void replaceSuccessor(BasicBlock oldBlock, BasicBlock newBlock) {
     for (int i = 0; i < succs.size(); i++) {
       if (succs.get(i).id == oldBlock.id) {
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 0b016dd..ed7c99d 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -54,7 +54,7 @@ public class ClassWriter {
     interceptor = DecompilerContext.getPoolInterceptor();
   }
 
-  private void invokeProcessors(ClassNode node) {
+  private static void invokeProcessors(ClassNode node) {
     ClassWrapper wrapper = node.getWrapper();
     StructClass cl = wrapper.getClassStruct();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 008d0bb..df1978f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -368,7 +368,7 @@ public class ExprProcessor implements CodeConstants {
           }
           else if (cn instanceof LinkConstant) {
             //TODO: for now treat Links as Strings
-            pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_STRING, ((LinkConstant)cn).elementname , bytecode_offsets));
+            pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_STRING, ((LinkConstant)cn).elementname, bytecode_offsets));
           }
           break;
         case opc_iload:
@@ -422,7 +422,8 @@ public class ExprProcessor implements CodeConstants {
           Exprent index_store = stack.pop();
           Exprent arr_store = stack.pop();
           AssignmentExprent arrassign =
-            new AssignmentExprent(new ArrayExprent(arr_store, index_store, arrtypes[instr.opcode - opc_iastore], bytecode_offsets), value, bytecode_offsets);
+            new AssignmentExprent(new ArrayExprent(arr_store, index_store, arrtypes[instr.opcode - opc_iastore], bytecode_offsets), value,
+                                  bytecode_offsets);
           exprlist.add(arrassign);
           break;
         case opc_iadd:
@@ -523,7 +524,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_tableswitch:
         case opc_lookupswitch:
           exprlist.add(new SwitchExprent(stack.pop(), bytecode_offsets));
-        break;
+          break;
         case opc_ireturn:
         case opc_lreturn:
         case opc_freturn:
@@ -538,7 +539,7 @@ public class ExprProcessor implements CodeConstants {
                                        : ((MethodDescriptor)DecompilerContext
                                          .getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR)).ret,
                                        bytecode_offsets));
-        break;
+          break;
         case opc_monitorenter:
         case opc_monitorexit:
           exprlist.add(new MonitorExprent(func8[instr.opcode - opc_monitorenter], stack.pop(), bytecode_offsets));
@@ -552,13 +553,15 @@ public class ExprProcessor implements CodeConstants {
         case opc_getstatic:
         case opc_getfield:
           pushEx(stack, exprlist,
-                 new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_getstatic ? null : stack.pop(), bytecode_offsets));
+                 new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_getstatic ? null : stack.pop(),
+                                  bytecode_offsets));
           break;
         case opc_putstatic:
         case opc_putfield:
           Exprent valfield = stack.pop();
           Exprent exprfield =
-            new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_putstatic ? null : stack.pop(), bytecode_offsets);
+            new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_putstatic ? null : stack.pop(),
+                             bytecode_offsets);
           exprlist.add(new AssignmentExprent(exprfield, valfield, bytecode_offsets));
           break;
         case opc_invokevirtual:
@@ -755,7 +758,7 @@ public class ExprProcessor implements CodeConstants {
     return prlst;
   }
 
-  public static boolean endsWithSemikolon(Exprent expr) {
+  public static boolean endsWithSemicolon(Exprent expr) {
     int type = expr.type;
     return !(type == Exprent.EXPRENT_SWITCH ||
              type == Exprent.EXPRENT_MONITOR ||
@@ -768,7 +771,8 @@ public class ExprProcessor implements CodeConstants {
     if (stat instanceof BasicBlockStatement) {
       BasicBlock block = ((BasicBlockStatement)stat).getBlock();
       List<Integer> offsets = block.getInstrOldOffsets();
-      if (!offsets.isEmpty() && offsets.size() > block.getSeq().length()) { // some instructions have been deleted, but we still have offsets
+      if (!offsets.isEmpty() &&
+          offsets.size() > block.getSeq().length()) { // some instructions have been deleted, but we still have offsets
         tracer.addMapping(offsets.get(offsets.size() - 1)); // add the last offset
       }
     }
@@ -840,7 +844,7 @@ public class ExprProcessor implements CodeConstants {
         if (expr.type == Exprent.EXPRENT_MONITOR && ((MonitorExprent)expr).getMonType() == MonitorExprent.MONITOR_ENTER) {
           buf.append("{}"); // empty synchronized block
         }
-        if (endsWithSemikolon(expr)) {
+        if (endsWithSemicolon(expr)) {
           buf.append(";");
         }
         buf.appendLineSeparator();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
index 762fd01..334637c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
@@ -68,7 +68,9 @@ public class BasicBlockStatement extends Statement {
   // *****************************************************************************
 
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-    return ExprProcessor.listToJava(varDefinitions, indent, tracer).append(ExprProcessor.listToJava(exprents, indent, tracer));
+    TextBuffer tb = ExprProcessor.listToJava(varDefinitions, indent, tracer);
+    tb.append(ExprProcessor.listToJava(exprents, indent, tracer));
+    return tb;
   }
 
   public Statement getSimpleCopy() {

From d50e8a860e9070c1f6685fcf0009316f55034a8f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 16 Mar 2016 17:34:59 +0100
Subject: [PATCH 035/252] Cleanup (formatting)

---
 .../main/ClassReference14Processor.java       | 71 ++++++++-----------
 .../java/decompiler/main/ClassWriter.java     | 29 ++------
 2 files changed, 38 insertions(+), 62 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index a36c88e..e97c47e 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,48 +37,39 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class ClassReference14Processor {
-
-  public static final ExitExprent bodyexprent;
-
-  public static final ExitExprent handlerexprent;
+  private static final ExitExprent BODY_EXPR;
+  private static final ExitExprent HANDLER_EXPR;
 
   static {
+    InvocationExprent invFor = new InvocationExprent();
+    invFor.setName("forName");
+    invFor.setClassname("java/lang/Class");
+    invFor.setStringDescriptor("(Ljava/lang/String;)Ljava/lang/Class;");
+    invFor.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/String;)Ljava/lang/Class;"));
+    invFor.setStatic(true);
+    invFor.setLstParameters(Collections.singletonList(new VarExprent(0, VarType.VARTYPE_STRING, null)));
+    BODY_EXPR = new ExitExprent(ExitExprent.EXIT_RETURN, invFor, VarType.VARTYPE_CLASS, null);
 
-    InvocationExprent invfor = new InvocationExprent();
-    invfor.setName("forName");
-    invfor.setClassname("java/lang/Class");
-    invfor.setStringDescriptor("(Ljava/lang/String;)Ljava/lang/Class;");
-    invfor.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/String;)Ljava/lang/Class;"));
-    invfor.setStatic(true);
-    invfor.setLstParameters(Arrays.asList(new Exprent[]{new VarExprent(0, VarType.VARTYPE_STRING, null)}));
+    InvocationExprent ctor = new InvocationExprent();
+    ctor.setName(CodeConstants.INIT_NAME);
+    ctor.setClassname("java/lang/NoClassDefFoundError");
+    ctor.setStringDescriptor("()V");
+    ctor.setFunctype(InvocationExprent.TYP_INIT);
+    ctor.setDescriptor(MethodDescriptor.parseDescriptor("()V"));
 
-    bodyexprent = new ExitExprent(ExitExprent.EXIT_RETURN,
-                                  invfor,
-                                  VarType.VARTYPE_CLASS, null);
+    NewExprent newExpr = new NewExprent(new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/NoClassDefFoundError"), new ArrayList<>(), null);
+    newExpr.setConstructor(ctor);
 
-    InvocationExprent constr = new InvocationExprent();
-    constr.setName(CodeConstants.INIT_NAME);
-    constr.setClassname("java/lang/NoClassDefFoundError");
-    constr.setStringDescriptor("()V");
-    constr.setFunctype(InvocationExprent.TYP_INIT);
-    constr.setDescriptor(MethodDescriptor.parseDescriptor("()V"));
+    InvocationExprent invCause = new InvocationExprent();
+    invCause.setName("initCause");
+    invCause.setClassname("java/lang/NoClassDefFoundError");
+    invCause.setStringDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;");
+    invCause.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;"));
+    invCause.setInstance(newExpr);
+    invCause.setLstParameters(
+      Collections.singletonList(new VarExprent(2, new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/ClassNotFoundException"), null)));
 
-    NewExprent newexpr =
-      new NewExprent(new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/NoClassDefFoundError"), new ArrayList<>(), null);
-    newexpr.setConstructor(constr);
-
-    InvocationExprent invcause = new InvocationExprent();
-    invcause.setName("initCause");
-    invcause.setClassname("java/lang/NoClassDefFoundError");
-    invcause.setStringDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;");
-    invcause.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;"));
-    invcause.setInstance(newexpr);
-    invcause.setLstParameters(
-      Arrays.asList(new Exprent[]{new VarExprent(2, new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/ClassNotFoundException"), null)}));
-
-    handlerexprent = new ExitExprent(ExitExprent.EXIT_THROW,
-                                     invcause,
-                                     null, null);
+    HANDLER_EXPR = new ExitExprent(ExitExprent.EXIT_THROW, invCause, null, null);
   }
 
   public static void processClassReferences(ClassNode node) {
@@ -176,8 +167,8 @@ public class ClassReference14Processor {
             BasicBlockStatement handler = (BasicBlockStatement)cst.getStats().get(1);
 
             if (body.getExprents().size() == 1 && handler.getExprents().size() == 1) {
-              if (bodyexprent.equals(body.getExprents().get(0)) &&
-                  handlerexprent.equals(handler.getExprents().get(0))) {
+              if (BODY_EXPR.equals(body.getExprents().get(0)) &&
+                  HANDLER_EXPR.equals(handler.getExprents().get(0))) {
                 map.put(wrapper, method);
                 break;
               }
@@ -273,4 +264,4 @@ public class ClassReference14Processor {
 
     return null;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index ed7c99d..f79198f 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -388,12 +388,7 @@ public class ClassWriter {
     buffer.append('{').appendLineSeparator();
   }
 
-  private void fieldToJava(ClassWrapper wrapper,
-                           StructClass cl,
-                           StructField fd,
-                           TextBuffer buffer,
-                           int indent,
-                           BytecodeMappingTracer tracer) {
+  private void fieldToJava(ClassWrapper wrapper, StructClass cl, StructField fd, TextBuffer buffer, int indent, BytecodeMappingTracer tracer) {
     int start = buffer.length();
     boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
     boolean isDeprecated = fd.getAttributes().containsKey("Deprecated");
@@ -680,8 +675,7 @@ public class ClassWriter {
             }
             else if (isEnum && init) actualParams -= 2;
             if (actualParams != descriptor.params.size()) {
-              String message =
-                "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
+              String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
               DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
               descriptor = null;
             }
@@ -743,8 +737,7 @@ public class ClassWriter {
             if (descriptor != null) {
               GenericType parameterType = descriptor.params.get(i);
 
-              boolean isVarArg =
-                (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
@@ -764,8 +757,7 @@ public class ClassWriter {
             else {
               VarType parameterType = md.params[i];
 
-              boolean isVarArg =
-                (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
@@ -995,7 +987,6 @@ public class ClassWriter {
   }
 
   private static final Map<Integer, String> MODIFIERS;
-
   static {
     MODIFIERS = new LinkedHashMap<>();
     MODIFIERS.put(CodeConstants.ACC_PUBLIC, "public");
@@ -1018,14 +1009,8 @@ public class ClassWriter {
     CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_STATIC |
     CodeConstants.ACC_FINAL | CodeConstants.ACC_TRANSIENT | CodeConstants.ACC_VOLATILE;
   private static final int METHOD_ALLOWED =
-    CodeConstants.ACC_PUBLIC |
-    CodeConstants.ACC_PROTECTED |
-    CodeConstants.ACC_PRIVATE |
-    CodeConstants.ACC_ABSTRACT |
-    CodeConstants.ACC_STATIC |
-    CodeConstants.ACC_FINAL |
-    CodeConstants.ACC_SYNCHRONIZED |
-    CodeConstants.ACC_NATIVE |
+    CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_ABSTRACT |
+    CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_SYNCHRONIZED | CodeConstants.ACC_NATIVE |
     CodeConstants.ACC_STRICT;
 
   private static final int CLASS_EXCLUDED = CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_STATIC;
@@ -1065,4 +1050,4 @@ public class ClassWriter {
 
     buffer.append('>');
   }
-}
+}
\ No newline at end of file

From 06c993b508c2c9079d87cdeddd7c18ba2d842dfe Mon Sep 17 00:00:00 2001
From: Alexandru-Constantin Bledea <contact@apixandru.com>
Date: Mon, 7 Mar 2016 18:52:37 +0200
Subject: [PATCH 036/252] correctly decompile interface object fields

---
 .../decompiler/main/InitializerProcessor.java     |   5 +++--
 .../java/decompiler/SingleClassesTest.java        |   5 +++--
 .../classes/pkg/TestInterfaceWithObject.class     | Bin 0 -> 329 bytes
 testData/results/TestInterfaceWithObject.dec      |   8 ++++++++
 testData/src/pkg/TestInterfaceWithObject.java     |  13 +++++++++++++
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 testData/classes/pkg/TestInterfaceWithObject.class
 create mode 100644 testData/results/TestInterfaceWithObject.dec
 create mode 100644 testData/src/pkg/TestInterfaceWithObject.java

diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index d9a0a3d..e1363d8 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -124,7 +124,7 @@ public class InitializerProcessor {
 
     RootStatement root = meth.root;
     StructClass cl = wrapper.getClassStruct();
-
+    boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
     Statement firstdata = findFirstData(root);
     if (firstdata != null) {
       while (!firstdata.getExprents().isEmpty()) {
@@ -139,7 +139,8 @@ public class InitializerProcessor {
             if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
                 cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
 
-              if (isExprentIndependent(asexpr.getRight(), meth)) {
+              // interfaces fields should always be initialized inline
+              if (isInterface || isExprentIndependent(asexpr.getRight(), meth)) {
 
                 String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index c5bcf8c..180428d 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -83,6 +83,7 @@ public class SingleClassesTest {
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
+  @Test public void testInterfaceWithObject() { doTest("pkg/TestInterfaceWithObject"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
@@ -107,7 +108,7 @@ public class SingleClassesTest {
     File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
     assertTrue(decompiledFile.isFile());
     File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
-    assertTrue(referenceFile.isFile());
+    assertTrue("Expecting " + referenceFile.getAbsolutePath() + " to be a file", referenceFile.isFile());
     assertFilesEqual(referenceFile, decompiledFile);
   }
 
@@ -129,4 +130,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
\ No newline at end of file
+}
diff --git a/testData/classes/pkg/TestInterfaceWithObject.class b/testData/classes/pkg/TestInterfaceWithObject.class
new file mode 100644
index 0000000000000000000000000000000000000000..614da5e600cf35a42e4fa5b2bf313c42b99c74f5
GIT binary patch
literal 329
zcmZ`!yH3ME5S)vHAH<LV5fTE478=~p1*J%0z><kkVnCv?&gO6~*iK|F{1?zs@Bw@j
zVr^R3Vs~bDH9PzD{qYIl6kQ7&*tDRbZJ=Xdi(z+gb1{v)aTH#<(a0SJSJ$5JPH5oI
z`3rY)u4c|arX!KaoM$}-^DN0^AyuD2J378)Xbu+-f}!opLX1~=EXt6_8FkjDi&dG3
zb6JstP&_NIP@;U~iMW$$7Q}OrsFUi9fo&T*&~2<iXV_mprOrS544v9o#*5VXm0;-p
x<&~V>yOV(QG&JddhP_I@MkWlH)Uk*iQmw*x1A9l~l^}Vitk;7U<rc99>>m@PNr?ae

literal 0
HcmV?d00001

diff --git a/testData/results/TestInterfaceWithObject.dec b/testData/results/TestInterfaceWithObject.dec
new file mode 100644
index 0000000..5afeed6
--- /dev/null
+++ b/testData/results/TestInterfaceWithObject.dec
@@ -0,0 +1,8 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+public interface TestInterfaceWithObject {
+   BigDecimal BUGS_IN_THE_DECOMPILER = BigDecimal.ZERO;
+}
+
diff --git a/testData/src/pkg/TestInterfaceWithObject.java b/testData/src/pkg/TestInterfaceWithObject.java
new file mode 100644
index 0000000..4653d70
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceWithObject.java
@@ -0,0 +1,13 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Alexandru-Constantin Bledea
+ * @since March 06, 2016
+ */
+public interface TestInterfaceWithObject {
+
+    BigDecimal BUGS_IN_THE_DECOMPILER = BigDecimal.ZERO;
+
+}

From 13595773550f5511e8431058699d04faa8d0d6ad Mon Sep 17 00:00:00 2001
From: Alexandru-Constantin Bledea <contact@apixandru.com>
Date: Thu, 17 Mar 2016 23:15:54 +0200
Subject: [PATCH 037/252] add additional tests for static initializers

---
 .../java/decompiler/SingleClassesTest.java    |   4 ++-
 testData/classes/pkg/TestClassFields.class    | Bin 415 -> 513 bytes
 .../classes/pkg/TestInterfaceWithObject.class | Bin 329 -> 0 bytes
 .../pkg/TestInterfaceWithObjectField.class    | Bin 0 -> 339 bytes
 .../pkg/TestInterfaceWithPrimitiveField.class | Bin 0 -> 225 bytes
 .../pkg/TestMutableStaticOtherClass.class     | Bin 0 -> 462 bytes
 testData/results/TestClassFields.dec          |  17 +++++------
 ...t.dec => TestInterfaceWithObjectField.dec} |   2 +-
 .../TestInterfaceWithPrimitiveField.dec       |   6 ++++
 .../results/TestMutableStaticOtherClass.dec   |  27 ++++++++++++++++++
 testData/src/pkg/TestClassFields.java         |   1 +
 ...java => TestInterfaceWithObjectField.java} |   2 +-
 .../pkg/TestInterfaceWithPrimitiveField.java  |  13 +++++++++
 .../src/pkg/TestMutableStaticOtherClass.java  |  15 ++++++++++
 14 files changed, 76 insertions(+), 11 deletions(-)
 delete mode 100644 testData/classes/pkg/TestInterfaceWithObject.class
 create mode 100644 testData/classes/pkg/TestInterfaceWithObjectField.class
 create mode 100644 testData/classes/pkg/TestInterfaceWithPrimitiveField.class
 create mode 100644 testData/classes/pkg/TestMutableStaticOtherClass.class
 rename testData/results/{TestInterfaceWithObject.dec => TestInterfaceWithObjectField.dec} (68%)
 create mode 100644 testData/results/TestInterfaceWithPrimitiveField.dec
 create mode 100644 testData/results/TestMutableStaticOtherClass.dec
 rename testData/src/pkg/{TestInterfaceWithObject.java => TestInterfaceWithObjectField.java} (78%)
 create mode 100644 testData/src/pkg/TestInterfaceWithPrimitiveField.java
 create mode 100644 testData/src/pkg/TestMutableStaticOtherClass.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 180428d..cbbbc2d 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -83,7 +83,9 @@ public class SingleClassesTest {
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
-  @Test public void testInterfaceWithObject() { doTest("pkg/TestInterfaceWithObject"); }
+  @Test public void testInterfaceWithPrimitiveField() { doTest("pkg/TestInterfaceWithPrimitiveField"); }
+  @Test public void testInterfaceWithObjectField() { doTest("pkg/TestInterfaceWithObjectField"); }
+  @Test public void testTestMutableStaticOtherClass() { doTest("pkg/TestMutableStaticOtherClass"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestClassFields.class b/testData/classes/pkg/TestClassFields.class
index 603bab20676cb402340cf83eb6720ffaac0b2a17..a25091d6a5f2925bb6daf82bf43f81a91b474d8b 100644
GIT binary patch
delta 274
zcmbQw+{j{c>ff$?3=9k=42oO~91N1|3{o5n(i{vjoDA#?vLHf^ok5<RL4lEhx40y+
zBs1B!v?MVpCzX+b(Q~3ksF9FQesW??SYlBoNHhc@#Zr=yS<J{F>Qj)Nt{;+GT;iOQ
zSX}IunVOSQY(25skeQ!BVB&gJ4qgU69tLg(o{4vil9++kb24xN-NFSD0@FZwAkD<U
z$N<y;Bn5#yeIU&Uq*=ALGcaxhOA7%>Hn5-&gD{ZI15v;r!XOIdaWIHMG*1p=)R6_L
Y<zrw5l2Sn9q=BRiP_;Oa&%_`B01_W44FCWD

delta 178
zcmXAiO%B0O6otRn;<Zl|_1jiwBq9=t7+Qc0Sdb+&U4S(h5d$+58!{88<R<6up4@wC
zoc-nNbAJFkW{!ZNWfU+Dn1ooSHKdlzl9&5q`P}#&;_|%++C&i{u9}<e!Nb*BR~%Z1
uJq&6JyK;rth?}b`<|1L}30uD~(bxXJTHVaLs5ddbFjbyua`h5<kHHt9G7z!=

diff --git a/testData/classes/pkg/TestInterfaceWithObject.class b/testData/classes/pkg/TestInterfaceWithObject.class
deleted file mode 100644
index 614da5e600cf35a42e4fa5b2bf313c42b99c74f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmZ`!yH3ME5S)vHAH<LV5fTE478=~p1*J%0z><kkVnCv?&gO6~*iK|F{1?zs@Bw@j
zVr^R3Vs~bDH9PzD{qYIl6kQ7&*tDRbZJ=Xdi(z+gb1{v)aTH#<(a0SJSJ$5JPH5oI
z`3rY)u4c|arX!KaoM$}-^DN0^AyuD2J378)Xbu+-f}!opLX1~=EXt6_8FkjDi&dG3
zb6JstP&_NIP@;U~iMW$$7Q}OrsFUi9fo&T*&~2<iXV_mprOrS544v9o#*5VXm0;-p
x<&~V>yOV(QG&JddhP_I@MkWlH)Uk*iQmw*x1A9l~l^}Vitk;7U<rc99>>m@PNr?ae

diff --git a/testData/classes/pkg/TestInterfaceWithObjectField.class b/testData/classes/pkg/TestInterfaceWithObjectField.class
new file mode 100644
index 0000000000000000000000000000000000000000..bf7ec687a2f7be273dd0d02d72e5c8dff7d985ac
GIT binary patch
literal 339
zcmaJ-Jx{|x41L#>e9%A(R7gy~1`Ao(iWu6a5GgdM4Ir^Zm-I-lBq<74{ui(@@B{c!
z2q&xv5B7VuY(M+!`{NV9DY_OmuxUX<+d#*_7Q=4;=3*Lo<0!mzqoF$puC6`bolwDF
z@E7jnT+N-nOot+oInR0w=2?=-LaK8H?dbTHp*dL21Vh`Gg&42$Sd<};Gs>(_m#Z=n
zBUzEdP&_NIP@;U`iMW$$9>fcgsF4)e?4;UdVB5wHbQ^2X84jKvQ|G@XhE6Rp<3;NH
z4rA#4rJ6L}yOV&1YG~3Y81||iH8Nqqq>M#upJHXk8`wJ<uLS7|@_Jopk#7-e!2SVF
C15H~1

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInterfaceWithPrimitiveField.class b/testData/classes/pkg/TestInterfaceWithPrimitiveField.class
new file mode 100644
index 0000000000000000000000000000000000000000..b079f95473417c8f3c5bed8fe88432d6856e50bd
GIT binary patch
literal 225
zcmX^0Z`VEs1_l!bUUmj9b_Q;C1|CKRK3~U(c&Eq^*Z43;pHNpu21ZXt243g<yyB9?
zyppiQoYGWgpr(382Cm@z(xT*4x6GVWMh2CT)Z!A)ypq(Sw8Z4p@XV5ofTGOY%#zG9
zpn}w#6uqp(vP7WiAWA<cF)v-;sj>v9Pq`pFU7vtnMg{?dHvgoo)Z`L2Mg}GZkUJO|
WBpFy3Sb;PfkjKQp4i@78vpE6pB04$%

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMutableStaticOtherClass.class b/testData/classes/pkg/TestMutableStaticOtherClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..14b1efdd89c333e2f89f96ac09e3d32c47ea60c7
GIT binary patch
literal 462
zcmah_O;5r=5PefhTS@^1Ke;G3KN5TKCh<ZfAwfAnICxvi1{MpLcJY5H2NMte0DqKm
zwxUP9%*>m&Z|3cMe7?N{xJ2DY9@PSB*eSrqu8Tbv`vkk+xxXP$hu}2TLg{Nl?&NgH
zOlvuogi2Q}<lSmMlF2}fV(wJC%SgmSktl;VO<PY@N@#Q+A12{IruufJ4c*s5tEi`^
zGHJykO|J-EGm1Bx{Qh#4M6#{S+~YrF7c=oB0(dC6I0$eEH-H0|aP-eU!j_SSu~<yP
z-e@KxO{o2dGD~eG<1u?LrJ2`_aWwc$dA=Q?ZdP$+am@}m`iw%(#5sTV3VP1yB1b1{
vx(K)qz8|23G9wR_U-5ay07YjF>jl;tIWvM_MwF4u#5N0kM*IiH7Ph|t|K(qA

literal 0
HcmV?d00001

diff --git a/testData/results/TestClassFields.dec b/testData/results/TestClassFields.dec
index 75ece1e..d139051 100644
--- a/testData/results/TestClassFields.dec
+++ b/testData/results/TestClassFields.dec
@@ -1,25 +1,26 @@
 package pkg;
 
 public class TestClassFields {
+   static int staticMutable;
    private static int[] sizes;
    private static String[] names = new String[]{"name1", "name2"};
 
    static {
-      sizes = new int[names.length];// 26
-   }// 27
+      sizes = new int[names.length];// 27
+   }// 28
 }
 
 class 'pkg/TestClassFields' {
    method '<clinit> ()V' {
-      11      7
-      14      7
-      17      7
-      1a      8
+      11      8
+      14      8
+      17      8
+      1a      9
    }
 }
 
 Lines mapping:
-26 <-> 8
 27 <-> 9
+28 <-> 10
 Not mapped:
-25
+26
diff --git a/testData/results/TestInterfaceWithObject.dec b/testData/results/TestInterfaceWithObjectField.dec
similarity index 68%
rename from testData/results/TestInterfaceWithObject.dec
rename to testData/results/TestInterfaceWithObjectField.dec
index 5afeed6..c9418d8 100644
--- a/testData/results/TestInterfaceWithObject.dec
+++ b/testData/results/TestInterfaceWithObjectField.dec
@@ -2,7 +2,7 @@ package pkg;
 
 import java.math.BigDecimal;
 
-public interface TestInterfaceWithObject {
+public interface TestInterfaceWithObjectField {
    BigDecimal BUGS_IN_THE_DECOMPILER = BigDecimal.ZERO;
 }
 
diff --git a/testData/results/TestInterfaceWithPrimitiveField.dec b/testData/results/TestInterfaceWithPrimitiveField.dec
new file mode 100644
index 0000000..542e858
--- /dev/null
+++ b/testData/results/TestInterfaceWithPrimitiveField.dec
@@ -0,0 +1,6 @@
+package pkg;
+
+public interface TestInterfaceWithPrimitiveField {
+   int MAX_BYTE_VALUE = 127;
+}
+
diff --git a/testData/results/TestMutableStaticOtherClass.dec b/testData/results/TestMutableStaticOtherClass.dec
new file mode 100644
index 0000000..6e7ed33
--- /dev/null
+++ b/testData/results/TestMutableStaticOtherClass.dec
@@ -0,0 +1,27 @@
+package pkg;
+
+import pkg.TestClassFields;
+
+public class TestMutableStaticOtherClass {
+   private static final int SIZE;
+
+   static {
+      TestClassFields.staticMutable = 3;// 12
+      SIZE = TestClassFields.staticMutable;// 13
+   }// 14
+}
+
+class 'pkg/TestMutableStaticOtherClass' {
+   method '<clinit> ()V' {
+      0      8
+      1      8
+      4      9
+      7      9
+      a      10
+   }
+}
+
+Lines mapping:
+12 <-> 9
+13 <-> 10
+14 <-> 11
diff --git a/testData/src/pkg/TestClassFields.java b/testData/src/pkg/TestClassFields.java
index a1f2fac..2341ff7 100644
--- a/testData/src/pkg/TestClassFields.java
+++ b/testData/src/pkg/TestClassFields.java
@@ -17,6 +17,7 @@ package pkg;
 
 public class TestClassFields {
 
+  static int staticMutable;
   private static int[] sizes;
   private static String[] names;
 
diff --git a/testData/src/pkg/TestInterfaceWithObject.java b/testData/src/pkg/TestInterfaceWithObjectField.java
similarity index 78%
rename from testData/src/pkg/TestInterfaceWithObject.java
rename to testData/src/pkg/TestInterfaceWithObjectField.java
index 4653d70..ac0bd64 100644
--- a/testData/src/pkg/TestInterfaceWithObject.java
+++ b/testData/src/pkg/TestInterfaceWithObjectField.java
@@ -6,7 +6,7 @@ import java.math.BigDecimal;
  * @author Alexandru-Constantin Bledea
  * @since March 06, 2016
  */
-public interface TestInterfaceWithObject {
+public interface TestInterfaceWithObjectField {
 
     BigDecimal BUGS_IN_THE_DECOMPILER = BigDecimal.ZERO;
 
diff --git a/testData/src/pkg/TestInterfaceWithPrimitiveField.java b/testData/src/pkg/TestInterfaceWithPrimitiveField.java
new file mode 100644
index 0000000..89d1b7a
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceWithPrimitiveField.java
@@ -0,0 +1,13 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Alexandru-Constantin Bledea
+ * @since March 06, 2016
+ */
+public interface TestInterfaceWithPrimitiveField {
+
+    int MAX_BYTE_VALUE = Byte.MAX_VALUE;
+
+}
diff --git a/testData/src/pkg/TestMutableStaticOtherClass.java b/testData/src/pkg/TestMutableStaticOtherClass.java
new file mode 100644
index 0000000..4015c83
--- /dev/null
+++ b/testData/src/pkg/TestMutableStaticOtherClass.java
@@ -0,0 +1,15 @@
+package pkg;
+
+/**
+ * @author Alexandru-Constantin Bledea
+ * @since March 17, 2016
+ */
+public class TestMutableStaticOtherClass {
+
+    private static final int SIZE;
+
+    static {
+        TestClassFields.staticMutable = 3;
+        SIZE = TestClassFields.staticMutable;
+    }
+}

From 93a39b7b50beaec7b96adbb75141fe5ba3d39c47 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 18 Mar 2016 18:02:33 +0100
Subject: [PATCH 038/252] [java-decompiler] test data cleanup; warnings

---
 .../decompiler/DecompilerTestFixture.java     |  10 ++++---
 .../java/decompiler/SingleClassesTest.java    |   8 ++----
 .../classes/pkg/TestClassFields$Inner.class   | Bin 0 -> 441 bytes
 testData/classes/pkg/TestClassFields.class    | Bin 513 -> 592 bytes
 .../classes/pkg/TestInterfaceFields.class     | Bin 0 -> 385 bytes
 .../pkg/TestInterfaceWithObjectField.class    | Bin 339 -> 0 bytes
 .../pkg/TestInterfaceWithPrimitiveField.class | Bin 225 -> 0 bytes
 .../pkg/TestMutableStaticOtherClass.class     | Bin 462 -> 0 bytes
 testData/results/TestClassFields.dec          |  25 +++++++++++-----
 testData/results/TestInterfaceFields.dec      |   9 ++++++
 .../results/TestInterfaceWithObjectField.dec  |   8 ------
 .../TestInterfaceWithPrimitiveField.dec       |   6 ----
 .../results/TestMutableStaticOtherClass.dec   |  27 ------------------
 testData/src/pkg/TestClassFields.java         |  27 ++++++------------
 testData/src/pkg/TestInterfaceFields.java     |   8 ++++++
 .../src/pkg/TestInterfaceWithObjectField.java |  13 ---------
 .../pkg/TestInterfaceWithPrimitiveField.java  |  13 ---------
 .../src/pkg/TestMutableStaticOtherClass.java  |  15 ----------
 18 files changed, 53 insertions(+), 116 deletions(-)
 create mode 100644 testData/classes/pkg/TestClassFields$Inner.class
 create mode 100644 testData/classes/pkg/TestInterfaceFields.class
 delete mode 100644 testData/classes/pkg/TestInterfaceWithObjectField.class
 delete mode 100644 testData/classes/pkg/TestInterfaceWithPrimitiveField.class
 delete mode 100644 testData/classes/pkg/TestMutableStaticOtherClass.class
 create mode 100644 testData/results/TestInterfaceFields.dec
 delete mode 100644 testData/results/TestInterfaceWithObjectField.dec
 delete mode 100644 testData/results/TestInterfaceWithPrimitiveField.dec
 delete mode 100644 testData/results/TestMutableStaticOtherClass.dec
 create mode 100644 testData/src/pkg/TestInterfaceFields.java
 delete mode 100644 testData/src/pkg/TestInterfaceWithObjectField.java
 delete mode 100644 testData/src/pkg/TestInterfaceWithPrimitiveField.java
 delete mode 100644 testData/src/pkg/TestMutableStaticOtherClass.java

diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index b3385e2..58f6db0 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -104,13 +105,14 @@ public class DecompilerTestFixture {
 
   public static void assertFilesEqual(File expected, File actual) {
     if (expected.isDirectory()) {
-      assertThat(actual.list(), Matchers.arrayContainingInAnyOrder(expected.list()));
-      for (String name : expected.list()) {
+      String[] children = Objects.requireNonNull(expected.list());
+      assertThat(actual.list(), Matchers.arrayContainingInAnyOrder(children));
+      for (String name : children) {
         assertFilesEqual(new File(expected, name), new File(actual, name));
       }
     }
     else {
-      assertThat(getContent(actual), Matchers.equalTo(getContent(expected)));
+      assertEquals(getContent(expected), getContent(actual));
     }
   }
 
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index cbbbc2d..e905fb3 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -46,6 +46,7 @@ public class SingleClassesTest {
   }
 
   @Test public void testClassFields() { doTest("pkg/TestClassFields"); }
+  @Test public void testInterfaceFields() { doTest("pkg/TestInterfaceFields"); }
   @Test public void testClassLambda() { doTest("pkg/TestClassLambda"); }
   @Test public void testClassLoop() { doTest("pkg/TestClassLoop"); }
   @Test public void testClassSwitch() { doTest("pkg/TestClassSwitch"); }
@@ -83,9 +84,6 @@ public class SingleClassesTest {
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
-  @Test public void testInterfaceWithPrimitiveField() { doTest("pkg/TestInterfaceWithPrimitiveField"); }
-  @Test public void testInterfaceWithObjectField() { doTest("pkg/TestInterfaceWithObjectField"); }
-  @Test public void testTestMutableStaticOtherClass() { doTest("pkg/TestMutableStaticOtherClass"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
@@ -110,7 +108,7 @@ public class SingleClassesTest {
     File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
     assertTrue(decompiledFile.isFile());
     File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
-    assertTrue("Expecting " + referenceFile.getAbsolutePath() + " to be a file", referenceFile.isFile());
+    assertTrue(referenceFile.isFile());
     assertFilesEqual(referenceFile, decompiledFile);
   }
 
@@ -132,4 +130,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
+}
\ No newline at end of file
diff --git a/testData/classes/pkg/TestClassFields$Inner.class b/testData/classes/pkg/TestClassFields$Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..1c16a7e3b3a72a2d00987cd024702775f328a0ae
GIT binary patch
literal 441
zcmZvYOH0E*6ot<;uQsMO+WM%dxagvFVS>06H-$pL$HF4GoTNiZO;gDv{wg=>LU7>^
z@JESvVnC3r&dizboIBjF?~hLaXXv+}VZ(-wO$$8>I}B}^^E{5OikyduU|<1*c^;>6
ze!-v(M|TYRcr~M!&Sjj6>tY#-Z2HUEJc@*r1K&R-Y8Z?t`{(&(URk%RB8$W%R{g!H
zkoh>_Qchx#%;d>}KXC^JOa~U47Iqo>j}LS2A2$fnRAdZBrB113k&q0os__z@&b^y(
zA)=h2ThoFgT7XWwpkJw(bkfjJgUM;p?SPb#8prQwyi_0vRHp7Wu?D9?4=JczbMO8Q
h?74<*W4&VcOOhI1Ye?$pP`UvZ+oU$J8oJnm{R2F=OsoI^

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestClassFields.class b/testData/classes/pkg/TestClassFields.class
index a25091d6a5f2925bb6daf82bf43f81a91b474d8b..e8788e044b56381c8df5b82c7da5c6fa33ec8ee3 100644
GIT binary patch
literal 592
zcmZva%TB^T6o&tyl$Kfr!5iKXMFcg1#+}9u(WD8%MU4hol{z8SQVgvwd@E%kG3o>O
zP{uP2kx1N}f6isjd}n69zTZ9p9Aa0)1eO)7s905zjYGqlFgXo6)`i&+ZeGErf`WoA
z2HEgD-eb^1t-6-)bDzS#^CUFVG|2I+j&Rb=+O73ym0ingm(8H(c<m#GsA*iEGB7HP
z9Xp;AoG?hm(j{f8-5bu3s5u_5KXh8WcVV?$im1o7JFL{q?nBS!XO4)^TyQ@K8O|K;
z-uQdsI32T?V@Qr4J>=RS>Vb}Fq;w>Z)KNr9$2N9!q%lL__jm2`Snod_&s(?L4j3~3
z6y}FFq*=DjeLr8R9MEV*qeKIbVwG@c139|i33?2Plu&4;2`<t_!9p4V6BCi0CvSz6
zk;>bzV9&H*SRfk<gA!C^eoO0!QU)l<ABZ%hlw>xdsi@h9`~vy&UF#zj8$h`lK<y(w
i>NN+Mc1;mRf*_`mC7exyiI697mMAAM=@XEhg!Tg~K5Qre

delta 313
zcmX|5%}T>S7@SQ~vyExh)%w#^YY{;ODT=px69l0igd%ucYtUdoao4kW^ceae;z<zn
z0X+E*zJw=nHU%#;-^_e}U%_Lr|M~m&0bmcE2og&nni7dbtBMfI4pu_6L#ztajMX+9
z9^YGio~Huhs5sd!o;G$>|7NK3Q+=1YU@%StdzBf1M*sHuvO7qPJ;=2&hgq6mm|pR`
z<4<9__+FPa)MHE{9<{~h13Ek?`HoMlB4QP}uw-_UJqU1=I78JX3vy-a72>6g6>*|8
z6=qq-;|9#3K_xN&Kioq=2S_UK@XmbYkA8$&b6W)5mO9@6nmm*cTXYwwJuLnKU$ZPj

diff --git a/testData/classes/pkg/TestInterfaceFields.class b/testData/classes/pkg/TestInterfaceFields.class
new file mode 100644
index 0000000000000000000000000000000000000000..4f39e335d3d806c1938a24d5ac0a36a3deb8ea8e
GIT binary patch
literal 385
zcmZusyH3ME5S&Xw&VeKZ2zk)ZLW3JR5K<frvJ{8}#sZq?>>TET;~@KtM8!7&9R(l2
zM<Ld3XmZ8w?3{LX=I8h88^9rUI5un8Lc4|vwmCW+T?WH)&L{Ww)tI3(nu!--&V_z7
zEft>1K+Q#T#L&DL+)k`J*PeKT(T&Z(9EQel5vN+j+7nSG%XH$6)Q*El#Y&$rl=t>M
zhRSd;l?>}670b(P?#sj#eniab^&(3Gd8YEA=gL$&v6jh$$T=BJ(}Ua$-7Y*uA`VUK
zRZEUu9ewaRs^ARW=cmwIvdqx>-y8cg8EA&~vUp@MPhX{u6$()zb&@93hk+W%X~C`$
hGEhf@dXt!4>iOdzD1D;*PLN_!trj17ZP8T1#vecpQhWda

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInterfaceWithObjectField.class b/testData/classes/pkg/TestInterfaceWithObjectField.class
deleted file mode 100644
index bf7ec687a2f7be273dd0d02d72e5c8dff7d985ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmaJ-Jx{|x41L#>e9%A(R7gy~1`Ao(iWu6a5GgdM4Ir^Zm-I-lBq<74{ui(@@B{c!
z2q&xv5B7VuY(M+!`{NV9DY_OmuxUX<+d#*_7Q=4;=3*Lo<0!mzqoF$puC6`bolwDF
z@E7jnT+N-nOot+oInR0w=2?=-LaK8H?dbTHp*dL21Vh`Gg&42$Sd<};Gs>(_m#Z=n
zBUzEdP&_NIP@;U`iMW$$9>fcgsF4)e?4;UdVB5wHbQ^2X84jKvQ|G@XhE6Rp<3;NH
z4rA#4rJ6L}yOV&1YG~3Y81||iH8Nqqq>M#upJHXk8`wJ<uLS7|@_Jopk#7-e!2SVF
C15H~1

diff --git a/testData/classes/pkg/TestInterfaceWithPrimitiveField.class b/testData/classes/pkg/TestInterfaceWithPrimitiveField.class
deleted file mode 100644
index b079f95473417c8f3c5bed8fe88432d6856e50bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmX^0Z`VEs1_l!bUUmj9b_Q;C1|CKRK3~U(c&Eq^*Z43;pHNpu21ZXt243g<yyB9?
zyppiQoYGWgpr(382Cm@z(xT*4x6GVWMh2CT)Z!A)ypq(Sw8Z4p@XV5ofTGOY%#zG9
zpn}w#6uqp(vP7WiAWA<cF)v-;sj>v9Pq`pFU7vtnMg{?dHvgoo)Z`L2Mg}GZkUJO|
WBpFy3Sb;PfkjKQp4i@78vpE6pB04$%

diff --git a/testData/classes/pkg/TestMutableStaticOtherClass.class b/testData/classes/pkg/TestMutableStaticOtherClass.class
deleted file mode 100644
index 14b1efdd89c333e2f89f96ac09e3d32c47ea60c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmah_O;5r=5PefhTS@^1Ke;G3KN5TKCh<ZfAwfAnICxvi1{MpLcJY5H2NMte0DqKm
zwxUP9%*>m&Z|3cMe7?N{xJ2DY9@PSB*eSrqu8Tbv`vkk+xxXP$hu}2TLg{Nl?&NgH
zOlvuogi2Q}<lSmMlF2}fV(wJC%SgmSktl;VO<PY@N@#Q+A12{IruufJ4c*s5tEi`^
zGHJykO|J-EGm1Bx{Qh#4M6#{S+~YrF7c=oB0(dC6I0$eEH-H0|aP-eU!j_SSu~<yP
z-e@KxO{o2dGD~eG<1u?LrJ2`_aWwc$dA=Q?ZdP$+am@}m`iw%(#5sTV3VP1yB1b1{
vx(K)qz8|23G9wR_U-5ay07YjF>jl;tIWvM_MwF4u#5N0kM*IiH7Ph|t|K(qA

diff --git a/testData/results/TestClassFields.dec b/testData/results/TestClassFields.dec
index d139051..6917171 100644
--- a/testData/results/TestClassFields.dec
+++ b/testData/results/TestClassFields.dec
@@ -1,26 +1,37 @@
 package pkg;
 
 public class TestClassFields {
-   static int staticMutable;
    private static int[] sizes;
    private static String[] names = new String[]{"name1", "name2"};
+   private static final int SIZE;
 
    static {
-      sizes = new int[names.length];// 27
-   }// 28
+      sizes = new int[names.length];// 15
+      TestClassFields.Inner.staticMutable = 3;// 17
+      SIZE = TestClassFields.Inner.staticMutable;// 14 18
+   }// 19
+
+   private static class Inner {
+      private static int staticMutable;
+   }
 }
 
 class 'pkg/TestClassFields' {
    method '<clinit> ()V' {
+      0      10
+      2      9
       11      8
       14      8
       17      8
       1a      9
+      22      10
+      25      11
    }
 }
 
 Lines mapping:
-27 <-> 9
-28 <-> 10
-Not mapped:
-26
+14 <-> 11
+15 <-> 9
+17 <-> 10
+18 <-> 11
+19 <-> 12
diff --git a/testData/results/TestInterfaceFields.dec b/testData/results/TestInterfaceFields.dec
new file mode 100644
index 0000000..d08e2fe
--- /dev/null
+++ b/testData/results/TestInterfaceFields.dec
@@ -0,0 +1,9 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+public interface TestInterfaceFields {
+   BigDecimal BIG_ZERO = BigDecimal.ZERO;
+   int MAX_BYTE_VALUE = 127;
+}
+
diff --git a/testData/results/TestInterfaceWithObjectField.dec b/testData/results/TestInterfaceWithObjectField.dec
deleted file mode 100644
index c9418d8..0000000
--- a/testData/results/TestInterfaceWithObjectField.dec
+++ /dev/null
@@ -1,8 +0,0 @@
-package pkg;
-
-import java.math.BigDecimal;
-
-public interface TestInterfaceWithObjectField {
-   BigDecimal BUGS_IN_THE_DECOMPILER = BigDecimal.ZERO;
-}
-
diff --git a/testData/results/TestInterfaceWithPrimitiveField.dec b/testData/results/TestInterfaceWithPrimitiveField.dec
deleted file mode 100644
index 542e858..0000000
--- a/testData/results/TestInterfaceWithPrimitiveField.dec
+++ /dev/null
@@ -1,6 +0,0 @@
-package pkg;
-
-public interface TestInterfaceWithPrimitiveField {
-   int MAX_BYTE_VALUE = 127;
-}
-
diff --git a/testData/results/TestMutableStaticOtherClass.dec b/testData/results/TestMutableStaticOtherClass.dec
deleted file mode 100644
index 6e7ed33..0000000
--- a/testData/results/TestMutableStaticOtherClass.dec
+++ /dev/null
@@ -1,27 +0,0 @@
-package pkg;
-
-import pkg.TestClassFields;
-
-public class TestMutableStaticOtherClass {
-   private static final int SIZE;
-
-   static {
-      TestClassFields.staticMutable = 3;// 12
-      SIZE = TestClassFields.staticMutable;// 13
-   }// 14
-}
-
-class 'pkg/TestMutableStaticOtherClass' {
-   method '<clinit> ()V' {
-      0      8
-      1      8
-      4      9
-      7      9
-      a      10
-   }
-}
-
-Lines mapping:
-12 <-> 9
-13 <-> 10
-14 <-> 11
diff --git a/testData/src/pkg/TestClassFields.java b/testData/src/pkg/TestClassFields.java
index 2341ff7..8a77fe0 100644
--- a/testData/src/pkg/TestClassFields.java
+++ b/testData/src/pkg/TestClassFields.java
@@ -1,29 +1,20 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package pkg;
 
 public class TestClassFields {
+  private static class Inner {
+    private static int staticMutable;
+  }
 
-  static int staticMutable;
   private static int[] sizes;
   private static String[] names;
 
-  static {
+  private static final int SIZE;
 
+  static {
     names = new String[]{"name1", "name2"};
     sizes = new int[names.length];
+
+    Inner.staticMutable = 3;
+    SIZE = Inner.staticMutable;
   }
-}
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestInterfaceFields.java b/testData/src/pkg/TestInterfaceFields.java
new file mode 100644
index 0000000..e117258
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceFields.java
@@ -0,0 +1,8 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+public interface TestInterfaceFields {
+  BigDecimal BIG_ZERO = BigDecimal.ZERO;
+  int MAX_BYTE_VALUE = Byte.MAX_VALUE;
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestInterfaceWithObjectField.java b/testData/src/pkg/TestInterfaceWithObjectField.java
deleted file mode 100644
index ac0bd64..0000000
--- a/testData/src/pkg/TestInterfaceWithObjectField.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package pkg;
-
-import java.math.BigDecimal;
-
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 06, 2016
- */
-public interface TestInterfaceWithObjectField {
-
-    BigDecimal BUGS_IN_THE_DECOMPILER = BigDecimal.ZERO;
-
-}
diff --git a/testData/src/pkg/TestInterfaceWithPrimitiveField.java b/testData/src/pkg/TestInterfaceWithPrimitiveField.java
deleted file mode 100644
index 89d1b7a..0000000
--- a/testData/src/pkg/TestInterfaceWithPrimitiveField.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package pkg;
-
-import java.math.BigDecimal;
-
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 06, 2016
- */
-public interface TestInterfaceWithPrimitiveField {
-
-    int MAX_BYTE_VALUE = Byte.MAX_VALUE;
-
-}
diff --git a/testData/src/pkg/TestMutableStaticOtherClass.java b/testData/src/pkg/TestMutableStaticOtherClass.java
deleted file mode 100644
index 4015c83..0000000
--- a/testData/src/pkg/TestMutableStaticOtherClass.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package pkg;
-
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 17, 2016
- */
-public class TestMutableStaticOtherClass {
-
-    private static final int SIZE;
-
-    static {
-        TestClassFields.staticMutable = 3;
-        SIZE = TestClassFields.staticMutable;
-    }
-}

From 0e514a62539310acfe380cbb71791656247cf23b Mon Sep 17 00:00:00 2001
From: Alexandru-Constantin Bledea <contact@apixandru.com>
Date: Sat, 19 Mar 2016 20:44:29 +0200
Subject: [PATCH 039/252] fix constructor arguments for extended inner classes

---
 .../decompiler/exps/InvocationExprent.java    |   2 +-
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 .../pkg/TestExtendingSubclass$Subclass1.class | Bin 0 -> 555 bytes
 .../pkg/TestExtendingSubclass$Subclass2.class | Bin 0 -> 594 bytes
 .../classes/pkg/TestExtendingSubclass.class   | Bin 0 -> 441 bytes
 testData/results/TestExtendingSubclass.dec    |  35 ++++++++++++++++++
 testData/src/pkg/TestExtendingSubclass.java   |  18 +++++++++
 7 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 testData/classes/pkg/TestExtendingSubclass$Subclass1.class
 create mode 100644 testData/classes/pkg/TestExtendingSubclass$Subclass2.class
 create mode 100644 testData/classes/pkg/TestExtendingSubclass.class
 create mode 100644 testData/results/TestExtendingSubclass.dec
 create mode 100644 testData/src/pkg/TestExtendingSubclass.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 3ceb99c..758b93f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -334,7 +334,7 @@ public class InvocationExprent extends Exprent {
     boolean firstParameter = true;
     int start = isEnum ? 2 : 0;
     for (int i = start; i < lstParameters.size(); i++) {
-      if (sigFields == null) {
+      if (sigFields == null || null == sigFields.get(i)) {
         if (!firstParameter) {
           buf.append(", ");
         }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index e905fb3..260445d 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -84,6 +84,7 @@ public class SingleClassesTest {
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
+  @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
@@ -130,4 +131,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
\ No newline at end of file
+}
diff --git a/testData/classes/pkg/TestExtendingSubclass$Subclass1.class b/testData/classes/pkg/TestExtendingSubclass$Subclass1.class
new file mode 100644
index 0000000000000000000000000000000000000000..fbf2ce2b4220de642b95b58ed3cbb2148db60da8
GIT binary patch
literal 555
zcmaJ;O-sW-5Ph4*#>8l2{cL*?tWYbM3f?MSih>aI(9-)RU21B&l_VAamIo0$_yhb=
z;!II{(8{vR%-c8f-tNACyuJZAMa@P5n+{BDS=h0#D^SdD<E-8is0H_TL%*l8{NgcJ
zdJyYjcN#{C%(6Do&SD+s=K`(9KfGWhAEcj1J@mVIN)y_LeF3vG87P5L5NmZk9fvCI
z$uJ?L984ma^ko`z{RNtANWlIUKM`=Rv{q?{ttdJ=SnQzw(?y<5EypvJU#<k4?qr%q
z>M~{@)jw~2%xx}~P;_CTVxcOqzwnLb$^zb8@FpCoC>JO+_$4X}+p$MKW6~!H&tpl>
zXj@pOXj2xzAO_$xkDei#FEE~{GT<;q5yZ4<tx(3Z7<Eyi$Qe)Mc@8|R6Wc(UDgzr>
Mo1tV7+gJrY0UM2l+yDRo

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestExtendingSubclass$Subclass2.class b/testData/classes/pkg/TestExtendingSubclass$Subclass2.class
new file mode 100644
index 0000000000000000000000000000000000000000..d30cc61f527200abd5220e809d3632d540ce773b
GIT binary patch
literal 594
zcma)3T}uK%6g{(UZrb{heX1`(2Bnb}y&1hoL9q0Y;`^wBZLMSMuF>D>A%Y(I0sW}x
zjPwO%#4>x&oqNx@XJ%erpPm66qMSkk%W2qHaj@oKT_71>`cb7JQ1))FhxLw%;*+~r
z>4C3@?Mbg6$S7*E?a0@Dd@Rt|{-e*klDD!RNIk5#<B$r?ovwi08V{5}&hxc8pNx7c
z?8sigoq{*+%b+Vm-{kL`wlO4-`WSv7;GSu%!j`e3SlXKHpz_J0XIsnBbjlA`0_pa6
z686=pZ+w(~J@uZUxtK%Jg@btqC4tSEcl0&+UtRm(PDoswsf!Ihna$S|`MmLB5El(G
zrid<BPcXXG+5<$jw)+U{p1FlI|Ji9RLuM8W$Z=t+$bNn~W(FBuqv|4$MKUcEm|0jN
P3&a*xR*@mL8H>OhCZ3TC

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestExtendingSubclass.class b/testData/classes/pkg/TestExtendingSubclass.class
new file mode 100644
index 0000000000000000000000000000000000000000..eb4f049285b0ef4ac6e9ef8c9d06eb0b0bc291bd
GIT binary patch
literal 441
zcma)2O-sW-5Pj38T^pmV@eB1NdQcCBiZ{heQ4oS2T6*84OWYbal1;?F<w@}15Aa8c
zlhA?(3+}RS=Dm5$4)gW>@d@A@+b){$1=a;N1U3nsVHw4#wDyeP-5R6vLB*66*!orN
z6WW*B=;DgdJUSi|oIy5Ggl?#fx+|X|m5*eUvf_tXEYq>fb;W0*Q#@!(*bAQ@lVGH5
zas65-GtnlQ|9?Snhgq4&>PA;>cK>vpPUVaA(1A<XS=fuvt9(H!O%mKkQxzA4gN63P
z`3$^+f4KVCM}yZ`9pcNwFfKC-Y7Vqc-a&6HG~h9|S!NL{jNU9?MYpc^YFuLv;IrT1
L*Wz4oTmpUo{cmbq

literal 0
HcmV?d00001

diff --git a/testData/results/TestExtendingSubclass.dec b/testData/results/TestExtendingSubclass.dec
new file mode 100644
index 0000000..5e13985
--- /dev/null
+++ b/testData/results/TestExtendingSubclass.dec
@@ -0,0 +1,35 @@
+package pkg;
+
+public class TestExtendingSubclass {
+   class Subclass2 extends TestExtendingSubclass.Subclass1 {
+      Subclass2(String name) {
+         super(name);// 14
+      }// 15
+   }
+
+   class Subclass1 {
+      Subclass1(String name) {
+      }// 9
+   }
+}
+
+class 'pkg/TestExtendingSubclass$Subclass2' {
+   method '<init> (Lpkg/TestExtendingSubclass;Ljava/lang/String;)V' {
+      8      5
+      b      6
+   }
+}
+
+class 'pkg/TestExtendingSubclass$Subclass1' {
+   method '<init> (Lpkg/TestExtendingSubclass;Ljava/lang/String;)V' {
+      9      11
+   }
+}
+
+Lines mapping:
+9 <-> 12
+14 <-> 6
+15 <-> 7
+Not mapped:
+8
+13
diff --git a/testData/src/pkg/TestExtendingSubclass.java b/testData/src/pkg/TestExtendingSubclass.java
new file mode 100644
index 0000000..f63baed
--- /dev/null
+++ b/testData/src/pkg/TestExtendingSubclass.java
@@ -0,0 +1,18 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+public class TestExtendingSubclass {
+
+  class Subclass1 {
+    Subclass1(String name) {
+    }
+  }
+
+  class Subclass2 extends Subclass1 {
+    Subclass2(String name) {
+      super(name);
+    }
+  }
+
+}

From 96ff7f787edd44b64dcf6f5cfd58440f7041d48c Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 21 Mar 2016 12:26:50 +0100
Subject: [PATCH 040/252] Cleanup (formatting; typos)

---
 .../decompiler/exps/InvocationExprent.java    | 72 +++++++++----------
 .../java/decompiler/SingleClassesTest.java    |  2 +-
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 758b93f..1b8188a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -224,20 +224,20 @@ public class InvocationExprent extends Exprent {
     else {
 
       if (instance != null && instance.type == Exprent.EXPRENT_VAR) {
-        VarExprent instvar = (VarExprent)instance;
-        VarVersionPair varpaar = new VarVersionPair(instvar);
+        VarExprent instVar = (VarExprent)instance;
+        VarVersionPair varPair = new VarVersionPair(instVar);
 
-        VarProcessor vproc = instvar.getProcessor();
-        if (vproc == null) {
-          MethodWrapper current_meth = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-          if (current_meth != null) {
-            vproc = current_meth.varproc;
+        VarProcessor varProc = instVar.getProcessor();
+        if (varProc == null) {
+          MethodWrapper currentMethod = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+          if (currentMethod != null) {
+            varProc = currentMethod.varproc;
           }
         }
 
         String this_classname = null;
-        if (vproc != null) {
-          this_classname = vproc.getThisVars().get(varpaar);
+        if (varProc != null) {
+          this_classname = varProc.getThisVars().get(varPair);
         }
 
         if (this_classname != null) {
@@ -334,7 +334,7 @@ public class InvocationExprent extends Exprent {
     boolean firstParameter = true;
     int start = isEnum ? 2 : 0;
     for (int i = start; i < lstParameters.size(); i++) {
-      if (sigFields == null || null == sigFields.get(i)) {
+      if (sigFields == null || sigFields.get(i) == null) {
         if (!firstParameter) {
           buf.append(", ");
         }
@@ -512,43 +512,35 @@ public class InvocationExprent extends Exprent {
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
       RuleValue value = rule.getValue();
-      
-      switch(rule.getKey()) {
-      case EXPRENT_INVOCATION_PARAMETER:
-        if(value.isVariable()) {
-          if(value.parameter < lstParameters.size()) {
-            if(!engine.checkAndSetVariableValue(value.value.toString(), lstParameters.get(value.parameter))) {
-              return false;
-            }
-          } else {
-            return false;
-          }
-        }
-        break;
-      case EXPRENT_INVOCATION_CLASS:
-        if(!value.value.equals(this.classname)) {
+
+      MatchProperties key = rule.getKey();
+      if (key == MatchProperties.EXPRENT_INVOCATION_PARAMETER) {
+        if (value.isVariable() && (value.parameter >= lstParameters.size() ||
+                                   !engine.checkAndSetVariableValue(value.value.toString(), lstParameters.get(value.parameter)))) {
+          return false;
+        }
+      }
+      else if (key == MatchProperties.EXPRENT_INVOCATION_CLASS) {
+        if (!value.value.equals(this.classname)) {
+          return false;
+        }
+      }
+      else if (key == MatchProperties.EXPRENT_INVOCATION_SIGNATURE) {
+        if (!value.value.equals(this.name + this.stringDescriptor)) {
           return false;
         }
-        break;
-      case EXPRENT_INVOCATION_SIGNATURE:
-        if(!value.value.equals(this.name + this.stringDescriptor)) {
-          return false;
-        }
-        break;
       }
-      
     }
-    
+
     return true;
   }
-
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 260445d..100deeb 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -131,4 +131,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
+}
\ No newline at end of file

From 081a208a6a58e72c1ab4960ef74e482dfd1fe5df Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 28 Mar 2016 13:02:19 +0300
Subject: [PATCH 041/252] reasonalble toString for easier debugging

---
 .../java/decompiler/modules/decompiler/exps/Exprent.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index fbd146e..42abbb2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -193,5 +193,9 @@ public class Exprent implements IMatchable {
     
     return true;
   }
-  
+
+  @Override
+  public String toString() {
+    return toJava(0, new BytecodeMappingTracer()).toString();
+  }
 }

From 95215dc2e288013281baff74e2b2ae1cfe1c8871 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 28 Mar 2016 13:57:29 +0300
Subject: [PATCH 042/252] replace increment / decrement synthetic access
 method, pull-request #373

---
 .../main/rels/NestedMemberAccess.java         |  44 +++++++--
 .../java/decompiler/SingleClassesTest.java    |   5 +-
 .../pkg/TestSyntheticAccess$Assigner.class    | Bin 0 -> 753 bytes
 .../pkg/TestSyntheticAccess$Incrementer.class | Bin 0 -> 928 bytes
 .../classes/pkg/TestSyntheticAccess.class     | Bin 0 -> 1012 bytes
 testData/results/TestSyntheticAccess.dec      |  85 ++++++++++++++++++
 testData/src/pkg/TestSyntheticAccess.java     |  44 +++++++++
 7 files changed, 169 insertions(+), 9 deletions(-)
 create mode 100644 testData/classes/pkg/TestSyntheticAccess$Assigner.class
 create mode 100644 testData/classes/pkg/TestSyntheticAccess$Incrementer.class
 create mode 100644 testData/classes/pkg/TestSyntheticAccess.class
 create mode 100644 testData/results/TestSyntheticAccess.dec
 create mode 100644 testData/src/pkg/TestSyntheticAccess.java

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index 3fa8128..2ea32bd 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +29,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
 
 public class NestedMemberAccess {
 
@@ -40,6 +37,7 @@ public class NestedMemberAccess {
   private static final int METHOD_ACCESS_FIELD_GET = 2;
   private static final int METHOD_ACCESS_FIELD_SET = 3;
   private static final int METHOD_ACCESS_METHOD = 4;
+  private static final int METHOD_ACCESS_FUNCTION = 5;
 
   private boolean noSynthFlag;
   private final Map<MethodWrapper, Integer> mapMethodType = new HashMap<MethodWrapper, Integer>();
@@ -117,6 +115,16 @@ public class NestedMemberAccess {
                   }
                 }
 
+                break;
+              case Exprent.EXPRENT_FUNCTION:
+                // for now detect only increment/decrement
+                FunctionExprent functionExprent = (FunctionExprent)exprCore;
+                if (functionExprent.getFuncType() >= FunctionExprent.FUNCTION_IMM &&
+                    functionExprent.getFuncType() <= FunctionExprent.FUNCTION_PPI) {
+                  if (functionExprent.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
+                    type = METHOD_ACCESS_FUNCTION;
+                  }
+                }
                 break;
               case Exprent.EXPRENT_INVOCATION:
                 type = METHOD_ACCESS_METHOD;
@@ -139,7 +147,6 @@ public class NestedMemberAccess {
                 }
             }
 
-
             if (type == METHOD_ACCESS_METHOD) { // FIXME: check for private flag of the method
 
               type = METHOD_ACCESS_NORMAL;
@@ -323,7 +330,6 @@ public class NestedMemberAccess {
   }
 
   private Exprent replaceAccessExprent(ClassNode caller, MethodWrapper methdest, InvocationExprent invexpr) {
-
     ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(invexpr.getClassname());
 
     MethodWrapper methsource = null;
@@ -408,6 +414,9 @@ public class NestedMemberAccess {
         }
         retexprent = ret;
         break;
+      case METHOD_ACCESS_FUNCTION:
+        retexprent = replaceFunction(invexpr, source);
+        break;
       case METHOD_ACCESS_METHOD:
         if (source.type == Exprent.EXPRENT_EXIT) {
           source = ((ExitExprent)source).getValue();
@@ -446,4 +455,25 @@ public class NestedMemberAccess {
 
     return retexprent;
   }
+
+  private static Exprent replaceFunction(final InvocationExprent invexpr, final Exprent source) {
+    FunctionExprent functionExprent = (FunctionExprent)((ExitExprent)source).getValue().copy();
+
+    List<Exprent> lstParameters = invexpr.getLstParameters();
+
+    FieldExprent fieldExprent = (FieldExprent)functionExprent.getLstOperands().get(0);
+    if (fieldExprent.isStatic()) {
+      if (!lstParameters.isEmpty()) {
+        return null;
+      }
+      return functionExprent;
+    }
+
+    if (lstParameters.size() != 1) {
+      return null;
+    }
+
+    fieldExprent.replaceExprent(fieldExprent.getInstance(), lstParameters.get(0));
+    return functionExprent;
+  }
 }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 100deeb..5bdbdc5 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -85,8 +85,9 @@ public class SingleClassesTest {
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
   @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
+  @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
 
-  protected void doTest(String testFile, String... companionFiles) {
+  private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
 
     File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
@@ -131,4 +132,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
\ No newline at end of file
+}
diff --git a/testData/classes/pkg/TestSyntheticAccess$Assigner.class b/testData/classes/pkg/TestSyntheticAccess$Assigner.class
new file mode 100644
index 0000000000000000000000000000000000000000..c15e644dbe8e817ab9b3a02a21438b287b356ff2
GIT binary patch
literal 753
zcmZ{iT`vPc6o%ikt=(EntG>UBtrUrtxFZrIl1&;eDs??wlUmkRx?AFBNeFS_2l!Fq
z%&L;GH#2i)-t(OI%*^}8>l=V=tn{M~Qzmpwo0!3@8s-el8(1Ld(S;Y<6~a{Y=Bimf
zm0?u7526bhdG5aJ$}rqv(XJPG(H>#8l&D&*6VivRb4kcny+9s!t{bv_DjGiT<f|=L
z_;u0tRNUQ6tI~wbei(YqK(+~%6YzZKi!hXYvXoTJ{!U?U28%h};p!zvnaBk4t}grz
zmnGiqp4SLwt<`C}^2k$;CjaSl<5JuT3kEV4`cW{jXkiJ<7Hkv=g@pU*nIYs9pzMpF
zSw3l8N;e{;O3KqjLN1#U@g>`p$`)ZR`FfpI?&Vv&sl=*X2L*mxou8R<Ic1zzDQN88
z1Ysb4evM<mTw8wvtvy3~;7EhTqs|&&9)mnu@!G@?hB*TA80iuYSp7wK1kJo4b@oFr
z<C6l{TZ}2=U&<cE#3;sM@_3K8$Fbt+%u4@Z+1yX@7fbK4^e#)o1ZQiQM2=_GXCHs)
GEVNHr8I{Wb

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSyntheticAccess$Incrementer.class b/testData/classes/pkg/TestSyntheticAccess$Incrementer.class
new file mode 100644
index 0000000000000000000000000000000000000000..631d4376fac9b9bd6e82deaa4223162f527b7883
GIT binary patch
literal 928
zcmaKr+e*Vg5QhIv53y^swN>l+)T(U-o1&<o2qFlDq8BZCoyNsRYbr?;d@Mmxyzl{h
zC~-E_HqgeK*`1x)Z~vK0zJETy0PJEb0TuHcBUs>A#F8}2(yU0cs$xw=jv?-~EH|$+
z%+?<6Zpsbedi7`9YYERXPfSy|?ja=|S+?aJGb|KBvx=7t(bLYgU`W<1Tbw`MH-*zM
znr%8s*E*)rzBC+5`rX5*e41gjYMYL@7q%xH2CZt_!Z~dlt}7_G9`;^7aElaj>km?8
zh!mt4el5COI_k&k!H9I~okzzMXO`4CGo=3QTjR;lkO0>(iYXO&4eQv@uqjOeMGYks
z8FC^03o2zuNm{vW*f-^i=B+S2hHS`1(q{NyAg}8O|My;2*vsAPI~9G`Z$}_rspwdt
z(HNmAVX2g?i*_+6RGbEeF@Jg#@&R7jdIKxHLwO-j!8qAC<$yAizLk596f(2|lbGrf
z_Gy)|MCldm1Cgsffcxli5|9i)5<SRt7$iCXNfRV96q4;hcDhPpABYVArV&Lp0EqQe
g%nSp>2LN*fm>&XAFiX`dm_wRYP8wAD>n5Q50*<Pzng9R*

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSyntheticAccess.class b/testData/classes/pkg/TestSyntheticAccess.class
new file mode 100644
index 0000000000000000000000000000000000000000..b4e05e6f7756eb78c64f7f349d51143b6b730da4
GIT binary patch
literal 1012
zcma)5+iuf95Iti%-ryQq0`y)eZCa8%5C>HiQV~*B2`N$p53MStPj#GCx+Qgx*G2G8
zyl@i|4}1V0g_yNdY9uUSX?JGVXU?3Nv48&h{sX`cS~uWe(`<DQ6>JG?3p^5N5UTrH
zt5GZyg5QnV9*je+r50!sX1Z~d$O{>#<~?a%U0#adK2xzupA+mx^O)cqOooy$+f%W8
zd3iCA$x%2M^G&TciNf)5m?(3eUOMTSVy>m$o7bcEk<{to`#3$5sfzZaNNT-D@WRZi
z2f<UqYNHg{WIfiqpct@wedq)`nL-9#5q3I%fu9i8%GtX)eWwr}aD>yyUU-L-%OsL7
zlqq!aA9XxF58sA9X5jm{X|`LKB`lOwO_($I_Bf13?N@_y8Ks2v5^()`Y@20}!tk)p
zv#;>CV8JtbGLI#(6}(s%I6Zr9w#2s5`Ud+WI~H#9?q-()HTL}+fIGMg%vEs@^L%51
zcR7g(_FMfguuh!QudqJwxs1cd!jxmNz+o3SoZ-oTb1Y$bs$+vQn#cPDa!&i7K}H1?
zD`DL$1-$(S-*<*3_*JY;`S)OF8ANNPT;6;R$xCE<f%~R)ocIAxBX3y17}GF!`ATG2
ct6b*Er}mKX7B*02TVv1VrVF;_@AhE*1|-<4;{X5v

literal 0
HcmV?d00001

diff --git a/testData/results/TestSyntheticAccess.dec b/testData/results/TestSyntheticAccess.dec
new file mode 100644
index 0000000..1f8a5d5
--- /dev/null
+++ b/testData/results/TestSyntheticAccess.dec
@@ -0,0 +1,85 @@
+package pkg;
+
+class TestSyntheticAccess {
+   private static int s;
+   private int i;
+
+   private class Assigner {
+      void assignI(int newValue) {
+         TestSyntheticAccess.this.i = newValue;// 32
+      }// 33
+
+      void assignS(int newValue) {
+         TestSyntheticAccess.s = newValue;// 36
+      }// 37
+   }
+
+   private class Incrementer {
+      void incrementI() {
+         TestSyntheticAccess.this.i++;// 14
+      }// 15
+
+      void decrementI() {
+         --TestSyntheticAccess.this.i;// 18
+      }// 19
+
+      void incrementS() {
+         ++TestSyntheticAccess.s;// 22 23
+      }
+
+      void decrementS() {
+         TestSyntheticAccess.s--;// 26
+      }// 27
+   }
+}
+
+class 'pkg/TestSyntheticAccess$Assigner' {
+   method 'assignI (I)V' {
+      3      8
+      9      9
+   }
+
+   method 'assignS (I)V' {
+      2      12
+      5      13
+   }
+}
+
+class 'pkg/TestSyntheticAccess$Incrementer' {
+   method 'incrementI ()V' {
+      2      18
+      7      18
+      8      19
+   }
+
+   method 'decrementI ()V' {
+      2      22
+      6      22
+      8      23
+   }
+
+   method 'incrementS ()V' {
+      0      26
+      4      26
+   }
+
+   method 'decrementS ()V' {
+      0      30
+      4      31
+      5      30
+   }
+}
+
+Lines mapping:
+14 <-> 19
+15 <-> 20
+18 <-> 23
+19 <-> 24
+22 <-> 27
+23 <-> 27
+26 <-> 31
+27 <-> 32
+32 <-> 9
+33 <-> 10
+36 <-> 13
+37 <-> 14
diff --git a/testData/src/pkg/TestSyntheticAccess.java b/testData/src/pkg/TestSyntheticAccess.java
new file mode 100644
index 0000000..0c4e3ea
--- /dev/null
+++ b/testData/src/pkg/TestSyntheticAccess.java
@@ -0,0 +1,44 @@
+package pkg;
+
+/**
+ * @author Alexandru-Constantin Bledea
+ * @since March 20, 2016
+ */
+class TestSyntheticAccess {
+
+  private static int s;
+  private int i;
+
+  private class Incrementer {
+    void orI() {
+      i|=1;
+    }
+
+    void incrementI() {
+      i++;
+    }
+
+    void decrementI() {
+      --i;
+    }
+
+    void incrementS() {
+      ++s;
+    }
+
+    void decrementS() {
+      s--;
+    }
+  }
+
+  private class Assigner {
+    void assignI(int newValue) {
+      i = newValue;
+    }
+
+    void assignS(int newValue) {
+      s = newValue;
+    }
+  }
+
+}

From 6b5cd853c0aae1c3b7b09ae8f4495dc43611d157 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 28 Mar 2016 13:59:38 +0300
Subject: [PATCH 043/252] replaced constants with enum

---
 .../main/rels/NestedMemberAccess.java         | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index 2ea32bd..e7e0f01 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -33,14 +33,10 @@ import java.util.*;
 
 public class NestedMemberAccess {
 
-  private static final int METHOD_ACCESS_NORMAL = 1;
-  private static final int METHOD_ACCESS_FIELD_GET = 2;
-  private static final int METHOD_ACCESS_FIELD_SET = 3;
-  private static final int METHOD_ACCESS_METHOD = 4;
-  private static final int METHOD_ACCESS_FUNCTION = 5;
+  private enum MethodAccess {NORMAL, FIELD_GET, FIELD_SET, METHOD, FUNCTION}
 
   private boolean noSynthFlag;
-  private final Map<MethodWrapper, Integer> mapMethodType = new HashMap<MethodWrapper, Integer>();
+  private final Map<MethodWrapper, MethodAccess> mapMethodType = new HashMap<MethodWrapper, MethodAccess>();
 
 
   public void propagateMemberAccess(ClassNode root) {
@@ -71,7 +67,7 @@ public class NestedMemberAccess {
   }
 
   private void computeMethodType(ClassNode node, MethodWrapper method) {
-    int type = METHOD_ACCESS_NORMAL;
+    MethodAccess type = MethodAccess.NORMAL;
 
     if (method.root != null) {
       DirectGraph graph = method.getOrBuildGraph();
@@ -102,7 +98,7 @@ public class NestedMemberAccess {
                   if (fexpr.getClassname().equals(node.classStruct.qualifiedName)) {  // FIXME: check for private flag of the field
                     if (fexpr.isStatic() ||
                         (fexpr.getInstance().type == Exprent.EXPRENT_VAR && ((VarExprent)fexpr.getInstance()).getIndex() == 0)) {
-                      type = METHOD_ACCESS_FIELD_GET;
+                      type = MethodAccess.FIELD_GET;
                     }
                   }
                 }
@@ -111,7 +107,7 @@ public class NestedMemberAccess {
                 if (parcount == 1) {
                   // this or final variable
                   if (((VarExprent)exprCore).getIndex() != 0) {
-                    type = METHOD_ACCESS_FIELD_GET;
+                    type = MethodAccess.FIELD_GET;
                   }
                 }
 
@@ -122,12 +118,12 @@ public class NestedMemberAccess {
                 if (functionExprent.getFuncType() >= FunctionExprent.FUNCTION_IMM &&
                     functionExprent.getFuncType() <= FunctionExprent.FUNCTION_PPI) {
                   if (functionExprent.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
-                    type = METHOD_ACCESS_FUNCTION;
+                    type = MethodAccess.FUNCTION;
                   }
                 }
                 break;
               case Exprent.EXPRENT_INVOCATION:
-                type = METHOD_ACCESS_METHOD;
+                type = MethodAccess.METHOD;
                 break;
               case Exprent.EXPRENT_ASSIGNMENT:
                 AssignmentExprent asexpr = (AssignmentExprent)exprCore;
@@ -139,7 +135,7 @@ public class NestedMemberAccess {
                       if (fexpras.isStatic() ||
                           (fexpras.getInstance().type == Exprent.EXPRENT_VAR && ((VarExprent)fexpras.getInstance()).getIndex() == 0)) {
                         if (((VarExprent)asexpr.getRight()).getIndex() == parcount - 1) {
-                          type = METHOD_ACCESS_FIELD_SET;
+                          type = MethodAccess.FIELD_SET;
                         }
                       }
                     }
@@ -147,9 +143,9 @@ public class NestedMemberAccess {
                 }
             }
 
-            if (type == METHOD_ACCESS_METHOD) { // FIXME: check for private flag of the method
+            if (type == MethodAccess.METHOD) { // FIXME: check for private flag of the method
 
-              type = METHOD_ACCESS_NORMAL;
+              type = MethodAccess.NORMAL;
 
               InvocationExprent invexpr = (InvocationExprent)exprCore;
 
@@ -169,7 +165,7 @@ public class NestedMemberAccess {
                 }
 
                 if (equalpars) {
-                  type = METHOD_ACCESS_METHOD;
+                  type = MethodAccess.METHOD;
                 }
               }
             }
@@ -198,7 +194,7 @@ public class NestedMemberAccess {
                         if (exexpr.getExitType() == ExitExprent.EXIT_RETURN && exexpr.getValue() != null) {
                           if (exexpr.getValue().type == Exprent.EXPRENT_VAR &&
                               ((VarExprent)asexpr.getRight()).getIndex() == parcount - 1) {
-                            type = METHOD_ACCESS_FIELD_SET;
+                            type = MethodAccess.FIELD_SET;
                           }
                         }
                       }
@@ -212,7 +208,7 @@ public class NestedMemberAccess {
       }
     }
 
-    if (type != METHOD_ACCESS_NORMAL) {
+    if (type != MethodAccess.NORMAL) {
       mapMethodType.put(method, type);
     }
     else {
@@ -349,10 +345,10 @@ public class NestedMemberAccess {
       return null;
     }
 
-    int type = mapMethodType.get(methsource);
+    MethodAccess type = mapMethodType.get(methsource);
 
-    //		// FIXME: impossible case. METHOD_ACCESS_NORMAL is not saved in the map
-    //		if(type == METHOD_ACCESS_NORMAL) {
+    //		// FIXME: impossible case. MethodAccess.NORMAL is not saved in the map
+    //		if(type == MethodAccess.NORMAL) {
     //			return null;
     //		}
 
@@ -366,7 +362,7 @@ public class NestedMemberAccess {
     Exprent retexprent = null;
 
     switch (type) {
-      case METHOD_ACCESS_FIELD_GET:
+      case FIELD_GET:
         ExitExprent exsource = (ExitExprent)source;
         if (exsource.getValue().type == Exprent.EXPRENT_VAR) { // qualified this
           VarExprent var = (VarExprent)exsource.getValue();
@@ -394,7 +390,7 @@ public class NestedMemberAccess {
           retexprent = ret;
         }
         break;
-      case METHOD_ACCESS_FIELD_SET:
+      case FIELD_SET:
         AssignmentExprent ret;
         if (source.type == Exprent.EXPRENT_EXIT) {
           ExitExprent extex = (ExitExprent)source;
@@ -414,10 +410,10 @@ public class NestedMemberAccess {
         }
         retexprent = ret;
         break;
-      case METHOD_ACCESS_FUNCTION:
+      case FUNCTION:
         retexprent = replaceFunction(invexpr, source);
         break;
-      case METHOD_ACCESS_METHOD:
+      case METHOD:
         if (source.type == Exprent.EXPRENT_EXIT) {
           source = ((ExitExprent)source).getValue();
         }

From 404783c874d5d3b209995f22a9bb8ac640bb35b9 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 29 Mar 2016 17:52:23 +0300
Subject: [PATCH 044/252] decompiler: Setup increment/decrement test properly
 #376

---
 .../pkg/TestSyntheticAccess$Assigner.class    | Bin 753 -> 599 bytes
 .../pkg/TestSyntheticAccess$Incrementer.class | Bin 928 -> 914 bytes
 .../classes/pkg/TestSyntheticAccess.class     | Bin 1012 -> 902 bytes
 testData/results/TestSyntheticAccess.dec      |  74 +++++++++++-------
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/testData/classes/pkg/TestSyntheticAccess$Assigner.class b/testData/classes/pkg/TestSyntheticAccess$Assigner.class
index c15e644dbe8e817ab9b3a02a21438b287b356ff2..4ebd715b0d13441e9e5adde75b14eeaf08bb901d 100644
GIT binary patch
delta 275
zcmey!dYwh()W2Q(7#J8#7!)}fSQ&)47}ywuxfnzkL_vfYJA*hogVaQo41V^+;^NHo
zJWoaj77b6$u*s~9)_l_J3^F_nvJ7%O4Dt*Lll>S~B{&?x%2JCM8F)PN@=}YObATFC
zizgQ{POVpBU;;u01}-h_tqhD>+ZmWP0(n4{K#~neGcYItF)srjkj)KbslnB6VPKTr
z!N44jP|pQ6Nri!vK^3TyAFf9Us25}h8&Ew9s(O&&8bD8K0u=}V*-Q+A43a>a3#f$^
J=vxT}CIJ5%A~yg4

delta 408
zcmZXQ%SyvQ6o&s9b1~EL(yDE>+9qu(S~m&>7X?9G1zbv8M+r6%A~cFipJC|Irw|my
zg%98h_#D1K@FYqUWZ*xSIsZ4q`OrRf_dR=k12Dv<1s$sb2G#^xSkGm{MB7A1x#RuX
z$<;*=`@tj%&g1Yj7Y6Nm9Hk7ihiMvJCgFrZdI`njI7riwZn|o>sWQtMF__e%A&*>J
z-nLJ!B)s*5_=Y&lQ}?5)ZNic0q9@^^&tR*)hRQ0_9-H0`!RY{Eu=4~qcm{u<ibIkb
zV5Du#k;)<$m`9Z=poS&tR46+t36Ef{7tEaf5=6naVZkXV_3yVziioj{l>%Kafd^FQ
jUor@${e!u*&Hf*lQNoNL7Dt2J98D}z6hzZ$<qP0nPD3@L

diff --git a/testData/classes/pkg/TestSyntheticAccess$Incrementer.class b/testData/classes/pkg/TestSyntheticAccess$Incrementer.class
index 631d4376fac9b9bd6e82deaa4223162f527b7883..d446c62ee10cfbbb1947afdba7c8b76961f555de 100644
GIT binary patch
literal 914
zcmaKrT`vPc6o%i~R;y!C_5E42Xp43$A`&7IiKK~eQQ>;Kov_qac9+DRza$|V7k+>r
zCC(|TQtM*R&Y5}Mb7tP1eS3d-1+Weyh8V^rBqk&#F~wn;!wiQchglADQOrlNAQ17-
zZ7*#Ij2~QIo)wOj=a=ss|6KXDwQE_*^R@`uwjJBw5tzyZQrQ!M@Ls*D1o{tbM;+c=
zRg`;dR%$d8s=FnM8HS|oSgyKKj!#pvs@js)O1XW7lXCsWwbZ`N#m4^FWd6duHFfkr
z*U^ha6pK2RkkOGvPRBBjRyeF8ucLsxKq}z4>C*T1lq=BlE7MDkqujlk>3PZ%h;!3I
z&2-KRN0kd@`2wQ>Rp|(3)6KMDklFwF$gZ^5HG%11&r8`~@MgPm<0mN^>rM09;9}9h
zEL{~zw?@R{Y#fau(8#?$&?ls9o-&QzGPnE$k$Z;rz%=4bQcz^g01{t(9w8b5iQFUM
z^fV9(-!~9G{n5#0#XeGThryP1ft0L`ed@Y8BnfmA4h#iJA{~+ul8lmMxFwnU>eAIf
kv;&_&n0^dk<S)Ft1D_#0NvGis8pe>Ox1{<pDw2Zs0gt||8vp<R

literal 928
zcmaKr+e*Vg5QhIv53y^swN>l+)T(U-o1&<o2qFlDq8BZCoyNsRYbr?;d@Mmxyzl{h
zC~-E_HqgeK*`1x)Z~vK0zJETy0PJEb0TuHcBUs>A#F8}2(yU0cs$xw=jv?-~EH|$+
z%+?<6Zpsbedi7`9YYERXPfSy|?ja=|S+?aJGb|KBvx=7t(bLYgU`W<1Tbw`MH-*zM
znr%8s*E*)rzBC+5`rX5*e41gjYMYL@7q%xH2CZt_!Z~dlt}7_G9`;^7aElaj>km?8
zh!mt4el5COI_k&k!H9I~okzzMXO`4CGo=3QTjR;lkO0>(iYXO&4eQv@uqjOeMGYks
z8FC^03o2zuNm{vW*f-^i=B+S2hHS`1(q{NyAg}8O|My;2*vsAPI~9G`Z$}_rspwdt
z(HNmAVX2g?i*_+6RGbEeF@Jg#@&R7jdIKxHLwO-j!8qAC<$yAizLk596f(2|lbGrf
z_Gy)|MCldm1Cgsffcxli5|9i)5<SRt7$iCXNfRV96q4;hcDhPpABYVArV&Lp0EqQe
g%nSp>2LN*fm>&XAFiX`dm_wRYP8wAD>n5Q50*<Pzng9R*

diff --git a/testData/classes/pkg/TestSyntheticAccess.class b/testData/classes/pkg/TestSyntheticAccess.class
index b4e05e6f7756eb78c64f7f349d51143b6b730da4..364ce33cc273afe5ce79423d7b774011bd7b804a 100644
GIT binary patch
delta 406
zcmeyu-o|c!>ff$?3=9k=3~HPVEDZ7>LV=5cl|hl6L5ZC~nVms}k%7apxHvOCFSUq~
zfyXlsNIT~w78j=$vookpw0Gg>N=!~pEiP6uFfd?bkkOd9K$1z*bFw(2J~u+fV&W_F
z$-#`5>N$Xx@iFi-Ffs@LS+YQy5lFLYZD(NK2xKra2m(nqupqkt2ZIoUFp!O^bPEI1
z8Z1gh7(}5;<r$b6n1CwSwWOoAqAC^!*#<IL3~sQ><U%HKS9FWT5%NIOK)QIeB7ruu
zq@WuKGf{#;a`HzeU1ljDt;novEX^PTb&nj-H6T@NQjwb(7%|)ql$8a_GBL<azQZg5
E0Ejp-UH||9

literal 1012
zcma)5+iuf95Iti%-ryQq0`y)eZCa8%5C>HiQV~*B2`N$p53MStPj#GCx+Qgx*G2G8
zyl@i|4}1V0g_yNdY9uUSX?JGVXU?3Nv48&h{sX`cS~uWe(`<DQ6>JG?3p^5N5UTrH
zt5GZyg5QnV9*je+r50!sX1Z~d$O{>#<~?a%U0#adK2xzupA+mx^O)cqOooy$+f%W8
zd3iCA$x%2M^G&TciNf)5m?(3eUOMTSVy>m$o7bcEk<{to`#3$5sfzZaNNT-D@WRZi
z2f<UqYNHg{WIfiqpct@wedq)`nL-9#5q3I%fu9i8%GtX)eWwr}aD>yyUU-L-%OsL7
zlqq!aA9XxF58sA9X5jm{X|`LKB`lOwO_($I_Bf13?N@_y8Ks2v5^()`Y@20}!tk)p
zv#;>CV8JtbGLI#(6}(s%I6Zr9w#2s5`Ud+WI~H#9?q-()HTL}+fIGMg%vEs@^L%51
zcR7g(_FMfguuh!QudqJwxs1cd!jxmNz+o3SoZ-oTb1Y$bs$+vQn#cPDa!&i7K}H1?
zD`DL$1-$(S-*<*3_*JY;`S)OF8ANNPT;6;R$xCE<f%~R)ocIAxBX3y17}GF!`ATG2
ct6b*Er}mKX7B*02TVv1VrVF;_@AhE*1|-<4;{X5v

diff --git a/testData/results/TestSyntheticAccess.dec b/testData/results/TestSyntheticAccess.dec
index 1f8a5d5..ef400d7 100644
--- a/testData/results/TestSyntheticAccess.dec
+++ b/testData/results/TestSyntheticAccess.dec
@@ -5,31 +5,35 @@ class TestSyntheticAccess {
    private int i;
 
    private class Assigner {
-      void assignI(int newValue) {
-         TestSyntheticAccess.this.i = newValue;// 32
-      }// 33
-
-      void assignS(int newValue) {
-         TestSyntheticAccess.s = newValue;// 36
+      void assignI(int var1) {
+         TestSyntheticAccess.this.i = var1;// 36
       }// 37
+
+      void assignS(int var1) {
+         TestSyntheticAccess.s = var1;// 40
+      }// 41
    }
 
    private class Incrementer {
-      void incrementI() {
-         TestSyntheticAccess.this.i++;// 14
+      void orI() {
+         TestSyntheticAccess.this.i = TestSyntheticAccess.this.i | 1;// 14
       }// 15
 
-      void decrementI() {
-         --TestSyntheticAccess.this.i;// 18
+      void incrementI() {
+         TestSyntheticAccess.this.i++;// 18
       }// 19
 
+      void decrementI() {
+         --TestSyntheticAccess.this.i;// 22
+      }// 23
+
       void incrementS() {
-         ++TestSyntheticAccess.s;// 22 23
+         ++TestSyntheticAccess.s;// 26 27
       }
 
       void decrementS() {
-         TestSyntheticAccess.s--;// 26
-      }// 27
+         TestSyntheticAccess.s--;// 30
+      }// 31
    }
 }
 
@@ -46,27 +50,35 @@ class 'pkg/TestSyntheticAccess$Assigner' {
 }
 
 class 'pkg/TestSyntheticAccess$Incrementer' {
-   method 'incrementI ()V' {
-      2      18
-      7      18
-      8      19
+   method 'orI ()V' {
+      1      18
+      3      18
+      b      18
+      c      18
+      11      19
    }
 
-   method 'decrementI ()V' {
+   method 'incrementI ()V' {
       2      22
-      6      22
+      7      22
       8      23
    }
 
+   method 'decrementI ()V' {
+      2      26
+      6      26
+      8      27
+   }
+
    method 'incrementS ()V' {
-      0      26
-      4      26
+      0      30
+      4      30
    }
 
    method 'decrementS ()V' {
-      0      30
-      4      31
-      5      30
+      0      34
+      4      35
+      5      34
    }
 }
 
@@ -76,10 +88,12 @@ Lines mapping:
 18 <-> 23
 19 <-> 24
 22 <-> 27
-23 <-> 27
+23 <-> 28
 26 <-> 31
-27 <-> 32
-32 <-> 9
-33 <-> 10
-36 <-> 13
-37 <-> 14
+27 <-> 31
+30 <-> 35
+31 <-> 36
+36 <-> 9
+37 <-> 10
+40 <-> 13
+41 <-> 14

From a57e42690be6cfc95cd462087f263fe64e76f357 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 11 Apr 2016 20:32:26 +0200
Subject: [PATCH 045/252] Cleanup (duplicates extracted; formatting; typos)

---
 .../java/decompiler/main/EnumProcessor.java   |  59 +-----
 .../decompiler/main/InitializerProcessor.java | 187 ++++++------------
 .../modules/decompiler/stats/Statements.java  |  60 ++++++
 .../java/decompiler/util/StructUtils.java     |  14 +-
 4 files changed, 134 insertions(+), 186 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java

diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
index 37a3384..7e83fe9 100644
--- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,14 @@ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statements;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 public class EnumProcessor {
-
   public static void clearEnum(ClassWrapper wrapper) {
     StructClass cl = wrapper.getClassStruct();
 
@@ -50,12 +48,12 @@ public class EnumProcessor {
         }
       }
       else if (CodeConstants.INIT_NAME.equals(name)) {
-        Statement firstData = findFirstData(method.root);
+        Statement firstData = Statements.findFirstData(method.root);
         if (firstData != null && !firstData.getExprents().isEmpty()) {
           Exprent exprent = firstData.getExprents().get(0);
           if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-            InvocationExprent invexpr = (InvocationExprent)exprent;
-            if (isInvocationSuperConstructor(invexpr, method, wrapper)) {
+            InvocationExprent invExpr = (InvocationExprent)exprent;
+            if (Statements.isInvocationInitConstructor(invExpr, method, wrapper, false)) {
               firstData.getExprents().remove(0);
             }
           }
@@ -71,49 +69,4 @@ public class EnumProcessor {
       }
     }
   }
-
-  // FIXME: move to a util class (see also InitializerProcessor)
-  private static Statement findFirstData(Statement stat) {
-
-    if (stat.getExprents() != null) {
-      return stat;
-    }
-    else {
-      if (stat.isLabeled()) {
-        return null;
-      }
-
-      switch (stat.type) {
-        case Statement.TYPE_SEQUENCE:
-        case Statement.TYPE_IF:
-        case Statement.TYPE_ROOT:
-        case Statement.TYPE_SWITCH:
-        case Statement.TYPE_SYNCRONIZED:
-          return findFirstData(stat.getFirst());
-        default:
-          return null;
-      }
-    }
-  }
-
-  // FIXME: move to util class (see also InitializerProcessor)
-  private static boolean isInvocationSuperConstructor(InvocationExprent inv, MethodWrapper meth, ClassWrapper wrapper) {
-
-    if (inv.getFunctype() == InvocationExprent.TYP_INIT) {
-      if (inv.getInstance().type == Exprent.EXPRENT_VAR) {
-        VarExprent instvar = (VarExprent)inv.getInstance();
-        VarVersionPair varpaar = new VarVersionPair(instvar);
-
-        String classname = meth.varproc.getThisVars().get(varpaar);
-
-        if (classname != null) { // any this instance. TODO: Restrict to current class?
-          if (!wrapper.getClassStruct().qualifiedName.equals(inv.getClassname())) {
-            return true;
-          }
-        }
-      }
-    }
-
-    return false;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index e1363d8..fe1a4f7 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statements;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructField;
@@ -31,14 +32,11 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-
 public class InitializerProcessor {
-
   public static void extractInitializers(ClassWrapper wrapper) {
-
-    MethodWrapper meth = wrapper.getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
-    if (meth != null && meth.root != null) {  // successfully decompiled static constructor
-      extractStaticInitializers(wrapper, meth);
+    MethodWrapper method = wrapper.getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
+    if (method != null && method.root != null) {  // successfully decompiled static constructor
+      extractStaticInitializers(wrapper, method);
     }
 
     extractDynamicInitializers(wrapper);
@@ -52,30 +50,26 @@ public class InitializerProcessor {
     }
   }
 
-
   private static void liftConstructor(ClassWrapper wrapper) {
-
-    for (MethodWrapper meth : wrapper.getMethods()) {
-      if (CodeConstants.INIT_NAME.equals(meth.methodStruct.getName()) && meth.root != null) {
-        Statement firstdata = findFirstData(meth.root);
-        if (firstdata == null) {
+    for (MethodWrapper method : wrapper.getMethods()) {
+      if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) {
+        Statement firstData = Statements.findFirstData(method.root);
+        if (firstData == null) {
           return;
         }
 
-
         int index = 0;
-        List<Exprent> lstExprents = firstdata.getExprents();
+        List<Exprent> lstExprents = firstData.getExprents();
 
         for (Exprent exprent : lstExprents) {
-
           int action = 0;
 
           if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-            AssignmentExprent asexpr = (AssignmentExprent)exprent;
-            if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD && asexpr.getRight().type == Exprent.EXPRENT_VAR) {
-              FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-              if (fexpr.getClassname().equals(wrapper.getClassStruct().qualifiedName)) {
-                StructField structField = wrapper.getClassStruct().getField(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+            AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+            if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD && assignExpr.getRight().type == Exprent.EXPRENT_VAR) {
+              FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+              if (fExpr.getClassname().equals(wrapper.getClassStruct().qualifiedName)) {
+                StructField structField = wrapper.getClassStruct().getField(fExpr.getName(), fExpr.getDescriptor().descriptorString);
                 if (structField != null && structField.hasModifier(CodeConstants.ACC_FINAL)) {
                   action = 1;
                 }
@@ -83,7 +77,7 @@ public class InitializerProcessor {
             }
           }
           else if (index > 0 && exprent.type == Exprent.EXPRENT_INVOCATION &&
-                   isInvocationInitConstructor((InvocationExprent)exprent, meth, wrapper, true)) {
+                   Statements.isInvocationInitConstructor((InvocationExprent)exprent, method, wrapper, true)) {
             // this() or super()
             lstExprents.add(0, lstExprents.remove(index));
             action = 2;
@@ -99,53 +93,50 @@ public class InitializerProcessor {
     }
   }
 
-
   private static void hideEmptySuper(ClassWrapper wrapper) {
-
-    for (MethodWrapper meth : wrapper.getMethods()) {
-      if (CodeConstants.INIT_NAME.equals(meth.methodStruct.getName()) && meth.root != null) {
-        Statement firstdata = findFirstData(meth.root);
-        if (firstdata == null || firstdata.getExprents().isEmpty()) {
+    for (MethodWrapper method : wrapper.getMethods()) {
+      if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) {
+        Statement firstData = Statements.findFirstData(method.root);
+        if (firstData == null || firstData.getExprents().isEmpty()) {
           return;
         }
 
-        Exprent exprent = firstdata.getExprents().get(0);
+        Exprent exprent = firstData.getExprents().get(0);
         if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-          InvocationExprent invexpr = (InvocationExprent)exprent;
-          if (isInvocationInitConstructor(invexpr, meth, wrapper, false) && invexpr.getLstParameters().isEmpty()) {
-            firstdata.getExprents().remove(0);
+          InvocationExprent invExpr = (InvocationExprent)exprent;
+          if (Statements.isInvocationInitConstructor(invExpr, method, wrapper, false) && invExpr.getLstParameters().isEmpty()) {
+            firstData.getExprents().remove(0);
           }
         }
       }
     }
   }
 
-  private static void extractStaticInitializers(ClassWrapper wrapper, MethodWrapper meth) {
-
-    RootStatement root = meth.root;
+  private static void extractStaticInitializers(ClassWrapper wrapper, MethodWrapper method) {
+    RootStatement root = method.root;
     StructClass cl = wrapper.getClassStruct();
-    boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
-    Statement firstdata = findFirstData(root);
-    if (firstdata != null) {
-      while (!firstdata.getExprents().isEmpty()) {
-        Exprent exprent = firstdata.getExprents().get(0);
+    Statement firstData = Statements.findFirstData(root);
+    if (firstData != null) {
+      boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
+      while (!firstData.getExprents().isEmpty()) {
+        Exprent exprent = firstData.getExprents().get(0);
 
         boolean found = false;
 
         if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-          AssignmentExprent asexpr = (AssignmentExprent)exprent;
-          if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-            FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-            if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
-                cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
+          AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+          if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+            FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+            if (fExpr.isStatic() && fExpr.getClassname().equals(cl.qualifiedName) &&
+                cl.hasField(fExpr.getName(), fExpr.getDescriptor().descriptorString)) {
 
               // interfaces fields should always be initialized inline
-              if (isInterface || isExprentIndependent(asexpr.getRight(), meth)) {
+              if (isInterface || isExprentIndependent(assignExpr.getRight(), method)) {
 
-                String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+                String keyField = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
-                  wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField);
-                  firstdata.getExprents().remove(0);
+                  wrapper.getStaticFieldInitializers().addWithKey(assignExpr.getRight(), keyField);
+                  firstData.getExprents().remove(0);
                   found = true;
                 }
               }
@@ -161,27 +152,26 @@ public class InitializerProcessor {
   }
 
   private static void extractDynamicInitializers(ClassWrapper wrapper) {
-
     StructClass cl = wrapper.getClassStruct();
 
     boolean isAnonymous = DecompilerContext.getClassProcessor().getMapRootClasses().get(cl.qualifiedName).type == ClassNode.CLASS_ANONYMOUS;
 
     List<List<Exprent>> lstFirst = new ArrayList<List<Exprent>>();
-    List<MethodWrapper> lstMethWrappers = new ArrayList<MethodWrapper>();
+    List<MethodWrapper> lstMethodWrappers = new ArrayList<MethodWrapper>();
 
-    for (MethodWrapper meth : wrapper.getMethods()) {
-      if (CodeConstants.INIT_NAME.equals(meth.methodStruct.getName()) && meth.root != null) { // successfully decompiled constructor
-        Statement firstdata = findFirstData(meth.root);
-        if (firstdata == null || firstdata.getExprents().isEmpty()) {
+    for (MethodWrapper method : wrapper.getMethods()) {
+      if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) { // successfully decompiled constructor
+        Statement firstData = Statements.findFirstData(method.root);
+        if (firstData == null || firstData.getExprents().isEmpty()) {
           return;
         }
-        lstFirst.add(firstdata.getExprents());
-        lstMethWrappers.add(meth);
+        lstFirst.add(firstData.getExprents());
+        lstMethodWrappers.add(method);
 
-        Exprent exprent = firstdata.getExprents().get(0);
+        Exprent exprent = firstData.getExprents().get(0);
         if (!isAnonymous) { // FIXME: doesn't make sense
           if (exprent.type != Exprent.EXPRENT_INVOCATION ||
-              !isInvocationInitConstructor((InvocationExprent)exprent, meth, wrapper, false)) {
+              !Statements.isInvocationInitConstructor((InvocationExprent)exprent, method, wrapper, false)) {
             return;
           }
         }
@@ -193,12 +183,10 @@ public class InitializerProcessor {
     }
 
     while (true) {
-
       String fieldWithDescr = null;
       Exprent value = null;
 
       for (int i = 0; i < lstFirst.size(); i++) {
-
         List<Exprent> lst = lstFirst.get(i);
 
         if (lst.size() < (isAnonymous ? 1 : 2)) {
@@ -210,22 +198,21 @@ public class InitializerProcessor {
         boolean found = false;
 
         if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-          AssignmentExprent asexpr = (AssignmentExprent)exprent;
-          if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-            FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-            if (!fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
-                cl.hasField(fexpr.getName(), fexpr
-                  .getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
+          AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+          if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+            FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+            if (!fExpr.isStatic() && fExpr.getClassname().equals(cl.qualifiedName) &&
+                cl.hasField(fExpr.getName(), fExpr.getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
 
-              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i))) {
-                String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+              if (isExprentIndependent(assignExpr.getRight(), lstMethodWrappers.get(i))) {
+                String fieldKey = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
                 if (fieldWithDescr == null) {
                   fieldWithDescr = fieldKey;
-                  value = asexpr.getRight();
+                  value = assignExpr.getRight();
                 }
                 else {
                   if (!fieldWithDescr.equals(fieldKey) ||
-                      !value.equals(asexpr.getRight())) {
+                      !value.equals(assignExpr.getRight())) {
                     return;
                   }
                 }
@@ -253,19 +240,17 @@ public class InitializerProcessor {
     }
   }
 
-  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth) {
-
+  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper method) {
     List<Exprent> lst = exprent.getAllExprents(true);
     lst.add(exprent);
 
     for (Exprent expr : lst) {
       switch (expr.type) {
         case Exprent.EXPRENT_VAR:
-          VarVersionPair varpaar = new VarVersionPair((VarExprent)expr);
-          if (!meth.varproc.getExternalVars().contains(varpaar)) {
-            String varname = meth.varproc.getVarName(varpaar);
-
-            if (!varname.equals("this") && !varname.endsWith(".this")) { // FIXME: remove direct comparison with strings
+          VarVersionPair varPair = new VarVersionPair((VarExprent)expr);
+          if (!method.varproc.getExternalVars().contains(varPair)) {
+            String varName = method.varproc.getVarName(varPair);
+            if (!varName.equals("this") && !varName.endsWith(".this")) { // FIXME: remove direct comparison with strings
               return false;
             }
           }
@@ -277,48 +262,4 @@ public class InitializerProcessor {
 
     return true;
   }
-
-
-  private static Statement findFirstData(Statement stat) {
-
-    if (stat.getExprents() != null) {
-      return stat;
-    }
-    else {
-      if (stat.isLabeled()) { // FIXME: Why??
-        return null;
-      }
-
-      switch (stat.type) {
-        case Statement.TYPE_SEQUENCE:
-        case Statement.TYPE_IF:
-        case Statement.TYPE_ROOT:
-        case Statement.TYPE_SWITCH:
-        case Statement.TYPE_SYNCRONIZED:
-          return findFirstData(stat.getFirst());
-        default:
-          return null;
-      }
-    }
-  }
-
-  private static boolean isInvocationInitConstructor(InvocationExprent inv, MethodWrapper meth, ClassWrapper wrapper, boolean withThis) {
-
-    if (inv.getFunctype() == InvocationExprent.TYP_INIT) {
-      if (inv.getInstance().type == Exprent.EXPRENT_VAR) {
-        VarExprent instvar = (VarExprent)inv.getInstance();
-        VarVersionPair varpaar = new VarVersionPair(instvar);
-
-        String classname = meth.varproc.getThisVars().get(varpaar);
-
-        if (classname != null) { // any this instance. TODO: Restrict to current class?
-          if (withThis || !wrapper.getClassStruct().qualifiedName.equals(inv.getClassname())) {
-            return true;
-          }
-        }
-      }
-    }
-
-    return false;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
new file mode 100644
index 0000000..52b7eda
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.java.decompiler.modules.decompiler.stats;
+
+import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+
+public class Statements {
+  public static Statement findFirstData(Statement stat) {
+    if (stat.getExprents() != null) {
+      return stat;
+    }
+    else if (stat.isLabeled()) { // FIXME: Why??
+      return null;
+    }
+
+    switch (stat.type) {
+      case Statement.TYPE_SEQUENCE:
+      case Statement.TYPE_IF:
+      case Statement.TYPE_ROOT:
+      case Statement.TYPE_SWITCH:
+      case Statement.TYPE_SYNCRONIZED:
+        return findFirstData(stat.getFirst());
+      default:
+        return null;
+    }
+  }
+
+  public static boolean isInvocationInitConstructor(InvocationExprent inv, MethodWrapper method, ClassWrapper wrapper, boolean withThis) {
+    if (inv.getFunctype() == InvocationExprent.TYP_INIT && inv.getInstance().type == Exprent.EXPRENT_VAR) {
+      VarExprent instVar = (VarExprent)inv.getInstance();
+      VarVersionPair varPair = new VarVersionPair(instVar);
+      String classname = method.varproc.getThisVars().get(varPair);
+      if (classname != null) { // any this instance. TODO: Restrict to current class?
+        if (withThis || !wrapper.getClassStruct().qualifiedName.equals(inv.getClassname())) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/StructUtils.java b/src/org/jetbrains/java/decompiler/util/StructUtils.java
index d7dad68..1d4042e 100644
--- a/src/org/jetbrains/java/decompiler/util/StructUtils.java
+++ b/src/org/jetbrains/java/decompiler/util/StructUtils.java
@@ -33,19 +33,14 @@ import static org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute.A
  * @since March 07, 2016
  */
 public final class StructUtils {
-
-  private StructUtils() {
-  }
+  private StructUtils() { }
 
   /**
    * @return the local variables of the current method
    */
   public static List<String> getCurrentMethodLocalVariableNames() {
     final MethodWrapper method = (MethodWrapper) DecompilerContext.getProperty(CURRENT_METHOD_WRAPPER);
-    if (null == method) {
-      return Collections.emptyList();
-    }
-    return getLocalVariables(method.methodStruct);
+    return method == null ? Collections.emptyList() : getLocalVariables(method.methodStruct);
   }
 
   /**
@@ -56,10 +51,9 @@ public final class StructUtils {
     final VBStyleCollection<StructGeneralAttribute, String> methodStruct = structMember.getAttributes();
     final StructGeneralAttribute generalAttribute = methodStruct.getWithKey(ATTRIBUTE_LOCAL_VARIABLE_TABLE);
     if (generalAttribute instanceof StructLocalVariableTableAttribute) {
-      final StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute) generalAttribute;
+      final StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)generalAttribute;
       return Collections.unmodifiableList(new ArrayList<>(table.getMapVarNames().values()));
     }
     return Collections.emptyList();
   }
-
-}
+}
\ No newline at end of file

From 1ac2304d60323d5ff439fe058f35825bafb366aa Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 11 Apr 2016 21:42:48 +0200
Subject: [PATCH 046/252] [java-decompiler] fixes enum constant initializer
 decompilation (IDEA-154547)

---
 .../decompiler/main/InitializerProcessor.java |   6 ++--
 testData/classes/pkg/TestEnum$2.class         | Bin 428 -> 506 bytes
 testData/classes/pkg/TestEnum$Type.class      | Bin 0 -> 871 bytes
 testData/classes/pkg/TestEnum.class           | Bin 1491 -> 1652 bytes
 testData/results/TestEnum.dec                 |  28 +++++++++++-------
 testData/src/pkg/TestEnum.java                |  10 ++++---
 6 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 testData/classes/pkg/TestEnum$Type.class

diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index fe1a4f7..206b669 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -117,7 +117,8 @@ public class InitializerProcessor {
     StructClass cl = wrapper.getClassStruct();
     Statement firstData = Statements.findFirstData(root);
     if (firstData != null) {
-      boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
+      boolean inlineInitializers = cl.hasModifier(CodeConstants.ACC_INTERFACE) || cl.hasModifier(CodeConstants.ACC_ENUM);
+
       while (!firstData.getExprents().isEmpty()) {
         Exprent exprent = firstData.getExprents().get(0);
 
@@ -131,8 +132,7 @@ public class InitializerProcessor {
                 cl.hasField(fExpr.getName(), fExpr.getDescriptor().descriptorString)) {
 
               // interfaces fields should always be initialized inline
-              if (isInterface || isExprentIndependent(assignExpr.getRight(), method)) {
-
+              if (inlineInitializers || isExprentIndependent(assignExpr.getRight(), method)) {
                 String keyField = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
                   wrapper.getStaticFieldInitializers().addWithKey(assignExpr.getRight(), keyField);
diff --git a/testData/classes/pkg/TestEnum$2.class b/testData/classes/pkg/TestEnum$2.class
index 99faf412adc5a16866dfbb7efba6b1040bcddadd..3dedba7752417dc953984d6750c47d95d9ff7410 100644
GIT binary patch
delta 272
zcmZ3({EOM@)W2Q(7#J8#7{s|4m>C4v83frGgcupvY%=pQOYGPggc%uFLMjVV85wvy
z^YT)QoO2S3i&Kjk8LTHNs!jaO2bP@Z7Re|&ae;_hL3X-+NNRD3YhGzCBZD9^R|RAW
zJA)V_gEz9yU#9gO42%q%KsP8euraU#X>KiT8C^*h#_bG@8-ZL#1}-4U2BaAnB!MJ1
z0}oV#Bv=-x0$rIj&?~$^NhSt927VyT0^~C=umiCaki`nbYz|UDSs-xW;9wAeFaRi(
BESvxU

delta 232
zcmeyxyoOov)W2Q(7#J8#7(}=jm>GE48Ti;41Q;3EY%=pQOY9gKG$vZ9O)QQu6JliG
zE67gQ4@oU9am_2uRWV{@;PK4MOD%HFNh~f-Ee3Lt<=Gj885t}lTA57tWmKzWWdIrp
zv__GEm4O9Fb82bJ=rV3+VB84gFfy<MNj4zOz#s`EIT$#h$|b?FKo#i9q=9bb0!lJ5
da5L}#X%--#fq@^0g@9sAK$^jUgFz5N0|2Q`AZq{s

diff --git a/testData/classes/pkg/TestEnum$Type.class b/testData/classes/pkg/TestEnum$Type.class
new file mode 100644
index 0000000000000000000000000000000000000000..1e27737076d4e4680d1239e46a3aed67e3e065a4
GIT binary patch
literal 871
zcmZuv-%ry}6#i~|w|1q2{Ze5fC=O|dZanDI7BT}PAz9c%#}eXGH_B2h9obqE|0^Ad
z7>$N!|0v_RMX{#4P43A#=R4>7&guR6>+25yud$N>$A*UIs3<5Zc%ebZmbeTRS&fp0
zK$t4>!d4Y*GsxZjeFon9aOp7UhraJj_B?w!b*2o(&gJ`2z2{7WwjW+p1g1gQcE5eZ
zpj7&AJI8H{q4aJpE`4Qtp=k5aFy|xq-uRSQmpZQR9EBGHXVS9=9z~R>w0p*|WpvK%
zE4%L5{-|yR6W1R#%=vUp*LQ<mL6<B!H2Vx0%N_Z45Kf3eHbg{i4!u8Bo3SD>ZF3IE
zE={jl<8U%`4qTx#`*$}rAyP*{ti7n?C0;40G2|2b)3J=YjxrwW$RejBj~v6|zZnHL
zLu%-aeIh6sW=vOiaPABP5~0WYGQ5dT9R0mUtm=Mi|C2OYJM;*2dO31yMQ8!Yk{lpc
z7L!nhBZCqifR;+$23c{m8Q5n?w~#-Q$MA^mbd*~o{4!SV@lq7k3cUISsax<QUJ|Q-
z6!l++Odp_Bw^whF{*-9GN)ZW9pkj^gJ5dKDQk>d1@RNcf-$1=aCUP_$ISZ-pl#*xk
i|4;Y~3)VGQvbT)8?(29;-6TB25?PH{I5x4^D*py=Ft1_&

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestEnum.class b/testData/classes/pkg/TestEnum.class
index 01c608244d3bbc45b24058733d9c66c7ab99a89f..036f3e623b9467f49e9ec677abc19ea8c9156cb2 100644
GIT binary patch
literal 1652
zcmZ`(>r&HD5dKatNg9JdfJ!S0)T%8PD+1n%P=u<LN|i#j<BT(*Mkd;(Oq)963-~<R
zj^fDZ_}hna+;du?H}hjR+5L9++dX^o`_K2E0G9AVg@k)ttolf-sYqa5##I^jRh-9$
zf=#Z4GpS&bgC59us9;*fK-2z6K}bQ$hY399{w*141(y^&;ihdBW4Ood85vJyJY(?e
zemFE4w3Ka|m5riNt(sK^S8{>jZ2IusL2TEoI!U`$igW7?E*801VqgT+({GLUMyzPq
z2eGVEvFroF$>H33dM}w}7<}2CLwau%YrMp8B--QjY?NOUnZdMWo7=V0zFFBd_KReZ
zMO5YuLnzW)G1^^(l^EQSXpTWzv24p(W$^cjOL2rRYaQ5zQ>##!ct22Yy^eBWKEOE7
z6zLQFA82T&W;<5N%vn{78hmP0jFRb?m37-LJBDMGZJLn3t@5UMSTPHRW4@;OUg=XP
z)mdplFxu)1>^ZT{P|;7PshLe#DHL1NoNA-Smt&;^A73SsYPMXf6wC(}Kfi&0TXc;V
z*Ki$+Tr6m~!uR{Ch8@tlXzdH9VGg^rWosJ3xU69kQ?!%qh%m)Zb1R$Iu!o$6P%nm7
zmd$E-&fS-U`?P;foi?!}XY)RI3&pZc#7861wpKIyZ_R>3%`LYNR@|C+8?1E^+9O*x
z$er2TWEkm~R&#;qCMI*q?Zh-)&hzv;kP-pjF+iGn6q>pdn%V&1;$s1Zf_#Sbt-yx}
zqF|VzuMlbesCBr%!t)E>PxQqwOHvX(o$zy*Kf$|%Rn?`LZ;*dM>cul$L#%}lh-{Sc
zb646aB1R`mvPr`WHzCxS*$G`?N4@wkZjj$aiFw>2p?O@Gw3oC-aYyjY%zuH}UFmWw
zatX_X^l|<-=><ceM7LTzCn=GKjIv1N>dv7H@a+~jL^UM>bGGvVPan2Ajrq>W5Izbt
z@ah;+UO(eLf~x`T7z26zEJY7CFeE&~UR|$agz_~odW^BW?w9m)b&MY&&_GcBLE-K?
zv~1o}$51x!tz$Hsm+A;+8*ra;_KTT}(9eDpL5$P!1+WU8T5QhnF5<-Ag%w;R9VGh%
RF}#on(r=%hghG)*{{<v4Oc4M8

literal 1491
zcmZux?NbtQ5Pp8V+#T1MdLoJMA{A&#_);3Am|{_+O_&qYrxP#c3=RhlKldjUOwr`j
z__;r-X@4i_3GiW;+kJNT*_XRNe}Dc4u!21q0@k^B;v<oek;GFGvm!QR1hFY0#kK9+
zk}$?W&qQoXn2^zTY2T4BDIv{WyCR-Tn3C{9h9B$Plo9cgLCKh=UfnKfwVGaIaHZo6
zx3j08im?N|W~I$~Il-+<Tr6|3!oUcqW>2&;EmqRZVk~D>4YNo%F?_g{eV5KL^nd8g
zA)INYIxjI8iFP?X+m&OTqOyjm@72pkdi6j%Dv?FBqxL^Cgd*J)qn$-qnZX^29x@0?
z!!)c7hCq+F3`h8KM$y!)dX>sVdVzY>qp;x~P@XRIwr*NRSwA#t22p>bRkgBi>D4XM
ztXP_5R7~nU;K;e7pH}sPX6eT?xqCgbW^QyBjwg7TwVuGPUGxf-l7&)xDANuee8<Tf
z_{0V=l5>@MwV>}Bd<}j7k71ElQt$vVE*2Do_({$xc!ew-lk;vAMDUu9WmCa4W)zHJ
zoKDM$2*(vna4VxklihAQIySFh%Jy8h$O$ue3#E!l)cldCqnZ7q6TM&&{Z;3j?DI}I
zVC{=_M%t&InxPjXNH3s}3Ua~#X`*OrVrXmPLkJh|3K$sWBcNvqK7?@>v`cylk>)?S
z0rz)!F5vw_PYm}-3bs!rd<4-eyvw%AsxbEh;su0mJi{F3+j!2AS72W|(oPaFS`0}}
zV+J0$N&DvJ$5pA-4G&?F+%C$?!(s&HVPVo9(h7yOD0tx;<jz8~?Z}6S6H=sAVTr~8
zO0(Q1In_=h+G$*!8B`m*(gsgcMK5KN2)xjPsY(-Gz3Tt7jRoGHL&&SQ+%348P|nep
zS8sb-=x<`c_6&Mem6A0vbPj)B9TwC;3wN3r5r0vjy8$Ja_cSn&%X=Fb%H@RyMsiKK
suek>7N<;Kb^<xwxw6P%8pi*m>lY4~6#M(u+QPL{?^OHtOq6l061EUHa-T(jq

diff --git a/testData/results/TestEnum.dec b/testData/results/TestEnum.dec
index 06649c0..6fabfae 100644
--- a/testData/results/TestEnum.dec
+++ b/testData/results/TestEnum.dec
@@ -6,8 +6,8 @@ public enum TestEnum {
       public void m() {
       }// 22
    },
-   E3("-"),
-   E4("+") {
+   E3("-", TestEnum.Type.ODD),
+   E4("+", TestEnum.Type.EVEN) {
       public void m() {
       }// 27
    };
@@ -15,14 +15,19 @@ public enum TestEnum {
    private String s;
 
    public void m() {
-   }// 30
+   }// 32
 
    private TestEnum() {
-      this("?");// 34
+      this("?", (TestEnum.Type)null);// 36
    }
 
-   private TestEnum(@Deprecated String var3) {
-      this.s = var3;// 35
+   private TestEnum(@Deprecated String var3, TestEnum.Type var4) {
+      this.s = var3;// 37
+   }
+
+   private static enum Type {
+      ODD,
+      EVEN;
    }
 }
 
@@ -46,10 +51,11 @@ class 'pkg/TestEnum' {
    method '<init> (Ljava/lang/String;I)V' {
       3      20
       5      20
-      8      21
+      6      20
+      9      21
    }
 
-   method '<init> (Ljava/lang/String;ILjava/lang/String;)V' {
+   method '<init> (Ljava/lang/String;ILjava/lang/String;Lpkg/TestEnum$Type;)V' {
       8      24
       b      25
    }
@@ -58,6 +64,6 @@ class 'pkg/TestEnum' {
 Lines mapping:
 22 <-> 7
 27 <-> 12
-30 <-> 18
-34 <-> 21
-35 <-> 25
+32 <-> 18
+36 <-> 21
+37 <-> 25
diff --git a/testData/src/pkg/TestEnum.java b/testData/src/pkg/TestEnum.java
index 43fab48..e474d34 100644
--- a/testData/src/pkg/TestEnum.java
+++ b/testData/src/pkg/TestEnum.java
@@ -21,16 +21,18 @@ public enum TestEnum {
     @Override
     public void m() { }
   },
-  E3("-"),
-  E4("+") {
+  E3("-", Type.ODD),
+  E4("+", Type.EVEN) {
     @Override
     public void m() { }
   };
 
+  private enum Type {ODD, EVEN}
+
   public void m() { }
 
   private String s;
 
-  private TestEnum() { this("?"); }
-  private TestEnum(@Deprecated String s) { this.s = s; }
+  private TestEnum() { this("?", null); }
+  private TestEnum(@Deprecated String s, Type t) { this.s = s; }
 }

From 77dc5c5f1e1888b1707137d61a7c5c8a61cb4a21 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 12:35:17 +0200
Subject: [PATCH 047/252] [java-decompiler] dead code

---
 .../modules/decompiler/ExitHelper.java        | 105 +-----------------
 1 file changed, 4 insertions(+), 101 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
index d467cdc..6d0d381 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
-import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,32 +28,23 @@ import java.util.List;
 import java.util.Set;
 
 public class ExitHelper {
-
-
   public static boolean condenseExits(RootStatement root) {
-
     int changed = integrateExits(root);
 
     if (changed > 0) {
-
       cleanUpUnreachableBlocks(root);
-
       SequenceHelper.condenseSequences(root);
     }
 
     return (changed > 0);
   }
 
-
   private static void cleanUpUnreachableBlocks(Statement stat) {
-
     boolean found;
     do {
-
       found = false;
 
       for (int i = 0; i < stat.getStats().size(); i++) {
-
         Statement st = stat.getStats().get(i);
 
         cleanUpUnreachableBlocks(st);
@@ -83,16 +73,12 @@ public class ExitHelper {
     while (found);
   }
 
-
   private static int integrateExits(Statement stat) {
-
     int ret = 0;
-    Statement dest = null;
+    Statement dest;
 
     if (stat.getExprents() == null) {
-
       while (true) {
-
         int changed = 0;
 
         for (Statement st : stat.getStats()) {
@@ -108,7 +94,6 @@ public class ExitHelper {
         }
       }
 
-
       switch (stat.type) {
         case Statement.TYPE_IF:
           IfStatement ifst = (IfStatement)stat;
@@ -168,15 +153,12 @@ public class ExitHelper {
           // LabelHelper.lowContinueLabels(block, new HashSet<StatEdge>());
           // do it by hand
           for (StatEdge prededge : block.getPredecessorEdges(StatEdge.TYPE_CONTINUE)) {
-
             block.removePredecessor(prededge);
             prededge.getSource().changeEdgeNode(Statement.DIRECTION_FORWARD, prededge, stat);
             stat.addPredecessor(prededge);
-
             stat.addLabeledEdge(prededge);
           }
 
-
           stat.addSuccessor(new StatEdge(StatEdge.TYPE_REGULAR, stat, bstat));
 
           for (StatEdge edge : dest.getAllPredecessorEdges()) {
@@ -202,11 +184,9 @@ public class ExitHelper {
   }
 
   private static Statement isExitEdge(StatEdge edge) {
-
     Statement dest = edge.getDestination();
 
-    if (edge.getType() == StatEdge.TYPE_BREAK && dest.type == Statement.TYPE_BASICBLOCK
-        && edge.explicit && (edge.labeled || isOnlyEdge(edge))) {
+    if (edge.getType() == StatEdge.TYPE_BREAK && dest.type == Statement.TYPE_BASICBLOCK && edge.explicit && (edge.labeled || isOnlyEdge(edge))) {
       List<Exprent> data = dest.getExprents();
 
       if (data != null && data.size() == 1) {
@@ -220,7 +200,6 @@ public class ExitHelper {
   }
 
   private static boolean isOnlyEdge(StatEdge edge) {
-
     Statement stat = edge.getDestination();
 
     for (StatEdge ed : stat.getAllPredecessorEdges()) {
@@ -244,7 +223,6 @@ public class ExitHelper {
   }
 
   public static boolean removeRedundantReturns(RootStatement root) {
-
     boolean res = false;
 
     DummyExitStatement dummyExit = root.getDummyExit();
@@ -270,79 +248,4 @@ public class ExitHelper {
 
     return res;
   }
-
-  public static boolean handleReturnFromInitializer(RootStatement root) {
-
-    boolean res = false;
-
-    Statement exit = root.getDummyExit();
-    Statement top = root.getFirst();
-    Statement newret = null;
-
-    boolean sharedcreated = false;
-
-    for (StatEdge edge : exit.getAllPredecessorEdges()) {
-      if (edge.explicit) {
-
-        if (!sharedcreated) {
-          newret = addSharedInitializerReturn(root);
-          sharedcreated = true;
-        }
-
-        Statement source = edge.getSource();
-        List<Exprent> lstExpr = source.getExprents();
-        if (lstExpr != null && !lstExpr.isEmpty()) {
-          Exprent expr = lstExpr.get(lstExpr.size() - 1);
-          if (expr.type == Exprent.EXPRENT_EXIT) {
-            ExitExprent ex = (ExitExprent)expr;
-            if (ex.getExitType() == ExitExprent.EXIT_RETURN && ex.getValue() == null) {
-              lstExpr.remove(lstExpr.size() - 1);
-
-              source.removeSuccessor(edge);
-              source.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, source, newret, top));
-
-              res = true;
-            }
-          }
-        }
-      }
-    }
-
-    return res;
-  }
-
-  private static Statement addSharedInitializerReturn(RootStatement root) {
-
-    Statement exit = root.getDummyExit();
-    Statement top = root.getFirst();
-
-    // build a new statement with the single instruction 'return'
-    BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
-      DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-
-    ExitExprent retexpr = new ExitExprent(ExitExprent.EXIT_RETURN, null,
-                                          ((MethodDescriptor)DecompilerContext
-                                            .getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR)).ret, null);
-    // a changeable list needed
-    bstat.setExprents(new ArrayList<Exprent>(Arrays.asList(new Exprent[]{retexpr})));
-
-    // build sequence to replace the former top statement
-    SequenceStatement seq = new SequenceStatement(Arrays.asList(top, bstat));
-    top.setParent(seq);
-    bstat.setParent(seq);
-    seq.setParent(root);
-
-    root.getStats().removeWithKey(top.id);
-    root.getStats().addWithKeyAndIndex(0, seq, seq.id);
-    root.setFirst(seq);
-
-    for (StatEdge succedge : top.getAllSuccessorEdges()) {
-      top.removeSuccessor(succedge);
-    }
-
-    top.addSuccessor(new StatEdge(StatEdge.TYPE_REGULAR, top, bstat));
-    bstat.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, bstat, exit, seq));
-
-    return bstat;
-  }
-}
+}
\ No newline at end of file

From 857dc4d023529cdf48af02847565eced423706f9 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 12:54:57 +0200
Subject: [PATCH 048/252] [java-decompiler] unneeded context lookups

---
 .../decompiler/main/DecompilerContext.java    |  6 ++--
 .../decompiler/main/rels/ClassWrapper.java    | 15 ++++----
 .../main/rels/MethodProcessorRunnable.java    | 20 ++++++-----
 .../modules/decompiler/ExprProcessor.java     | 24 +++++--------
 .../modules/decompiler/FinallyProcessor.java  | 24 ++++++-------
 .../decompiler/SecondaryFunctionsHelper.java  | 28 ++++++---------
 .../modules/decompiler/vars/VarProcessor.java | 27 +++++++-------
 .../decompiler/vars/VarTypeProcessor.java     | 36 ++++++++++---------
 .../decompiler/vars/VarVersionsProcessor.java | 19 +++++-----
 9 files changed, 94 insertions(+), 105 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
index d105959..c31c57a 100644
--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,6 @@ public class DecompilerContext {
   public static final String CURRENT_CLASS = "CURRENT_CLASS";
   public static final String CURRENT_CLASS_WRAPPER = "CURRENT_CLASS_WRAPPER";
   public static final String CURRENT_CLASS_NODE = "CURRENT_CLASS_NODE";
-  public static final String CURRENT_METHOD = "CURRENT_METHOD";
-  public static final String CURRENT_METHOD_DESCRIPTOR = "CURRENT_METHOD_DESCRIPTOR";
   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
   public static final String CURRENT_VAR_PROCESSOR = "CURRENT_VAR_PROCESSOR";
 
@@ -158,4 +156,4 @@ public class DecompilerContext {
     return getOption(IFernflowerPreferences.NEW_LINE_SEPARATOR) ?
            IFernflowerPreferences.LINE_SEPARATOR_UNX : IFernflowerPreferences.LINE_SEPARATOR_WIN;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 18f05a3..cc7eeab 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,10 +73,8 @@ public class ClassWrapper {
       CounterContainer counter = new CounterContainer();
       DecompilerContext.setCounterContainer(counter);
 
-      DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD, mt);
-      DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR, MethodDescriptor.parseDescriptor(mt.getDescriptor()));
-
-      VarProcessor varProc = new VarProcessor();
+      MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
+      VarProcessor varProc = new VarProcessor(mt, md);
       DecompilerContext.setProperty(DecompilerContext.CURRENT_VAR_PROCESSOR, varProc);
 
       RootStatement root = null;
@@ -86,10 +84,10 @@ public class ClassWrapper {
       try {
         if (mt.containsCode()) {
           if (maxSec == 0 || testMode) {
-            root = MethodProcessorRunnable.codeToJava(mt, varProc);
+            root = MethodProcessorRunnable.codeToJava(mt, md, varProc);
           }
           else {
-            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, varProc, DecompilerContext.getCurrentContext());
+            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, md, varProc, DecompilerContext.getCurrentContext());
 
             Thread mtThread = new Thread(mtProc, "Java decompiler");
             long stopAt = System.currentTimeMillis() + maxSec * 1000;
@@ -123,7 +121,6 @@ public class ClassWrapper {
         }
         else {
           boolean thisVar = !mt.hasModifier(CodeConstants.ACC_STATIC);
-          MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
 
           int paramCount = 0;
           if (thisVar) {
@@ -207,4 +204,4 @@ public class ClassWrapper {
   public VBStyleCollection<Exprent, String> getDynamicFieldInitializers() {
     return dynamicFieldInitializers;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 1c90fb6..4b47425 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,14 +29,15 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 
 import java.io.IOException;
 
 public class MethodProcessorRunnable implements Runnable {
-
   public final Object lock = new Object();
 
   private final StructMethod method;
+  private final MethodDescriptor methodDescriptor;
   private final VarProcessor varProc;
   private final DecompilerContext parentContext;
 
@@ -44,8 +45,9 @@ public class MethodProcessorRunnable implements Runnable {
   private volatile Throwable error;
   private volatile boolean finished = false;
 
-  public MethodProcessorRunnable(StructMethod method, VarProcessor varProc, DecompilerContext parentContext) {
+  public MethodProcessorRunnable(StructMethod method, MethodDescriptor methodDescriptor, VarProcessor varProc, DecompilerContext parentContext) {
     this.method = method;
+    this.methodDescriptor = methodDescriptor;
     this.varProc = varProc;
     this.parentContext = parentContext;
   }
@@ -58,7 +60,7 @@ public class MethodProcessorRunnable implements Runnable {
     root = null;
 
     try {
-      root = codeToJava(method, varProc);
+      root = codeToJava(method, methodDescriptor, varProc);
     }
     catch (ThreadDeath ex) {
       throw ex;
@@ -76,7 +78,7 @@ public class MethodProcessorRunnable implements Runnable {
     }
   }
 
-  public static RootStatement codeToJava(StructMethod mt, VarProcessor varProc) throws IOException {
+  public static RootStatement codeToJava(StructMethod mt, MethodDescriptor md, VarProcessor varProc) throws IOException {
     StructClass cl = mt.getClassStruct();
 
     boolean isInitializer = CodeConstants.CLINIT_NAME.equals(mt.getName()); // for now static initializer only
@@ -119,7 +121,7 @@ public class MethodProcessorRunnable implements Runnable {
 
     RootStatement root = DomHelper.parseGraph(graph);
 
-    FinallyProcessor fProc = new FinallyProcessor(varProc);
+    FinallyProcessor fProc = new FinallyProcessor(md, varProc);
     while (fProc.iterateGraph(mt, root, graph)) {
       root = DomHelper.parseGraph(graph);
     }
@@ -134,7 +136,7 @@ public class MethodProcessorRunnable implements Runnable {
 
     ClearStructHelper.clearStatements(root);
 
-    ExprProcessor proc = new ExprProcessor();
+    ExprProcessor proc = new ExprProcessor(md, varProc);
     proc.processStatement(root, cl);
 
     SequenceHelper.condenseSequences(root);
@@ -195,7 +197,7 @@ public class MethodProcessorRunnable implements Runnable {
 
     ExitHelper.removeRedundantReturns(root);
 
-    SecondaryFunctionsHelper.identifySecondaryFunctions(root);
+    SecondaryFunctionsHelper.identifySecondaryFunctions(root, varProc);
 
     varProc.setVarDefinitions(root);
 
@@ -217,4 +219,4 @@ public class MethodProcessorRunnable implements Runnable {
   public boolean isFinished() {
     return finished;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index df1978f..9d81e07 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -42,7 +42,6 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
 import java.util.*;
 
 public class ExprProcessor implements CodeConstants {
-
   public static final String UNDEFINED_TYPE_STRING = "<undefinedtype>";
   public static final String UNKNOWN_TYPE_STRING = "<unknown>";
   public static final String NULL_TYPE_STRING = "<null>";
@@ -50,7 +49,6 @@ public class ExprProcessor implements CodeConstants {
   private static final HashMap<Integer, Integer> mapConsts = new HashMap<Integer, Integer>();
 
   static {
-
     // mapConsts.put(new Integer(opc_i2l), new
     // Integer(FunctionExprent.FUNCTION_I2L));
     // mapConsts.put(new Integer(opc_i2f), new
@@ -141,19 +139,18 @@ public class ExprProcessor implements CodeConstants {
 
   private static final String[] typeNames = new String[]{"byte", "char", "double", "float", "int", "long", "short", "boolean",};
 
-  private final VarProcessor varProcessor = (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR);
+  private final MethodDescriptor methodDescriptor;
+  private final VarProcessor varProcessor;
+
+  public ExprProcessor(MethodDescriptor md, VarProcessor varProc) {
+    methodDescriptor = md;
+    varProcessor = varProc;
+  }
 
   public void processStatement(RootStatement root, StructClass cl) {
-
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    //		try {
-    //			DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
-    //		} catch (Exception ex) {
-    //			ex.printStackTrace();
-    //		}
-
     // collect finally entry points
     Set<String> setFinallyShortRangeEntryPoints = new HashSet<String>();
     for (List<FinallyPathWrapper> lst : dgraph.mapShortRangeFinallyPaths.values()) {
@@ -534,10 +531,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_athrow:
           exprlist.add(new ExitExprent(instr.opcode == opc_athrow ? ExitExprent.EXIT_THROW : ExitExprent.EXIT_RETURN,
                                        instr.opcode == opc_return ? null : stack.pop(),
-                                       instr.opcode == opc_athrow
-                                       ? null
-                                       : ((MethodDescriptor)DecompilerContext
-                                         .getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR)).ret,
+                                       instr.opcode == opc_athrow ? null : methodDescriptor.ret,
                                        bytecode_offsets));
           break;
         case opc_monitorenter:
@@ -933,4 +927,4 @@ public class ExprProcessor implements CodeConstants {
 
     return false;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index 9f1c11b..d3e1d04 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
@@ -45,23 +46,22 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class FinallyProcessor {
-
   private final Map<Integer, Integer> finallyBlockIDs = new HashMap<Integer, Integer>();
   private final Map<Integer, Integer> catchallBlockIDs = new HashMap<Integer, Integer>();
 
-  private final VarProcessor varprocessor;
+  private final MethodDescriptor methodDescriptor;
+  private final VarProcessor varProcessor;
 
-  public FinallyProcessor(VarProcessor varprocessor) {
-    this.varprocessor = varprocessor;
+  public FinallyProcessor(MethodDescriptor md, VarProcessor varProc) {
+    methodDescriptor = md;
+    varProcessor = varProc;
   }
 
   public boolean iterateGraph(StructMethod mt, RootStatement root, ControlFlowGraph graph) {
-    //		return processStatement(mt, root, graph, root);
     return processStatementEx(mt, root, graph);
   }
 
   private boolean processStatementEx(StructMethod mt, RootStatement root, ControlFlowGraph graph) {
-
     int bytecode_version = mt.getClassStruct().getBytecodeVersion();
 
     LinkedList<Statement> stack = new LinkedList<Statement>();
@@ -87,7 +87,7 @@ public class FinallyProcessor {
           fin.setFinally(true);
 
           Integer var = finallyBlockIDs.get(handler.id);
-          fin.setMonitor(var == null ? null : new VarExprent(var.intValue(), VarType.VARTYPE_INT, varprocessor));
+          fin.setMonitor(var == null ? null : new VarExprent(var.intValue(), VarType.VARTYPE_INT, varProcessor));
         }
         else {
 
@@ -190,9 +190,7 @@ public class FinallyProcessor {
     }
   }
 
-
-  private static Record getFinallyInformation(StructMethod mt, RootStatement root, CatchAllStatement fstat) {
-
+  private Record getFinallyInformation(StructMethod mt, RootStatement root, CatchAllStatement fstat) {
     Map<BasicBlock, Boolean> mapLast = new HashMap<BasicBlock, Boolean>();
 
     BasicBlockStatement firstBlockStatement = fstat.getHandler().getBasichead();
@@ -209,7 +207,7 @@ public class FinallyProcessor {
         firstcode = 2;
     }
 
-    ExprProcessor proc = new ExprProcessor();
+    ExprProcessor proc = new ExprProcessor(methodDescriptor, varProcessor);
     proc.processStatement(root, mt.getClassStruct());
 
     SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
@@ -1087,4 +1085,4 @@ public class FinallyProcessor {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
index f57457c..12aecbb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,9 +56,7 @@ public class SecondaryFunctionsHelper {
     mapNumComparisons.put(FunctionExprent.FUNCTION_LE, new Integer[]{FunctionExprent.FUNCTION_LT, FunctionExprent.FUNCTION_LE, null});
   }
 
-
-  public static boolean identifySecondaryFunctions(Statement stat) {
-
+  public static boolean identifySecondaryFunctions(Statement stat, VarProcessor varProc) {
     if (stat.getExprents() == null) {
       // if(){;}else{...} -> if(!){...}
       if (stat.type == Statement.TYPE_IF) {
@@ -100,7 +98,6 @@ public class SecondaryFunctionsHelper {
       }
     }
 
-
     boolean replaced = true;
     while (replaced) {
       replaced = false;
@@ -111,13 +108,13 @@ public class SecondaryFunctionsHelper {
         Object obj = lstObjects.get(i);
 
         if (obj instanceof Statement) {
-          if (identifySecondaryFunctions((Statement)obj)) {
+          if (identifySecondaryFunctions((Statement)obj, varProc)) {
             replaced = true;
             break;
           }
         }
         else if (obj instanceof Exprent) {
-          Exprent retexpr = identifySecondaryFunctions((Exprent)obj, true);
+          Exprent retexpr = identifySecondaryFunctions((Exprent)obj, true, varProc);
           if (retexpr != null) {
             if (stat.getExprents() == null) {
               // only head expressions can be replaced!
@@ -136,9 +133,7 @@ public class SecondaryFunctionsHelper {
     return false;
   }
 
-
-  private static Exprent identifySecondaryFunctions(Exprent exprent, boolean statement_level) {
-
+  private static Exprent identifySecondaryFunctions(Exprent exprent, boolean statement_level, VarProcessor varProc) {
     if (exprent.type == Exprent.EXPRENT_FUNCTION) {
       FunctionExprent fexpr = (FunctionExprent)exprent;
 
@@ -202,7 +197,7 @@ public class SecondaryFunctionsHelper {
       replaced = false;
 
       for (Exprent expr : exprent.getAllExprents()) {
-        Exprent retexpr = identifySecondaryFunctions(expr, false);
+        Exprent retexpr = identifySecondaryFunctions(expr, false, varProc);
         if (retexpr != null) {
           exprent.replaceExprent(expr, retexpr);
           replaced = true;
@@ -301,21 +296,20 @@ public class SecondaryFunctionsHelper {
           case FunctionExprent.FUNCTION_DCMPG:
             int var = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
             VarType type = lstOperands.get(0).getExprType();
-            VarProcessor processor = (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR);
 
             FunctionExprent iff = new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
-              new FunctionExprent(FunctionExprent.FUNCTION_LT, Arrays.asList(new VarExprent(var, type, processor),
+              new FunctionExprent(FunctionExprent.FUNCTION_LT, Arrays.asList(new VarExprent(var, type, varProc),
                 ConstExprent.getZeroConstant(type.type)), null),
               new ConstExprent(VarType.VARTYPE_INT, new Integer(-1), null),
               new ConstExprent(VarType.VARTYPE_INT, new Integer(1), null)), null);
 
             FunctionExprent head = new FunctionExprent(FunctionExprent.FUNCTION_EQ, Arrays.asList(
-              new AssignmentExprent(new VarExprent(var, type, processor), new FunctionExprent(FunctionExprent.FUNCTION_SUB,
-                                                                                              Arrays.asList(lstOperands.get(0),
-                                                                                                  lstOperands.get(1)), null), null),
+              new AssignmentExprent(new VarExprent(var, type, varProc),
+                                    new FunctionExprent(FunctionExprent.FUNCTION_SUB, Arrays.asList(lstOperands.get(0), lstOperands.get(1)), null),
+                                    null),
               ConstExprent.getZeroConstant(type.type)), null);
 
-            processor.setVarType(new VarVersionPair(var, 0), type);
+            varProc.setVarType(new VarVersionPair(var, 0), type);
 
             return new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
               head, new ConstExprent(VarType.VARTYPE_INT, new Integer(0), null), iff), fexpr.bytecode);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index ce81474..2dc207e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,33 +15,37 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
-import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
 import java.util.*;
 import java.util.Map.Entry;
 
 public class VarProcessor {
-
+  private final StructMethod method;
+  private final MethodDescriptor methodDescriptor;
   private Map<VarVersionPair, String> mapVarNames = new HashMap<VarVersionPair, String>();
   private VarVersionsProcessor varVersions;
   private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
   private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
 
+  public VarProcessor(StructMethod mt, MethodDescriptor md) {
+    method = mt;
+    methodDescriptor = md;
+  }
+
   public void setVarVersions(RootStatement root) {
-    varVersions = new VarVersionsProcessor();
+    varVersions = new VarVersionsProcessor(method, methodDescriptor);
     varVersions.setVarVersions(root);
   }
 
   public void setVarDefinitions(Statement root) {
     mapVarNames = new HashMap<VarVersionPair, String>();
-
-    StructMethod mt = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
-    new VarDefinitionHelper(root, mt, this).setVarDefinitions();
+    new VarDefinitionHelper(root, method, this).setVarDefinitions();
   }
 
   public void setDebugVarNames(Map<Integer, String> mapDebugVarNames) {
@@ -52,12 +56,7 @@ public class VarProcessor {
     Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
 
     List<VarVersionPair> listVars = new ArrayList<VarVersionPair>(mapVarNames.keySet());
-    Collections.sort(listVars, new Comparator<VarVersionPair>() {
-      @Override
-      public int compare(VarVersionPair o1, VarVersionPair o2) {
-        return o1.var - o2.var;
-      }
-    });
+    Collections.sort(listVars, (o1, o2) -> o1.var - o2.var);
 
     Map<String, Integer> mapNames = new HashMap<String, Integer>();
 
@@ -118,4 +117,4 @@ public class VarProcessor {
   public Set<VarVersionPair> getExternalVars() {
     return externalVars;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
index d6c746b..ea95ed0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,21 +34,34 @@ import java.util.List;
 import java.util.Map;
 
 public class VarTypeProcessor {
-
   public static final int VAR_NON_FINAL = 1;
   public static final int VAR_EXPLICIT_FINAL = 2;
   public static final int VAR_FINAL = 3;
 
+  private final StructMethod method;
+  private final MethodDescriptor methodDescriptor;
   private final Map<VarVersionPair, VarType> mapExprentMinTypes = new HashMap<VarVersionPair, VarType>();
   private final Map<VarVersionPair, VarType> mapExprentMaxTypes = new HashMap<VarVersionPair, VarType>();
   private final Map<VarVersionPair, Integer> mapFinalVars = new HashMap<VarVersionPair, Integer>();
 
+  public VarTypeProcessor(StructMethod mt, MethodDescriptor md) {
+    method = mt;
+    methodDescriptor = md;
+  }
+
+  public void calculateVarTypes(RootStatement root, DirectGraph graph) {
+    setInitVars(root);
+
+    resetExprentTypes(graph);
+
+    //noinspection StatementWithEmptyBody
+    while (!processVarTypes(graph)) ;
+  }
+
   private void setInitVars(RootStatement root) {
-    StructMethod mt = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
+    boolean thisVar = !method.hasModifier(CodeConstants.ACC_STATIC);
 
-    boolean thisVar = !mt.hasModifier(CodeConstants.ACC_STATIC);
-
-    MethodDescriptor md = (MethodDescriptor)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR);
+    MethodDescriptor md = methodDescriptor;
 
     if (thisVar) {
       StructClass cl = (StructClass)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS);
@@ -90,15 +103,6 @@ public class VarTypeProcessor {
     }
   }
 
-  public void calculateVarTypes(RootStatement root, DirectGraph graph) {
-    setInitVars(root);
-
-    resetExprentTypes(graph);
-
-    //noinspection StatementWithEmptyBody
-    while (!processVarTypes(graph)) ;
-  }
-
   private static void resetExprentTypes(DirectGraph graph) {
     graph.iterateExprents(new DirectGraph.ExprentIterator() {
       @Override
@@ -274,4 +278,4 @@ public class VarTypeProcessor {
   public VarType getVarType(VarVersionPair pair) {
     return mapExprentMinTypes.get(pair);
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
index 31f0f86..cadaf83 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatements
 import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
 
@@ -33,25 +34,27 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class VarVersionsProcessor {
-
+  private final StructMethod method;
   private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
   private VarTypeProcessor typeProcessor;
 
-  public void setVarVersions(RootStatement root) {
-    StructMethod mt = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
+  public VarVersionsProcessor(StructMethod mt, MethodDescriptor md) {
+    method = mt;
+    typeProcessor = new VarTypeProcessor(mt, md);
+  }
 
+  public void setVarVersions(RootStatement root) {
     SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
-    ssa.splitVariables(root, mt);
+    ssa.splitVariables(root, method);
 
     FlattenStatementsHelper flattenHelper = new FlattenStatementsHelper();
     DirectGraph graph = flattenHelper.buildDirectGraph(root);
 
     mergePhiVersions(ssa, graph);
 
-    typeProcessor = new VarTypeProcessor();
     typeProcessor.calculateVarTypes(root, graph);
 
-    simpleMerge(typeProcessor, graph, mt);
+    simpleMerge(typeProcessor, graph, method);
 
     // FIXME: advanced merging
 
@@ -311,4 +314,4 @@ public class VarVersionsProcessor {
   public Map<Integer, Integer> getMapOriginalVarIndices() {
     return mapOriginalVarIndices;
   }
-}
+}
\ No newline at end of file

From b96586cc2f8dd79be6d20df1379ee36e92316165 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 14:06:28 +0200
Subject: [PATCH 049/252] [java-decompiler] utility classes reorganized

---
 .../decompiler/code/InstructionSequence.java  |  6 +-
 .../main/decompiler/PrintStreamLogger.java    |  6 +-
 .../decompiler/main/rels/ClassWrapper.java    |  5 +-
 .../decompiler/main/rels/MethodWrapper.java   | 17 ++----
 .../modules/decompiler/exps/ConstExprent.java |  9 +--
 .../modules/decompiler/exps/FieldExprent.java | 18 ++++--
 .../modules/decompiler/stats/IfStatement.java |  7 +--
 .../java/decompiler/struct/StructMethod.java  | 10 +++-
 .../java/decompiler/util/InterpreterUtil.java | 25 --------
 .../java/decompiler/util/StructUtils.java     | 59 -------------------
 .../java/decompiler/util/TextUtil.java        | 27 ++++++++-
 11 files changed, 63 insertions(+), 126 deletions(-)
 delete mode 100644 src/org/jetbrains/java/decompiler/util/StructUtils.java

diff --git a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
index 51951ab..bce3b60 100644
--- a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.jetbrains.java.decompiler.code;
 import org.jetbrains.java.decompiler.code.interpreter.Util;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.struct.StructContext;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextUtil;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.io.DataOutputStream;
@@ -157,7 +157,7 @@ public int getOffset(int index) {
     StringBuilder buf = new StringBuilder();
 
     for (int i = 0; i < collinstr.size(); i++) {
-    buf.append(InterpreterUtil.getIndentString(indent));
+    buf.append(TextUtil.getIndentString(indent));
       buf.append(collinstr.getKey(i).intValue());
       buf.append(": ");
       buf.append(collinstr.get(i).toString());
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
index 0995613..a201000 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.io.PrintStream;
 
@@ -33,7 +33,7 @@ public class PrintStreamLogger extends IFernflowerLogger {
   @Override
   public void writeMessage(String message, Severity severity) {
     if (accepts(severity)) {
-      stream.println(severity.prefix + InterpreterUtil.getIndentString(indent) + message);
+      stream.println(severity.prefix + TextUtil.getIndentString(indent) + message);
     }
   }
 
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index cc7eeab..ef09bd0 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -28,7 +28,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.StructMethod;
-import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -162,9 +161,7 @@ public class ClassWrapper {
 
       // if debug information present and should be used
       if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
-        StructLocalVariableTableAttribute attr = (StructLocalVariableTableAttribute)mt.getAttributes().getWithKey(
-          StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
-
+        StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
         if (attr != null) {
           varProc.setDebugVarNames(attr.getMapVarNames());
         }
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
index 0f44e42..eb397d1 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,25 +26,17 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
 import java.util.HashSet;
 import java.util.List;
 
-
 public class MethodWrapper {
-
   public final RootStatement root;
-
   public final VarProcessor varproc;
-
   public final StructMethod methodStruct;
-
   public final CounterContainer counter;
+  public final HashSet<String> setOuterVarNames = new HashSet<String>();
 
   public DirectGraph graph;
-
   public List<VarVersionPair> signatureFields;
-
   public boolean decompiledWithErrors;
 
-  public final HashSet<String> setOuterVarNames = new HashSet<String>();
-
   public MethodWrapper(RootStatement root, VarProcessor varproc, StructMethod methodStruct, CounterContainer counter) {
     this.root = root;
     this.varproc = varproc;
@@ -54,9 +46,8 @@ public class MethodWrapper {
 
   public DirectGraph getOrBuildGraph() {
     if (graph == null && root != null) {
-      FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
-      graph = flatthelper.buildDirectGraph(root);
+      graph = new FlattenStatementsHelper().buildDirectGraph(root);
     }
     return graph;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 8fcf176..908611a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -131,11 +132,11 @@ public class ConstExprent extends Exprent {
           String ret = ESCAPES.get(val);
           if (ret == null) {
             char c = (char)val.intValue();
-            if (c >= 32 && c < 127 || !ascii && InterpreterUtil.isPrintableUnicode(c)) {
+            if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
               ret = String.valueOf(c);
             }
             else {
-              ret = InterpreterUtil.charToUnicodeLiteral(c);
+              ret = TextUtil.charToUnicodeLiteral(c);
             }
           }
           return new TextBuffer(ret).enclose("\'", "\'");
@@ -307,11 +308,11 @@ public class ConstExprent extends Exprent {
           buffer.append("\\\'");
           break;
         default:
-          if (c >= 32 && c < 127 || !ascii && InterpreterUtil.isPrintableUnicode(c)) {
+          if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
             buffer.append(c);
           }
           else {
-            buffer.append(InterpreterUtil.charToUnicodeLiteral(c));
+            buffer.append(TextUtil.charToUnicodeLiteral(c));
           }
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 28002ff..5e6a6b5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
 import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -30,7 +31,6 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
-import org.jetbrains.java.decompiler.util.StructUtils;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
@@ -38,7 +38,6 @@ import java.util.List;
 import java.util.Set;
 
 public class FieldExprent extends Exprent {
-
   private final String name;
   private final String classname;
   private final boolean isStatic;
@@ -85,7 +84,15 @@ public class FieldExprent extends Exprent {
   }
 
   private boolean isAmbiguous() {
-    return StructUtils.getCurrentMethodLocalVariableNames().contains(name);
+    MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+    if (method != null) {
+      StructLocalVariableTableAttribute attr = method.methodStruct.getLocalVariableAttr();
+      if (attr != null) {
+        return attr.getMapVarNames().containsValue(name);
+      }
+    }
+
+    return false;
   }
 
   @Override
@@ -215,5 +222,4 @@ public class FieldExprent extends Exprent {
     
     return true;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index 8be0dcc..ab48ce1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
 import org.jetbrains.java.decompiler.struct.match.IMatchable;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -205,7 +204,7 @@ public class IfStatement extends Statement {
   }
 
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-    String indstr = InterpreterUtil.getIndentString(indent);
+    String indstr = TextUtil.getIndentString(indent);
     TextBuffer buf = new TextBuffer();
 
     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index 2b5249f..4ed9be3 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.*;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
@@ -37,7 +38,6 @@ import static org.jetbrains.java.decompiler.code.CodeConstants.*;
   }
 */
 public class StructMethod extends StructMember {
-
   private static final int[] opr_iconst = {-1, 0, 1, 2, 3, 4, 5};
   private static final int[] opr_loadstore = {0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3};
   private static final int[] opcs_load = {opc_iload, opc_lload, opc_fload, opc_dload, opc_aload};
@@ -389,4 +389,8 @@ public class StructMethod extends StructMember {
   public InstructionSequence getInstructionSequence() {
     return seq;
   }
-}
+
+  public StructLocalVariableTableAttribute getLocalVariableAttr() {
+    return (StructLocalVariableTableAttribute)getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
index 8130145..5576aa1 100644
--- a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
@@ -15,9 +15,6 @@
  */
 package org.jetbrains.java.decompiler.util;
 
-import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-
 import java.io.*;
 import java.util.Collection;
 import java.util.HashSet;
@@ -79,16 +76,6 @@ public class InterpreterUtil {
     }
   }
 
-  public static String getIndentString(int length) {
-    if (length == 0) return "";
-    StringBuilder buf = new StringBuilder();
-    String indent = (String)DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
-    while (length-- > 0) {
-      buf.append(indent);
-    }
-    return buf.toString();
-  }
-
   public static boolean equalSets(Collection<?> c1, Collection<?> c2) {
     if (c1 == null) {
       return c2 == null;
@@ -130,18 +117,6 @@ public class InterpreterUtil {
     return false;
   }
 
-  public static boolean isPrintableUnicode(char c) {
-    int t = Character.getType(c);
-    return t != Character.UNASSIGNED && t != Character.LINE_SEPARATOR && t != Character.PARAGRAPH_SEPARATOR &&
-           t != Character.CONTROL && t != Character.FORMAT && t != Character.PRIVATE_USE && t != Character.SURROGATE;
-  }
-
-  public static String charToUnicodeLiteral(int value) {
-    String sTemp = Integer.toHexString(value);
-    sTemp = ("0000" + sTemp).substring(sTemp.length());
-    return "\\u" + sTemp;
-  }
-
   public static String makeUniqueKey(String name, String descriptor) {
     return name + ' ' + descriptor;
   }
diff --git a/src/org/jetbrains/java/decompiler/util/StructUtils.java b/src/org/jetbrains/java/decompiler/util/StructUtils.java
deleted file mode 100644
index 1d4042e..0000000
--- a/src/org/jetbrains/java/decompiler/util/StructUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.util;
-
-import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
-import org.jetbrains.java.decompiler.struct.StructMember;
-import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.jetbrains.java.decompiler.main.DecompilerContext.CURRENT_METHOD_WRAPPER;
-import static org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE;
-
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 07, 2016
- */
-public final class StructUtils {
-  private StructUtils() { }
-
-  /**
-   * @return the local variables of the current method
-   */
-  public static List<String> getCurrentMethodLocalVariableNames() {
-    final MethodWrapper method = (MethodWrapper) DecompilerContext.getProperty(CURRENT_METHOD_WRAPPER);
-    return method == null ? Collections.emptyList() : getLocalVariables(method.methodStruct);
-  }
-
-  /**
-   * @param structMember the struct member from which to extract the local variables
-   * @return the local variables of the struct member
-   */
-  public static List<String> getLocalVariables(final StructMember structMember) {
-    final VBStyleCollection<StructGeneralAttribute, String> methodStruct = structMember.getAttributes();
-    final StructGeneralAttribute generalAttribute = methodStruct.getWithKey(ATTRIBUTE_LOCAL_VARIABLE_TABLE);
-    if (generalAttribute instanceof StructLocalVariableTableAttribute) {
-      final StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)generalAttribute;
-      return Collections.unmodifiableList(new ArrayList<>(table.getMapVarNames().values()));
-    }
-    return Collections.emptyList();
-  }
-}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 14e24f9..8957fe1 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.util;
 import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 
 public class TextUtil {
@@ -28,4 +29,26 @@ public class TextUtil {
     }
     buf.append("super");
   }
-}
+
+  public static String getIndentString(int length) {
+    if (length == 0) return "";
+    StringBuilder buf = new StringBuilder();
+    String indent = (String)DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
+    while (length-- > 0) {
+      buf.append(indent);
+    }
+    return buf.toString();
+  }
+
+  public static boolean isPrintableUnicode(char c) {
+    int t = Character.getType(c);
+    return t != Character.UNASSIGNED && t != Character.LINE_SEPARATOR && t != Character.PARAGRAPH_SEPARATOR &&
+           t != Character.CONTROL && t != Character.FORMAT && t != Character.PRIVATE_USE && t != Character.SURROGATE;
+  }
+
+  public static String charToUnicodeLiteral(int value) {
+    String sTemp = Integer.toHexString(value);
+    sTemp = ("0000" + sTemp).substring(sTemp.length());
+    return "\\u" + sTemp;
+  }
+}
\ No newline at end of file

From eaa61a1f81ab060fad7ec482c57a134b53559303 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 15:02:39 +0200
Subject: [PATCH 050/252] [java-decompiler] skips illegal local variable names

---
 .../modules/decompiler/vars/VarProcessor.java |   8 +++--
 .../java/decompiler/util/TextUtil.java        |  32 +++++++++++++++++
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 testData/classes/pkg/TestIllegalVarName.class | Bin 0 -> 1224 bytes
 testData/results/TestIllegalVarName.dec       |  33 ++++++++++++++++++
 testData/src/pkg/TestIllegalVarName.kt        |   7 ++++
 6 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 testData/classes/pkg/TestIllegalVarName.class
 create mode 100644 testData/results/TestIllegalVarName.dec
 create mode 100644 testData/src/pkg/TestIllegalVarName.kt

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 2dc207e..2ba0490 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -64,8 +65,11 @@ public class VarProcessor {
       String name = mapVarNames.get(pair);
 
       Integer index = mapOriginalVarIndices.get(pair.var);
-      if (index != null && mapDebugVarNames.containsKey(index)) {
-        name = mapDebugVarNames.get(index);
+      if (index != null) {
+        String debugName = mapDebugVarNames.get(index);
+        if (debugName != null && TextUtil.isValidIdentifier(debugName, method.getClassStruct().getBytecodeVersion())) {
+          name = debugName;
+        }
       }
 
       Integer counter = mapNames.get(name);
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 8957fe1..21f10e4 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -15,13 +15,23 @@
  */
 package org.jetbrains.java.decompiler.util;
 
+import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 
+import java.util.Arrays;
+import java.util.HashSet;
+
 public class TextUtil {
+  private static final HashSet<String> KEYWORDS = new HashSet<>(Arrays.asList(
+    "abstract", "default", "if", "private", "this", "boolean", "do", "implements", "protected", "throw", "break", "double", "import",
+    "public", "throws", "byte", "else", "instanceof", "return", "transient", "case", "extends", "int", "short", "try", "catch", "final",
+    "interface", "static", "void", "char", "finally", "long", "strictfp", "volatile", "class", "float", "native", "super", "while",
+    "const", "for", "new", "switch", "continue", "goto", "package", "synchronized", "true", "false", "null", "assert"));
+
   public static void writeQualifiedSuper(TextBuffer buf, String qualifier) {
     ClassesProcessor.ClassNode classNode = (ClassesProcessor.ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
     if (!qualifier.equals(classNode.classStruct.qualifiedName)) {
@@ -51,4 +61,26 @@ public class TextUtil {
     sTemp = ("0000" + sTemp).substring(sTemp.length());
     return "\\u" + sTemp;
   }
+
+  public static boolean isValidIdentifier(String id, int version) {
+    return isJavaIdentifier(id) && !isKeyword(id, version);
+  }
+
+  private static boolean isJavaIdentifier(String id) {
+    if (id.isEmpty() || !Character.isJavaIdentifierStart(id.charAt(0))) {
+      return false;
+    }
+
+    for (int i = 1; i < id.length(); i++) {
+      if (!Character.isJavaIdentifierPart(id.charAt(i))) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  private static boolean isKeyword(String id, int version) {
+    return KEYWORDS.contains(id) || version > CodeConstants.BYTECODE_JAVA_5 && "enum".equals(id);
+  }
 }
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 5bdbdc5..dd509f6 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -86,6 +86,7 @@ public class SingleClassesTest {
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
   @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
   @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
+  @Test public void testIllegalVarName() { doTest("pkg/TestIllegalVarName"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
@@ -132,4 +133,4 @@ public class SingleClassesTest {
 
     return files;
   }
-}
+}
\ No newline at end of file
diff --git a/testData/classes/pkg/TestIllegalVarName.class b/testData/classes/pkg/TestIllegalVarName.class
new file mode 100644
index 0000000000000000000000000000000000000000..5fd5ec6e5243567cc1230201037e04e6d262721b
GIT binary patch
literal 1224
zcmaJ<TTc@~6#iyQw`HwR3Y2mYQ9ue<7V6!iiIA9-)MA8?7<}2blQQjgx7nTcxxd9H
zAN8deO-#e1KgxKfETWXyZ0B6&JD2&+`T6VH4**%bU`RIWRr8ShGH=_wYS~AYSF{>D
z0>%)pS#8U-EvIVkmukE$BM33D2E$6aaCvtiJ>gVy`PD%m!(zeps%DMLl4l9WH!a6;
zr6q++deN1|mTl)4hUAIxqlhxh*Ij7~$E>v*rf?+p9LqNIjw<1cvLAuLFjYR`<@#I8
zqecml_k%=N`a179H`vwcQ4BHMG;jkWl<n$Ec3Q%&a4&*5gT5^sAzw0t(kd!}aRXzR
zpbM+n<W7Yla}5=POawV|F(fgiQlvsO0h3`az59RktU}Kz;57vQopxRUZ!<)tdp;3{
ziS%G@YT*v<D(oUds&M`IX(Wk3-e^wTY0>yu-oTJzVXP30>kXGy#gY~UYK^vf8&e0!
zEVU`1PD*8qVXxPjF|?FsXz^ah(4tBi31rmhbyB@fR@-Dd;j@pr7T5NY@z9L6Ih57o
z;XvvnBWIs<+7+#mWvWC{O)yj8Ww+53Huo}3yHynq!{p#%Z`36{W7n;4^+dPa-*{n_
zY<{Q?hS7p>c(K(eaWC-9zH2#BG<e==3ttfE)#VN|EM2|*vzPzCj03mjmHBJxk6}89
zIU2}^Eoelo`e`(xFm#0Qn5++ED@Nzn6T@FI`W<8MPcgaP#dKn(i(7MDEOfE-xgYn0
z&V_R{qF5%2;z+wkTq$h@Y0CDLbe%jpRe2WZ5t7g8KdjM(G8DbE^mM8wOp+=^c<mIc
zUr5oQYQ@f-L9L6tpbj+T`lv_PCb>_zHLA9Lj8Go;`(Fkd7gi>Z3{3K3^BBx0Dze8I
V_Oa~afsb(?;l2{}vC>x_{stzQ9s2+P

literal 0
HcmV?d00001

diff --git a/testData/results/TestIllegalVarName.dec b/testData/results/TestIllegalVarName.dec
new file mode 100644
index 0000000..3eb1ea5
--- /dev/null
+++ b/testData/results/TestIllegalVarName.dec
@@ -0,0 +1,33 @@
+package pkg;
+
+import kotlin.Metadata;
+import kotlin.jvm.internal.Intrinsics;
+import org.jetbrains.annotations.NotNull;
+
+@Metadata(
+   mv = {1, 1, 0},
+   bv = {1, 0, 0},
+   k = 1,
+   d1 = {"\u0000\u001a\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u000e\n\u0002\b\u0002\n\u0002\u0010\b\n\u0000\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0016\u0010\u0003\u001a\u00020\u00042\u0006\u0010\u0005\u001a\u00020\u00042\u0006\u0010\u0006\u001a\u00020\u0007¨\u0006\b"},
+   d2 = {"Lpkg/TestIllegalVarName;", "", "()V", "m", "", "this", "enum", "", "java-decompiler-plugin"}
+)
+public final class TestIllegalVarName {
+   @NotNull
+   public final String m(@NotNull String var1, int var2) {
+      Intrinsics.checkParameterIsNotNull(var1, "this");
+      return var1 + '/' + var2;// 5
+   }
+}
+
+class 'pkg/TestIllegalVarName' {
+   method 'm (Ljava/lang/String;I)Ljava/lang/String;' {
+      1      16
+      3      16
+      11      17
+      1a      17
+      1d      17
+   }
+}
+
+Lines mapping:
+5 <-> 18
diff --git a/testData/src/pkg/TestIllegalVarName.kt b/testData/src/pkg/TestIllegalVarName.kt
new file mode 100644
index 0000000..cf47c6e
--- /dev/null
+++ b/testData/src/pkg/TestIllegalVarName.kt
@@ -0,0 +1,7 @@
+package pkg
+
+class TestIllegalVarName {
+  fun m(`this`: String, `enum`: Int): String {
+    return `this` + '/' + `enum`
+  }
+}
\ No newline at end of file

From 4a1a747bdcf930235a4469a8dfb9d4595dcb0d95 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 17:57:57 +0200
Subject: [PATCH 051/252] [java-decompiler] fixes indentation in annotations

---
 .../java/decompiler/main/ClassWriter.java     |   3 +-
 .../decompiler/exps/AnnotationExprent.java    |  17 ++-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../MoreAnnotations$NestedAnnotation.class    | Bin 0 -> 325 bytes
 .../pkg/MoreAnnotations$TestEnum.class        | Bin 0 -> 1069 bytes
 testData/classes/pkg/MoreAnnotations.class    | Bin 0 -> 2662 bytes
 testData/results/MoreAnnotations.dec          | 107 ++++++++++++++++++
 testData/src/pkg/MoreAnnotations.java         |  89 +++++++++++++++
 8 files changed, 206 insertions(+), 11 deletions(-)
 create mode 100644 testData/classes/pkg/MoreAnnotations$NestedAnnotation.class
 create mode 100644 testData/classes/pkg/MoreAnnotations$TestEnum.class
 create mode 100644 testData/classes/pkg/MoreAnnotations.class
 create mode 100644 testData/results/MoreAnnotations.dec
 create mode 100644 testData/src/pkg/MoreAnnotations.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index f79198f..cded67e 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -816,7 +816,7 @@ public class ClassWriter {
           StructAnnDefaultAttribute attr = (StructAnnDefaultAttribute)mt.getAttributes().getWithKey("AnnotationDefault");
           if (attr != null) {
             buffer.append(" default ");
-            buffer.append(attr.getDefaultValue().toJava(indent + 1, new BytecodeMappingTracer())); // dummy tracer
+            buffer.append(attr.getDefaultValue().toJava(0, new BytecodeMappingTracer())); // dummy tracer
           }
         }
 
@@ -970,7 +970,6 @@ public class ClassWriter {
     StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
 
   private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, int param) {
-
     BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one
 
     for (String name : PARAMETER_ANNOTATION_ATTRIBUTES) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
index 905bc21..9b797a9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import java.util.List;
 
 public class AnnotationExprent extends Exprent {
-
   public static final int ANNOTATION_NORMAL = 1;
   public static final int ANNOTATION_MARKER = 2;
   public static final int ANNOTATION_SINGLE_ELEMENT = 3;
@@ -45,12 +44,12 @@ public class AnnotationExprent extends Exprent {
     TextBuffer buffer = new TextBuffer();
 
     buffer.appendIndent(indent);
-    buffer.append("@");
+    buffer.append('@');
     buffer.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(className)));
 
     if (!parNames.isEmpty()) {
-      buffer.append("(");
-      if (parNames.size() == 1 && "value".equals(parNames.get(0))) {
+      buffer.append('(');
+      if (getAnnotationType() == ANNOTATION_SINGLE_ELEMENT) {
         buffer.append(parValues.get(0).toJava(indent + 1, tracer));
       }
       else {
@@ -58,16 +57,16 @@ public class AnnotationExprent extends Exprent {
           buffer.appendLineSeparator().appendIndent(indent + 1);
           buffer.append(parNames.get(i));
           buffer.append(" = ");
-          buffer.append(parValues.get(i).toJava(indent + 2, tracer));
+          buffer.append(parValues.get(i).toJava(0, tracer));
 
           if (i < parNames.size() - 1) {
-            buffer.append(",");
+            buffer.append(',');
           }
         }
         buffer.appendLineSeparator().appendIndent(indent);
       }
 
-      buffer.append(")");
+      buffer.append(')');
     }
 
     return buffer;
@@ -99,4 +98,4 @@ public class AnnotationExprent extends Exprent {
            InterpreterUtil.equalLists(parNames, ann.parNames) &&
            InterpreterUtil.equalLists(parValues, ann.parValues);
   }
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index dd509f6..84434a9 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -83,6 +83,7 @@ public class SingleClassesTest {
   @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
+  @Test public void testMoreAnnotations() { doTest("pkg/MoreAnnotations"); }
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
   @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
   @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
diff --git a/testData/classes/pkg/MoreAnnotations$NestedAnnotation.class b/testData/classes/pkg/MoreAnnotations$NestedAnnotation.class
new file mode 100644
index 0000000000000000000000000000000000000000..b4204ad3a434dbbfd0c2d47904f1c5fb030992d9
GIT binary patch
literal 325
zcmZut%W48a5Ulo*QKM0b_gqBcC40%ulPH4V<KP!ew6m-kX2Z^`;IDb`1N<nlMQ}wu
zH2tWey1Ea?-5$U<nhLK9ZwhrnaidMjgw|(wvep|N7;VE~;giUQJwmf@ZS1v=Vmstt
zof=OlO}7`EP+7!jvgA=@&Jxo&;f(LT&Uy+BLi_(O4DQhOjGgCI#wRo$N7b>loD7V1
zj-4<vi}Rl~FU8GAHquwG!L983lkFV>At#ZSk5GY7KvB9E>GBRrppuk1lu?sh5lD_j
HwNpL;eL`3#

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/MoreAnnotations$TestEnum.class b/testData/classes/pkg/MoreAnnotations$TestEnum.class
new file mode 100644
index 0000000000000000000000000000000000000000..d221ad65a1982f7d75e376d7b71c225510c00175
GIT binary patch
literal 1069
zcmah|QBTuQ6#nkoty?K$Y^X3NFrB&$+!)TMEo6j1LNei@u!Q*3l{$;vt!X=cmySe?
zM#Hl|%6M)!Whh~{$vrvueD{3cIrsGEudhD<)KO1B#xoVqQB;soP*$N~O>FCN%&HVz
z7l;>e%nMslP-Rf}Y|jrmhBL4j;zyPr?D9dMLEGot@^&1<_bs1cx&7gNulm~ctZmNS
zzzA%Y`-MO72E&YQnJzyaCsGQX?e_7m&am=k+RfOxASaG|u{0Gd@3^NVbgpf4>tN9D
zTHcY-b?8J1vmCx<*etfsjB}&v7`#{21JCBYMroReblWuzr(<}wNH@+YbE8kG)BopV
zh&63)2U`sHZ=u^Sbr|H}olR9Gbi2omVBk?EsVD;Rrs<3?Z%m{XeQ(~abBh|S>h8cZ
ztvy>*z3|VAR7B+((&G6u8a7Z<u*s0S>+v)!;-!X1Sk^F$l!kev7?RgL91TR&bX+bd
zi=_$Chut&F3`kby77B(}lg$Z-sWEZ+@8jI$YP4!Jo*K=x)LIgf0J5YCNM%KB6p@j@
z0`7tOPu^p)VyQ#0&xl+>`bZwb1KML@Oeg#zmd5xxBH^i;mdjrdy@D+8ksJ6dooFKz
z9wHaUsYiqoj5SE~0ZMr-cZt}iFg!_jeO<wdkdD<5lSiE7=Ep(~s1UI#-yol)73mW3
z3nW5El|yGH`kg}3kml$_9@1}i0Vdc+#U(=#$JC?_ve3y}rC0<{Pzdc)%#l?IEu(~F
GYw0(R8tk(G

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/MoreAnnotations.class b/testData/classes/pkg/MoreAnnotations.class
new file mode 100644
index 0000000000000000000000000000000000000000..36178dea70f2c1bd9ea20087baa77a1fda68c668
GIT binary patch
literal 2662
zcmah~TU%R26kU^q1X3#ZuZbcpN+~HVp)KO2wa}apzhEz)Mq34MC&?j%hI8mS35vHw
zf0hq^KKna-*GHd>YbJBZ0S+3z?3r16&z`;3><qvE^UJRQR`7EIKP2#D0__Ak0)rn}
zUUS24?F$SSZQF8<hUs~hm%vW~qmSvdst;`2X`0QtV+%}}y@geMR&VY;H5)C<6BvKE
zXC9i_hH2NbrKVfAYj*`M8jkHXO}nY01~D)2%7-nxS>Lyc_F>(tmm5|;HM2}TJa}Hq
zK62b3%tV8Aog+#HLSU$T)U;Gmf#goZF?%P();e_KLe*(8v+~E+{^AyX$gb=-4a>Cs
zecrC)_VzJh!?A11G0+QFr&M-LSAp`_B%>_Kq_@w6l{)8Z$(oaey6gG*N3>{EQ171)
z-G5qc<{3DY5(@~E%seHnPC-t|io7hnPMx@!js1h>(F4~tk0`7ZP|dY=dfwAcFSKlW
z<*VgKDz)@NspZe5Nd8>vqvrv}8qvk;Rj+crIN4JQ^rYs9w!7VKv?FKywxe8iVw@q?
zrbo_1to@r@c4)dZaboHdZ~w_?etbm4+kg8m-4yYzo-lj6%j_Na_m6?L+THCAbb7l~
z2__@EUEV~=syKF4D=*5tryY6U0&!1y1X6*Ygh7!?){B;9S1jIXI^gR4T5_#=qiVVI
zMHezffwBJYB5&=Otp+pGlT)^!Y+l(dWlPF#Dr-oomIbaXWI}r^(4!0IgoL!=Btt`f
z;)$wX-NcCi^@xzoP^n(C&1TDG2QQtCxVIQcdP1c8+#FlTY*Pz4khmPkTn?lz2XdDK
z$;*N4<zNWRa`->$ne$>oxKGL05c1R{i2IzgA@F|_O_rRNTd@lD24$K&_5Ll%llkt3
zJdJ#y`(-^T?^zYL$>l!Oe|56`eiE1tNp<{m3CxALPs_r$Tp+@4lz(XqA<5MRc3uR-
zxXAH+`d;FEq=-?B<!HtWn80KnQ@FInWvWDz-o(q8Ht;HDEL_GF%&y}#?tI<D9Ikqp
z$F&Mmr?GJ6fSf)cv(3}4OS34=4QXylvm{Mcnq_HjNpoA8JJPI3lg1lo^8V4!8)NN7
ztQPTR5pT&eV&sv-Y7TGb@Qyq$K~4qSE#O`O?-p>sfVBeFWf2Jy&Er8HMjjh^yq8BY
zPf=J|gzUGlD(j0;gA!ItcvQk;S!;}XY~sl#KG;M_)*UzSG37BZYGBpCQ(DO+qSTV+
zndB7dt9Cs5MDmP!_|(Ie6q1Ca6>L+^3O++BCNP4}$@L5B5G7FpWBAesNR+@hzVZPw
zBQOcm2gr%QC6s-Dv<Re7@d1(}kVe%9NRGfXEFUniLtq9q4Gbt+gl4hpLy`~(T}9pB
z=3$S(H9Tjxsq)DS4f2R!pN<S{9XUcpgLg>hbvOZM@IL8W#DR9E&bwPi-N1`LROmf3
z>Ly$rHFSLEgqPq2&JW%{omn&k&R{Rlxr|o88SDr;Z{bio2e%=78E@n30O~7w2j6IP
qIM^Y~vVtQmsr2-_rKjz;^nIsP{$Bl`9p^g6Oatp_BsdPv5B&?0+gXhO

literal 0
HcmV?d00001

diff --git a/testData/results/MoreAnnotations.dec b/testData/results/MoreAnnotations.dec
new file mode 100644
index 0000000..7ca5d12
--- /dev/null
+++ b/testData/results/MoreAnnotations.dec
@@ -0,0 +1,107 @@
+package pkg;
+
+public @interface MoreAnnotations {
+   @MoreAnnotations(
+      intValue = 1,
+      byteValue = 1,
+      floatValue = 1.0F,
+      doubleValue = 1.0D,
+      booleanValue = true,
+      shortValue = 1,
+      longValue = 1L,
+      charValue = '\n',
+      enumValue = MoreAnnotations.TestEnum.FirstValue,
+      annotationValue = @MoreAnnotations.NestedAnnotation("a"),
+      stringValue = "",
+      classValue = String.class
+   )
+   String annotatedWithValues = "";
+   @MoreAnnotations(
+      intArray = {},
+      byteArray = {},
+      floatArray = {},
+      doubleArray = {},
+      booleanArray = {},
+      shortArray = {},
+      longArray = {},
+      charArray = {},
+      enumArray = {},
+      annotationArray = {},
+      stringArray = {},
+      classArray = {}
+   )
+   String annotatedWithEmptyArrays = "";
+   @MoreAnnotations(
+      intArray = {1, 0, 2147483647, -2147483648},
+      byteArray = {(byte)1, (byte)0, (byte)127, (byte)-128},
+      floatArray = {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0},
+      doubleArray = {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0, 1.0D / 0.0, -1.0D / 0.0},
+      booleanArray = {true, false},
+      shortArray = {(short)1, (short)0, (short)32767, (short)-32768},
+      longArray = {1L, 0L, 9223372036854775807L, -9223372036854775808L},
+      charArray = {'a', '\n', '\u0001', '\u0000', '\uffff', '\u0000'},
+      enumArray = {MoreAnnotations.TestEnum.FirstValue, MoreAnnotations.TestEnum.SecondValue},
+      annotationArray = {@MoreAnnotations.NestedAnnotation("a"), @MoreAnnotations.NestedAnnotation("b")},
+      stringArray = {"first", "second", ""},
+      classArray = {CharSequence.class, String.class, StringBuilder.class}
+   )
+   String annotatedWithArrays = "";
+
+   int intValue() default 1;
+
+   byte byteValue() default 1;
+
+   float floatValue() default 1.0F / 0.0;
+
+   double doubleValue() default 0.0D / 0.0;
+
+   boolean booleanValue() default true;
+
+   short shortValue() default 1;
+
+   long longValue() default 1L;
+
+   char charValue() default '0';
+
+   MoreAnnotations.TestEnum enumValue() default MoreAnnotations.TestEnum.FirstValue;
+
+   MoreAnnotations.NestedAnnotation annotationValue() default @MoreAnnotations.NestedAnnotation;
+
+   String stringValue() default "default";
+
+   Class<? extends CharSequence> classValue() default CharSequence.class;
+
+   int[] intArray() default {1, 0, 2147483647, -2147483648};
+
+   byte[] byteArray() default {(byte)1, (byte)0, (byte)127, (byte)-128};
+
+   float[] floatArray() default {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0};
+
+   double[] doubleArray() default {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0, 1.0D / 0.0, -1.0D / 0.0};
+
+   boolean[] booleanArray() default {true, false};
+
+   short[] shortArray() default {(short)1, (short)0, (short)32767, (short)-32768};
+
+   long[] longArray() default {1L, 0L, 9223372036854775807L, -9223372036854775808L};
+
+   char[] charArray() default {'\u0001', '\u0000', '\uffff', '\u0000'};
+
+   MoreAnnotations.TestEnum[] enumArray() default {MoreAnnotations.TestEnum.FirstValue};
+
+   MoreAnnotations.NestedAnnotation[] annotationArray() default {@MoreAnnotations.NestedAnnotation};
+
+   String[] stringArray() default {"first", "second", ""};
+
+   Class<? extends CharSequence>[] classArray() default {CharSequence.class, String.class, StringBuilder.class};
+
+   public static enum TestEnum {
+      FirstValue,
+      SecondValue;
+   }
+
+   public @interface NestedAnnotation {
+      String value() default "MyString";
+   }
+}
+
diff --git a/testData/src/pkg/MoreAnnotations.java b/testData/src/pkg/MoreAnnotations.java
new file mode 100644
index 0000000..e66835e
--- /dev/null
+++ b/testData/src/pkg/MoreAnnotations.java
@@ -0,0 +1,89 @@
+package pkg;
+
+public @interface MoreAnnotations {
+
+  int intValue() default 1;
+  byte byteValue() default 1;
+  float floatValue() default Float.POSITIVE_INFINITY;
+  double doubleValue() default Double.NaN;
+  boolean booleanValue() default true;
+  short shortValue() default 1;
+  long longValue() default 1;
+  char charValue() default '0';
+  TestEnum enumValue() default TestEnum.FirstValue;
+  NestedAnnotation annotationValue() default @NestedAnnotation;
+  String stringValue() default "default";
+  Class<? extends CharSequence> classValue() default CharSequence.class;
+
+  int[] intArray() default { 1, 0, Integer.MAX_VALUE, Integer.MIN_VALUE };
+  byte[] byteArray() default { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE };
+  float[] floatArray() default { 1, 0, Float.MAX_VALUE, Float.MIN_VALUE, Float.NaN, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY };
+  double[] doubleArray() default {  1, 0, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY };
+  boolean[] booleanArray() default { true, false };
+  short[] shortArray() default { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE };
+  long[] longArray() default { 1, 0, Long.MAX_VALUE, Long.MIN_VALUE };
+  char[] charArray() default { 1, 0, Character.MAX_VALUE, Character.MIN_VALUE };
+  TestEnum[] enumArray() default { TestEnum.FirstValue };
+  NestedAnnotation[] annotationArray() default { @NestedAnnotation };
+  String[] stringArray() default { "first", "second", ""};
+  Class<? extends CharSequence>[] classArray() default { CharSequence.class, String.class, StringBuilder.class };
+
+  @interface NestedAnnotation {
+    String value() default "MyString";
+  }
+
+  @MoreAnnotations(
+    intValue = 1,
+    byteValue = 1,
+    floatValue = 1,
+    doubleValue = 1,
+    booleanValue = true,
+    shortValue = 1,
+    longValue = 1,
+    charValue = '\n',
+    enumValue = TestEnum.FirstValue,
+    annotationValue = @NestedAnnotation("a"),
+    stringValue = "",
+    classValue = String.class
+  )
+  String annotatedWithValues = "";
+
+  @MoreAnnotations(
+    intArray = {},
+    byteArray = {},
+    floatArray = {},
+    doubleArray = {},
+    booleanArray = {},
+    shortArray = {},
+    longArray = {},
+    charArray = {},
+    enumArray = {},
+    annotationArray = {},
+    stringArray =  {},
+    classArray = {}
+  )
+  String annotatedWithEmptyArrays = "";
+
+  @MoreAnnotations(
+    intArray = { 1, 0, Integer.MAX_VALUE, Integer.MIN_VALUE },
+    byteArray = { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE },
+    floatArray = { 1, 0, Float.MAX_VALUE, Float.MIN_VALUE, Float.NaN, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY },
+    doubleArray = {  1, 0, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY },
+    booleanArray = { true, false },
+    shortArray = { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE },
+    longArray = { 1, 0, Long.MAX_VALUE, Long.MIN_VALUE },
+    charArray = { 'a', '\n', 1, 0, Character.MAX_VALUE, Character.MIN_VALUE },
+    enumArray = { TestEnum.FirstValue , TestEnum.SecondValue},
+    annotationArray = { @NestedAnnotation("a"), @NestedAnnotation("b") },
+    stringArray = { "first", "second", ""},
+    classArray = { CharSequence.class, String.class, StringBuilder.class }
+  )
+  String annotatedWithArrays = "";
+
+  public enum TestEnum {
+
+    FirstValue,
+    SecondValue
+
+  }
+}

From df19689f2b57aa221eb0102e893a883cec8a06b1 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 18:36:35 +0200
Subject: [PATCH 052/252] Cleanup (formatting)

---
 .../modules/decompiler/exps/ConstExprent.java | 276 ++++++++----------
 1 file changed, 121 insertions(+), 155 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 908611a..e618235 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -123,158 +123,128 @@ public class ConstExprent extends Exprent {
     if (constType.type != CodeConstants.TYPE_NULL && value == null) {
       return new TextBuffer(ExprProcessor.getCastTypeName(constType));
     }
-    else {
-      switch (constType.type) {
-        case CodeConstants.TYPE_BOOLEAN:
-          return new TextBuffer(Boolean.toString(((Integer)value).intValue() != 0));
-        case CodeConstants.TYPE_CHAR:
-          Integer val = (Integer)value;
-          String ret = ESCAPES.get(val);
-          if (ret == null) {
-            char c = (char)val.intValue();
-            if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
-              ret = String.valueOf(c);
-            }
-            else {
-              ret = TextUtil.charToUnicodeLiteral(c);
-            }
-          }
-          return new TextBuffer(ret).enclose("\'", "\'");
-        case CodeConstants.TYPE_BYTE:
-        case CodeConstants.TYPE_BYTECHAR:
-        case CodeConstants.TYPE_SHORT:
-        case CodeConstants.TYPE_SHORTCHAR:
-        case CodeConstants.TYPE_INT:
-          int ival = ((Integer)value).intValue();
 
-          String intfield;
-          if (literal) {
-            return new TextBuffer(value.toString());
-          }
-          else if (ival == Integer.MAX_VALUE) {
-            intfield = "MAX_VALUE";
-          }
-          else if (ival == Integer.MIN_VALUE) {
-            intfield = "MIN_VALUE";
+    switch (constType.type) {
+      case CodeConstants.TYPE_BOOLEAN:
+        return new TextBuffer(Boolean.toString(((Integer)value).intValue() != 0));
+
+      case CodeConstants.TYPE_CHAR:
+        Integer val = (Integer)value;
+        String ret = ESCAPES.get(val);
+        if (ret == null) {
+          char c = (char)val.intValue();
+          if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
+            ret = String.valueOf(c);
           }
           else {
-            return new TextBuffer(value.toString());
+            ret = TextUtil.charToUnicodeLiteral(c);
           }
-          return new FieldExprent(intfield, "java/lang/Integer", true, null, FieldDescriptor.INTEGER_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_LONG:
-          long lval = ((Long)value).longValue();
+        }
+        return new TextBuffer().append('\'').append(ret).append('\'');
 
-          String longfield;
-          if (literal) {
-            return new TextBuffer(value.toString()).append("L");
+      case CodeConstants.TYPE_BYTE:
+      case CodeConstants.TYPE_BYTECHAR:
+      case CodeConstants.TYPE_SHORT:
+      case CodeConstants.TYPE_SHORTCHAR:
+      case CodeConstants.TYPE_INT:
+        int intVal = ((Integer)value).intValue();
+        if (!literal) {
+          if (intVal == Integer.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Integer", true, null, FieldDescriptor.INTEGER_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (lval == Long.MAX_VALUE) {
-            longfield = "MAX_VALUE";
+          else if (intVal == Integer.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Integer", true, null, FieldDescriptor.INTEGER_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (lval == Long.MIN_VALUE) {
-            longfield = "MIN_VALUE";
-          }
-          else {
-            return new TextBuffer(value.toString()).append("L");
-          }
-          return new FieldExprent(longfield, "java/lang/Long", true, null, FieldDescriptor.LONG_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_DOUBLE:
-          double dval = ((Double)value).doubleValue();
+        }
+        return new TextBuffer(value.toString());
 
-          String doublefield;
-          if (literal) {
-            if (Double.isNaN(dval)) {
-              return new TextBuffer("0.0D / 0.0");
-            }
-            else if (dval == Double.POSITIVE_INFINITY) {
-              return new TextBuffer("1.0D / 0.0");
-            }
-            else if (dval == Double.NEGATIVE_INFINITY) {
-              return new TextBuffer("-1.0D / 0.0");
-            }
-            else {
-              return new TextBuffer(value.toString()).append("D");
-            }
+      case CodeConstants.TYPE_LONG:
+        long longVal = ((Long)value).longValue();
+        if (!literal) {
+          if (longVal == Long.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Long", true, null, FieldDescriptor.LONG_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (Double.isNaN(dval)) {
-            doublefield = "NaN";
+          else if (longVal == Long.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Long", true, null, FieldDescriptor.LONG_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (dval == Double.POSITIVE_INFINITY) {
-            doublefield = "POSITIVE_INFINITY";
-          }
-          else if (dval == Double.NEGATIVE_INFINITY) {
-            doublefield = "NEGATIVE_INFINITY";
-          }
-          else if (dval == Double.MAX_VALUE) {
-            doublefield = "MAX_VALUE";
-          }
-          else if (dval == Double.MIN_VALUE) {
-            doublefield = "MIN_VALUE";
-          }
-          else {
-            return new TextBuffer(value.toString()).append("D");
-          }
-          return new FieldExprent(doublefield, "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_FLOAT:
-          float fval = ((Float)value).floatValue();
+        }
+        return new TextBuffer(value.toString()).append('L');
 
-          String floatfield;
-          if (literal) {
-            if (Double.isNaN(fval)) {
-              return new TextBuffer("0.0F / 0.0");
-            }
-            else if (fval == Double.POSITIVE_INFINITY) {
-              return new TextBuffer("1.0F / 0.0");
-            }
-            else if (fval == Double.NEGATIVE_INFINITY) {
-              return new TextBuffer("-1.0F / 0.0");
-            }
-            else {
-              return new TextBuffer(value.toString()).append("F");
-            }
+      case CodeConstants.TYPE_FLOAT:
+        float floatVal = ((Float)value).floatValue();
+        if (!literal) {
+          if (Float.isNaN(floatVal)) {
+            return new FieldExprent("NaN", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (Float.isNaN(fval)) {
-            floatfield = "NaN";
+          else if (floatVal == Float.POSITIVE_INFINITY) {
+            return new FieldExprent("POSITIVE_INFINITY", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.POSITIVE_INFINITY) {
-            floatfield = "POSITIVE_INFINITY";
+          else if (floatVal == Float.NEGATIVE_INFINITY) {
+            return new FieldExprent("NEGATIVE_INFINITY", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.NEGATIVE_INFINITY) {
-            floatfield = "NEGATIVE_INFINITY";
+          else if (floatVal == Float.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.MAX_VALUE) {
-            floatfield = "MAX_VALUE";
+          else if (floatVal == Float.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.MIN_VALUE) {
-            floatfield = "MIN_VALUE";
-          }
-          else {
-            return new TextBuffer(value.toString()).append("F");
-          }
-          return new FieldExprent(floatfield, "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_NULL:
-          return new TextBuffer("null");
-        case CodeConstants.TYPE_OBJECT:
-          if (constType.equals(VarType.VARTYPE_STRING)) {
-            return new TextBuffer(convertStringToJava(value.toString(), ascii)).enclose("\"", "\"");
-          }
-          else if (constType.equals(VarType.VARTYPE_CLASS)) {
-            String strval = value.toString();
+        }
+        else if (Float.isNaN(floatVal)) {
+          return new TextBuffer("0.0F / 0.0");
+        }
+        else if (floatVal == Float.POSITIVE_INFINITY) {
+          return new TextBuffer("1.0F / 0.0");
+        }
+        else if (floatVal == Float.NEGATIVE_INFINITY) {
+          return new TextBuffer("-1.0F / 0.0");
+        }
+        return new TextBuffer(value.toString()).append('F');
 
-            VarType classtype;
-            if (strval.startsWith("[")) { // array of simple type
-              classtype = new VarType(strval, false);
-            }
-            else { // class
-              classtype = new VarType(strval, true);
-            }
-
-            return new TextBuffer(ExprProcessor.getCastTypeName(classtype)).append(".class");
+      case CodeConstants.TYPE_DOUBLE:
+        double doubleVal = ((Double)value).doubleValue();
+        if (!literal) {
+          if (Double.isNaN(doubleVal)) {
+            return new FieldExprent("NaN", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-      }
+          else if (doubleVal == Double.POSITIVE_INFINITY) {
+            return new FieldExprent("POSITIVE_INFINITY", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+          else if (doubleVal == Double.NEGATIVE_INFINITY) {
+            return new FieldExprent("NEGATIVE_INFINITY", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+          else if (doubleVal == Double.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+          else if (doubleVal == Double.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+        }
+        else if (Double.isNaN(doubleVal)) {
+          return new TextBuffer("0.0D / 0.0");
+        }
+        else if (doubleVal == Double.POSITIVE_INFINITY) {
+          return new TextBuffer("1.0D / 0.0");
+        }
+        else if (doubleVal == Double.NEGATIVE_INFINITY) {
+          return new TextBuffer("-1.0D / 0.0");
+        }
+        return new TextBuffer(value.toString()).append('D');
+
+      case CodeConstants.TYPE_NULL:
+        return new TextBuffer("null");
+
+      case CodeConstants.TYPE_OBJECT:
+        if (constType.equals(VarType.VARTYPE_STRING)) {
+          return new TextBuffer().append('"').append(convertStringToJava(value.toString(), ascii)).append('"');
+        }
+        else if (constType.equals(VarType.VARTYPE_CLASS)) {
+          String stringVal = value.toString();
+          VarType type = new VarType(stringVal, !stringVal.startsWith("["));
+          return new TextBuffer(ExprProcessor.getCastTypeName(type)).append(".class");
+        }
     }
 
-    throw new RuntimeException("invalid constant type");
+    throw new RuntimeException("invalid constant type: " + constType);
   }
 
   private static String convertStringToJava(String value, boolean ascii) {
@@ -339,9 +309,8 @@ public class ConstExprent extends Exprent {
       case CodeConstants.TYPE_SHORT:
       case CodeConstants.TYPE_SHORTCHAR:
       case CodeConstants.TYPE_INT:
-        Integer ival = (Integer)value;
-        return ival.intValue() == 0 ||
-               (DecompilerContext.getOption(IFernflowerPreferences.BOOLEAN_TRUE_ONE) && ival.intValue() == 1);
+        int value = ((Integer)this.value).intValue();
+        return value == 0 || (DecompilerContext.getOption(IFernflowerPreferences.BOOLEAN_TRUE_ONE) && value == 1);
     }
 
     return false;
@@ -380,7 +349,7 @@ public class ConstExprent extends Exprent {
         return new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
     }
 
-    throw new RuntimeException("Invalid argument!");
+    throw new RuntimeException("Invalid argument: " + type);
   }
 
   public VarType getConstType() {
@@ -406,32 +375,29 @@ public class ConstExprent extends Exprent {
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
-      RuleValue rule_value = rule.getValue();
-      
-      switch(rule.getKey()) {
-      case EXPRENT_CONSTTYPE:
-        if(!rule_value.value.equals(this.constType)) {
+
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+      RuleValue value = rule.getValue();
+      MatchProperties key = rule.getKey();
+
+      if (key == MatchProperties.EXPRENT_CONSTTYPE) {
+        if (!value.value.equals(this.constType)) {
+          return false;
+        }
+      }
+      else if (key == MatchProperties.EXPRENT_CONSTVALUE) {
+        if (value.isVariable() && !engine.checkAndSetVariableValue(value.value.toString(), this.value)) {
           return false;
         }
-        break;
-      case EXPRENT_CONSTVALUE:
-        if(rule_value.isVariable()) {
-          if(!engine.checkAndSetVariableValue(rule_value.value.toString(), this.value)) {
-            return false;
-          }
-        } 
-        break;
       }
     }
-    
+
     return true;
   }
 }
\ No newline at end of file

From a00952f3384c142ef435e3503fc54c461ce0e970 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 19:37:40 +0200
Subject: [PATCH 053/252] Cleanup (formatting)

---
 .../modules/decompiler/ExprProcessor.java     | 47 ++++++++-----------
 .../modules/decompiler/exps/ArrayExprent.java |  7 ++-
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 9d81e07..50c206c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -849,26 +849,24 @@ public class ExprProcessor implements CodeConstants {
     return buf;
   }
 
-  public static ConstExprent getDefaultArrayValue(VarType arrtype) {
-
-    ConstExprent defaultval;
-    if (arrtype.type == CodeConstants.TYPE_OBJECT || arrtype.arrayDim > 0) {
-      defaultval = new ConstExprent(VarType.VARTYPE_NULL, null, null);
+  public static ConstExprent getDefaultArrayValue(VarType arrType) {
+    ConstExprent defaultVal;
+    if (arrType.type == CodeConstants.TYPE_OBJECT || arrType.arrayDim > 0) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_NULL, null, null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_FLOAT) {
-      defaultval = new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
+    else if (arrType.type == CodeConstants.TYPE_FLOAT) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_LONG) {
-      defaultval = new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
+    else if (arrType.type == CodeConstants.TYPE_LONG) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_DOUBLE) {
-      defaultval = new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
+    else if (arrType.type == CodeConstants.TYPE_DOUBLE) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
     }
     else { // integer types
-      defaultval = new ConstExprent(0, true, null);
+      defaultVal = new ConstExprent(0, true, null);
     }
-
-    return defaultval;
+    return defaultVal;
   }
 
   public static boolean getCastedExprent(Exprent exprent,
@@ -887,35 +885,30 @@ public class ExprProcessor implements CodeConstants {
                                          boolean castNull,
                                          boolean castAlways,
                                          BytecodeMappingTracer tracer) {
-
     VarType rightType = exprent.getExprType();
 
-    TextBuffer res = exprent.toJava(indent, tracer);
-
     boolean cast =
       castAlways ||
       (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
       (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
       (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
 
-    if (cast) {
-      if (exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST)) {
-        res.enclose("(", ")");
-      }
+    boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
 
-      res.prepend("(" + getCastTypeName(leftType) + ")");
-    }
+    if (cast) buffer.append('(').append(getCastTypeName(leftType)).append(')');
 
-    buffer.append(res);
+    if (quote) buffer.append('(');
+
+    buffer.append(exprent.toJava(indent, tracer));
+
+    if (quote) buffer.append(')');
 
     return cast;
   }
 
   private static boolean isIntConstant(Exprent exprent) {
-
     if (exprent.type == Exprent.EXPRENT_CONST) {
-      ConstExprent cexpr = (ConstExprent)exprent;
-      switch (cexpr.getConstType().type) {
+      switch (((ConstExprent)exprent).getConstType().type) {
         case CodeConstants.TYPE_BYTE:
         case CodeConstants.TYPE_BYTECHAR:
         case CodeConstants.TYPE_SHORT:
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
index 8f7269b..c8db797 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.Set;
 
 public class ArrayExprent extends Exprent {
-
   private Exprent array;
   private Exprent index;
   private final VarType hardType;
@@ -91,7 +90,7 @@ public class ArrayExprent extends Exprent {
 
     tracer.addMapping(bytecode);
 
-    return res.append("[").append(index.toJava(indent, tracer)).append("]");
+    return res.append('[').append(index.toJava(indent, tracer)).append(']');
   }
 
   @Override
@@ -121,4 +120,4 @@ public class ArrayExprent extends Exprent {
   public Exprent getIndex() {
     return index;
   }
-}
+}
\ No newline at end of file

From b366de8eb4354b33b8f0eeb9962d4d0b3d4e8aec Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 20 Apr 2016 19:52:08 +0200
Subject: [PATCH 054/252] [java-decompiler] unneeded cast around byte/short
 constants

---
 .../modules/decompiler/ExprProcessor.java     |   2 +-
 .../pkg/MoreAnnotations$TestEnum.class        | Bin 1069 -> 977 bytes
 testData/classes/pkg/MoreAnnotations.class    | Bin 2662 -> 2679 bytes
 testData/results/MoreAnnotations.dec          |   8 ++++----
 testData/src/pkg/MoreAnnotations.java         |  14 +++++++-------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 50c206c..b791e62 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -891,7 +891,7 @@ public class ExprProcessor implements CodeConstants {
       castAlways ||
       (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
       (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
-      (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
+      (isIntConstant(exprent) && rightType.isStrictSuperset(leftType));
 
     boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
 
diff --git a/testData/classes/pkg/MoreAnnotations$TestEnum.class b/testData/classes/pkg/MoreAnnotations$TestEnum.class
index d221ad65a1982f7d75e376d7b71c225510c00175..5e4765d3df9a82e432b3c4efd62b67ad9d289c81 100644
GIT binary patch
delta 245
zcmZ3>agp8T)W2Q(7#J8#7z{WWSQwPJ7?c@Q*cpV`8PvEKco@_{ga!u#FBec!1EfNe
zgFz5PYq2wEZ?xfL<YKeQ%*!mXV`LDUEXXL#?5P<xc`joen+}66JA>Y2MJ8o7eI5oW
z2I<LOOfTb<7?>Csf!1*ev1sjJU_HRVvH{3rWDp0EY+#vSpbDUBASnhElV@NCLIwtQ
zEp3_Y3~U=Q6w3fbm>6UkI2hy@WG8QBj+BRp$TKK_WfU3sfixG;Xch)l20jN#0MBk4
Ag8%>k

delta 344
zcmZvW%}T>S6ot<uV<s8mPgAIW(OUnTR%12025~ENS1EKkN~w_;p$3=w43a1C0R+2J
zT!?FTK87zL-lSU@IOpE^&gI^3@oa`)zwaLa0t6N~wk3A3D^M2jBy2QtX_}ap1e<wc
z&qOKreF1+QTCDAKZZ1^ZQ=>?o$Ahz67<i(t$(+uWx>J6vlA+&CM^Q3tGZ<l%MCma@
zB`dMAJgxUApI%0{*?`?!2WSZ#GPsXVuC%d$BO5DN%^dCLA%F%($4ZBLZ<zW7f1ysp
zJgHHTE|#daCn+q$EjZ0nszP-OIz2#m4fhqsxWNC93sf;je67gTU_xI<E$i$3>f~z!
Sn+4j!EV-ne9Cgf`EdBuy87@fx

diff --git a/testData/classes/pkg/MoreAnnotations.class b/testData/classes/pkg/MoreAnnotations.class
index 36178dea70f2c1bd9ea20087baa77a1fda68c668..85146c8c8b7174ee28a29cc5be67b7ecd55225ea 100644
GIT binary patch
delta 877
zcmZva$!^n77==G)z@@6xP=W}Qc@&-7L}7+v8;e+|AW|{J3@ssyZGgIE1~WWDCEf$E
zW5FICgat3a4me5eVnujy<@=p;uYLai|B?TdFMj|1<ttF)gUK6{(B!SjJA<z2MzDCg
zxioLkQ)xCE3-;V>5Htdl_n(R%Q`z(%J)gg&W-`Xl<pHxl%v$6u$`*$$j#wOJ(8qLH
z?{duLxXTHblP;4krx=pru))D{a2#BRGY+1^S%!U5HF7n|jQC`$<f@dbOjS8o)s>?@
z8IR2#=RGcXOf%-Q#^$2U*3c$rQ?|LJm2utEU^_cn%Vj3Con#jVy94&DzFnc{lMbi_
z_yPMUX;<fJo$fl<C}a$JxvoPuRG@T)oWMF}VxYVNeayB&D2w8W<hdDJ6ii?v^%y9d
zK!IB^P(p!CG-9B50$aEp1DiVn+qfHnY&)0GPVU7>iS&K3z1)w_1w0Vg&m5_h07}NZ
zlB8%#IKacm*{h-|T!nIlgB1=*9N<wT_NfaUjg>yg<47;WO%6M|EZYzZ3EO`=F4r(Y
z<XXGhec=%n6aUaL3DQSdiu6_hFHDSu)G?kU)Z}bP9Or2ycKH}_JtugUpsgWkRkX<S
hi1s9BMM{YmQE6LB|G&XmDe_B+uiE8)y*$-j_zMNGdvE{%

delta 839
zcmZ{i$!^n77==H(0f(wm4FqB48H73{ZK6obC3cMx1PGZi2HFzL*aqlrnZdv-MB+UV
zI~F_u3!Vb;3ami<Nqoy)z{bOO&b55b|NkufD3rhc{`>`~@ZRCI!yAXx;jKmfLZX(Y
z+sg|UL-lq$S@h@UluDGtyN~4$_NQ<5Y|i@LDLPxyTn)EIwZ@?uhZ%`+Le_^I2{{^a
zEaZ5|iI6EqMG4pta5BITm<~7<P!BlGSd87oZBk`CCKusGR3pwroTVtB!R7|%8k}zs
zQHojZbJ1s;kLy!SeJ;t33HeCE4t91gmzk8;DRyJAN3nP1=?dkT0mW5CQ?Z|lytRm1
z47Rw2m$Mk=x*WP8r3}<@1*~O814$}i9kUupv{XoeIZY&$fQ{VLK!OSIXlWqv1Z?7#
z1`<!eRuT<-ZVTAXoeZq%<r1`uyBc*9A!uKTd-|N>zK{bv!0rc-WXwwvn*|XL((XDt
zzw%!CFgr6W^_ue&+X#;`(fi*l#Wl)f!}ZU(iffF;%(Z4^#)8LFl<@=Rz(p;xWQgYQ
zMJ%ywi2W7lZ-9ssJjuj-jHO$f<f%b>#f4%n^DM(d=1PcC;d$0zSNXdh{VHFG_Oe&%
JtIo`z_Xjg~bO!(c

diff --git a/testData/results/MoreAnnotations.dec b/testData/results/MoreAnnotations.dec
index 7ca5d12..37302cc 100644
--- a/testData/results/MoreAnnotations.dec
+++ b/testData/results/MoreAnnotations.dec
@@ -33,11 +33,11 @@ public @interface MoreAnnotations {
    String annotatedWithEmptyArrays = "";
    @MoreAnnotations(
       intArray = {1, 0, 2147483647, -2147483648},
-      byteArray = {(byte)1, (byte)0, (byte)127, (byte)-128},
+      byteArray = {1, 0, 127, -128, -1},
       floatArray = {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0},
       doubleArray = {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0, 1.0D / 0.0, -1.0D / 0.0},
       booleanArray = {true, false},
-      shortArray = {(short)1, (short)0, (short)32767, (short)-32768},
+      shortArray = {1, 0, 32767, -32768, -1},
       longArray = {1L, 0L, 9223372036854775807L, -9223372036854775808L},
       charArray = {'a', '\n', '\u0001', '\u0000', '\uffff', '\u0000'},
       enumArray = {MoreAnnotations.TestEnum.FirstValue, MoreAnnotations.TestEnum.SecondValue},
@@ -73,7 +73,7 @@ public @interface MoreAnnotations {
 
    int[] intArray() default {1, 0, 2147483647, -2147483648};
 
-   byte[] byteArray() default {(byte)1, (byte)0, (byte)127, (byte)-128};
+   byte[] byteArray() default {1, 0, 127, -128, -1};
 
    float[] floatArray() default {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0};
 
@@ -81,7 +81,7 @@ public @interface MoreAnnotations {
 
    boolean[] booleanArray() default {true, false};
 
-   short[] shortArray() default {(short)1, (short)0, (short)32767, (short)-32768};
+   short[] shortArray() default {1, 0, 32767, -32768, -1};
 
    long[] longArray() default {1L, 0L, 9223372036854775807L, -9223372036854775808L};
 
diff --git a/testData/src/pkg/MoreAnnotations.java b/testData/src/pkg/MoreAnnotations.java
index e66835e..d29abce 100644
--- a/testData/src/pkg/MoreAnnotations.java
+++ b/testData/src/pkg/MoreAnnotations.java
@@ -16,16 +16,16 @@ public @interface MoreAnnotations {
   Class<? extends CharSequence> classValue() default CharSequence.class;
 
   int[] intArray() default { 1, 0, Integer.MAX_VALUE, Integer.MIN_VALUE };
-  byte[] byteArray() default { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE };
+  byte[] byteArray() default { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE, (byte)0xFF };
   float[] floatArray() default { 1, 0, Float.MAX_VALUE, Float.MIN_VALUE, Float.NaN, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY };
   double[] doubleArray() default {  1, 0, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY };
   boolean[] booleanArray() default { true, false };
-  short[] shortArray() default { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE };
+  short[] shortArray() default { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE, (short)0xFFFF };
   long[] longArray() default { 1, 0, Long.MAX_VALUE, Long.MIN_VALUE };
   char[] charArray() default { 1, 0, Character.MAX_VALUE, Character.MIN_VALUE };
   TestEnum[] enumArray() default { TestEnum.FirstValue };
   NestedAnnotation[] annotationArray() default { @NestedAnnotation };
-  String[] stringArray() default { "first", "second", ""};
+  String[] stringArray() default { "first", "second", "" };
   Class<? extends CharSequence>[] classArray() default { CharSequence.class, String.class, StringBuilder.class };
 
   @interface NestedAnnotation {
@@ -66,16 +66,16 @@ public @interface MoreAnnotations {
 
   @MoreAnnotations(
     intArray = { 1, 0, Integer.MAX_VALUE, Integer.MIN_VALUE },
-    byteArray = { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE },
+    byteArray = { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE, (byte)0xFF },
     floatArray = { 1, 0, Float.MAX_VALUE, Float.MIN_VALUE, Float.NaN, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY },
     doubleArray = {  1, 0, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY },
     booleanArray = { true, false },
-    shortArray = { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE },
+    shortArray = { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE, (short)0xFFFF },
     longArray = { 1, 0, Long.MAX_VALUE, Long.MIN_VALUE },
     charArray = { 'a', '\n', 1, 0, Character.MAX_VALUE, Character.MIN_VALUE },
-    enumArray = { TestEnum.FirstValue , TestEnum.SecondValue},
+    enumArray = { TestEnum.FirstValue , TestEnum.SecondValue },
     annotationArray = { @NestedAnnotation("a"), @NestedAnnotation("b") },
-    stringArray = { "first", "second", ""},
+    stringArray = { "first", "second", "" },
     classArray = { CharSequence.class, String.class, StringBuilder.class }
   )
   String annotatedWithArrays = "";

From a67808d3aa3fb0d91926e0d707e5315a5768909e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 21 Apr 2016 10:16:32 +0200
Subject: [PATCH 055/252] Cleanup (formatting)

---
 .../modules/decompiler/ExprProcessor.java     | 150 +++++++-----------
 1 file changed, 59 insertions(+), 91 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index b791e62..71e2231 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -46,98 +46,66 @@ public class ExprProcessor implements CodeConstants {
   public static final String UNKNOWN_TYPE_STRING = "<unknown>";
   public static final String NULL_TYPE_STRING = "<null>";
 
-  private static final HashMap<Integer, Integer> mapConsts = new HashMap<Integer, Integer>();
-
+  private static final Map<Integer, Integer> mapConsts = new HashMap<Integer, Integer>();
   static {
-    // mapConsts.put(new Integer(opc_i2l), new
-    // Integer(FunctionExprent.FUNCTION_I2L));
-    // mapConsts.put(new Integer(opc_i2f), new
-    // Integer(FunctionExprent.FUNCTION_I2F));
-    // mapConsts.put(new Integer(opc_i2d), new
-    // Integer(FunctionExprent.FUNCTION_I2D));
-    // mapConsts.put(new Integer(opc_l2i), new
-    // Integer(FunctionExprent.FUNCTION_L2I));
-    // mapConsts.put(new Integer(opc_l2f), new
-    // Integer(FunctionExprent.FUNCTION_L2F));
-    // mapConsts.put(new Integer(opc_l2d), new
-    // Integer(FunctionExprent.FUNCTION_L2D));
-    // mapConsts.put(new Integer(opc_f2i), new
-    // Integer(FunctionExprent.FUNCTION_F2I));
-    // mapConsts.put(new Integer(opc_f2l), new
-    // Integer(FunctionExprent.FUNCTION_F2L));
-    // mapConsts.put(new Integer(opc_f2d), new
-    // Integer(FunctionExprent.FUNCTION_F2D));
-    // mapConsts.put(new Integer(opc_d2i), new
-    // Integer(FunctionExprent.FUNCTION_D2I));
-    // mapConsts.put(new Integer(opc_d2l), new
-    // Integer(FunctionExprent.FUNCTION_D2L));
-    // mapConsts.put(new Integer(opc_d2f), new
-    // Integer(FunctionExprent.FUNCTION_D2F));
-    // mapConsts.put(new Integer(opc_i2b), new
-    // Integer(FunctionExprent.FUNCTION_I2B));
-    // mapConsts.put(new Integer(opc_i2c), new
-    // Integer(FunctionExprent.FUNCTION_I2C));
-    // mapConsts.put(new Integer(opc_i2s), new
-    // Integer(FunctionExprent.FUNCTION_I2S));
-
-    mapConsts.put(new Integer(opc_arraylength), new Integer(FunctionExprent.FUNCTION_ARRAY_LENGTH));
-    mapConsts.put(new Integer(opc_checkcast), new Integer(FunctionExprent.FUNCTION_CAST));
-    mapConsts.put(new Integer(opc_instanceof), new Integer(FunctionExprent.FUNCTION_INSTANCEOF));
+    mapConsts.put(opc_arraylength, FunctionExprent.FUNCTION_ARRAY_LENGTH);
+    mapConsts.put(opc_checkcast, FunctionExprent.FUNCTION_CAST);
+    mapConsts.put(opc_instanceof, FunctionExprent.FUNCTION_INSTANCEOF);
   }
 
-  private static final VarType[] consts =
-    new VarType[]{VarType.VARTYPE_INT, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_CLASS,
-      VarType.VARTYPE_STRING};
+  private static final VarType[] consts = {
+    VarType.VARTYPE_INT, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_CLASS, VarType.VARTYPE_STRING
+  };
 
-  private static final VarType[] vartypes =
-    new VarType[]{VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT};
+  private static final VarType[] varTypes = {
+    VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT
+  };
 
-  private static final VarType[] arrtypes =
-    new VarType[]{VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT,
-      VarType.VARTYPE_BOOLEAN, VarType.VARTYPE_CHAR, VarType.VARTYPE_SHORT};
+  private static final VarType[] arrTypes = {
+    VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT,
+    VarType.VARTYPE_BOOLEAN, VarType.VARTYPE_CHAR, VarType.VARTYPE_SHORT
+  };
 
-  private static final int[] func1 =
-    new int[]{FunctionExprent.FUNCTION_ADD, FunctionExprent.FUNCTION_SUB, FunctionExprent.FUNCTION_MUL, FunctionExprent.FUNCTION_DIV,
-      FunctionExprent.FUNCTION_REM};
+  private static final int[] func1 = {
+    FunctionExprent.FUNCTION_ADD, FunctionExprent.FUNCTION_SUB, FunctionExprent.FUNCTION_MUL, FunctionExprent.FUNCTION_DIV,
+    FunctionExprent.FUNCTION_REM
+  };
+  private static final int[] func2 = {
+    FunctionExprent.FUNCTION_SHL, FunctionExprent.FUNCTION_SHR, FunctionExprent.FUNCTION_USHR, FunctionExprent.FUNCTION_AND,
+    FunctionExprent.FUNCTION_OR, FunctionExprent.FUNCTION_XOR
+  };
+  private static final int[] func3 = {
+    FunctionExprent.FUNCTION_I2L, FunctionExprent.FUNCTION_I2F, FunctionExprent.FUNCTION_I2D, FunctionExprent.FUNCTION_L2I,
+    FunctionExprent.FUNCTION_L2F, FunctionExprent.FUNCTION_L2D, FunctionExprent.FUNCTION_F2I, FunctionExprent.FUNCTION_F2L,
+    FunctionExprent.FUNCTION_F2D, FunctionExprent.FUNCTION_D2I, FunctionExprent.FUNCTION_D2L, FunctionExprent.FUNCTION_D2F,
+    FunctionExprent.FUNCTION_I2B, FunctionExprent.FUNCTION_I2C, FunctionExprent.FUNCTION_I2S
+  };
+  private static final int[] func4 = {
+    FunctionExprent.FUNCTION_LCMP, FunctionExprent.FUNCTION_FCMPL, FunctionExprent.FUNCTION_FCMPG, FunctionExprent.FUNCTION_DCMPL,
+    FunctionExprent.FUNCTION_DCMPG
+  };
+  private static final int[] func5 = {
+    IfExprent.IF_EQ, IfExprent.IF_NE, IfExprent.IF_LT, IfExprent.IF_GE, IfExprent.IF_GT, IfExprent.IF_LE
+  };
+  private static final int[] func6 = {
+    IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPGT, IfExprent.IF_ICMPLE,
+    IfExprent.IF_ACMPEQ, IfExprent.IF_ACMPNE
+  };
+  private static final int[] func7 = {IfExprent.IF_NULL, IfExprent.IF_NONNULL};
+  private static final int[] func8 = {MonitorExprent.MONITOR_ENTER, MonitorExprent.MONITOR_EXIT};
 
-  private static final int[] func2 =
-    new int[]{FunctionExprent.FUNCTION_SHL, FunctionExprent.FUNCTION_SHR, FunctionExprent.FUNCTION_USHR, FunctionExprent.FUNCTION_AND,
-      FunctionExprent.FUNCTION_OR, FunctionExprent.FUNCTION_XOR};
+  private static final int[] arrTypeIds = {
+    CodeConstants.TYPE_BOOLEAN, CodeConstants.TYPE_CHAR, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_DOUBLE,
+    CodeConstants.TYPE_BYTE, CodeConstants.TYPE_SHORT, CodeConstants.TYPE_INT, CodeConstants.TYPE_LONG
+  };
 
-  private static final int[] func3 =
-    new int[]{FunctionExprent.FUNCTION_I2L, FunctionExprent.FUNCTION_I2F, FunctionExprent.FUNCTION_I2D, FunctionExprent.FUNCTION_L2I,
-      FunctionExprent.FUNCTION_L2F, FunctionExprent.FUNCTION_L2D, FunctionExprent.FUNCTION_F2I, FunctionExprent.FUNCTION_F2L,
-      FunctionExprent.FUNCTION_F2D,
-      FunctionExprent.FUNCTION_D2I, FunctionExprent.FUNCTION_D2L, FunctionExprent.FUNCTION_D2F, FunctionExprent.FUNCTION_I2B,
-      FunctionExprent.FUNCTION_I2C,
-      FunctionExprent.FUNCTION_I2S};
+  private static final int[] negIfs = {
+    IfExprent.IF_NE, IfExprent.IF_EQ, IfExprent.IF_GE, IfExprent.IF_LT, IfExprent.IF_LE, IfExprent.IF_GT, IfExprent.IF_NONNULL,
+    IfExprent.IF_NULL, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPLE,
+    IfExprent.IF_ICMPGT, IfExprent.IF_ACMPNE, IfExprent.IF_ACMPEQ
+  };
 
-  private static final int[] func4 =
-    new int[]{FunctionExprent.FUNCTION_LCMP, FunctionExprent.FUNCTION_FCMPL, FunctionExprent.FUNCTION_FCMPG, FunctionExprent.FUNCTION_DCMPL,
-      FunctionExprent.FUNCTION_DCMPG};
-
-  private static final int[] func5 =
-    new int[]{IfExprent.IF_EQ, IfExprent.IF_NE, IfExprent.IF_LT, IfExprent.IF_GE, IfExprent.IF_GT, IfExprent.IF_LE};
-
-  private static final int[] func6 =
-    new int[]{IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPGT, IfExprent.IF_ICMPLE,
-      IfExprent.IF_ACMPEQ, IfExprent.IF_ACMPNE};
-
-  private static final int[] func7 = new int[]{IfExprent.IF_NULL, IfExprent.IF_NONNULL};
-
-  private static final int[] func8 = new int[]{MonitorExprent.MONITOR_ENTER, MonitorExprent.MONITOR_EXIT};
-
-  private static final int[] arr_type =
-    new int[]{CodeConstants.TYPE_BOOLEAN, CodeConstants.TYPE_CHAR, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_DOUBLE,
-      CodeConstants.TYPE_BYTE, CodeConstants.TYPE_SHORT, CodeConstants.TYPE_INT, CodeConstants.TYPE_LONG};
-
-  private static final int[] negifs =
-    new int[]{IfExprent.IF_NE, IfExprent.IF_EQ, IfExprent.IF_GE, IfExprent.IF_LT, IfExprent.IF_LE, IfExprent.IF_GT, IfExprent.IF_NONNULL,
-      IfExprent.IF_NULL, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPLE,
-      IfExprent.IF_ICMPGT, IfExprent.IF_ACMPNE,
-      IfExprent.IF_ACMPEQ};
-
-  private static final String[] typeNames = new String[]{"byte", "char", "double", "float", "int", "long", "short", "boolean",};
+  private static final String[] typeNames = {"byte", "char", "double", "float", "int", "long", "short", "boolean"};
 
   private final MethodDescriptor methodDescriptor;
   private final VarProcessor varProcessor;
@@ -373,7 +341,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_fload:
         case opc_dload:
         case opc_aload:
-          pushEx(stack, exprlist, new VarExprent(instr.getOperand(0), vartypes[instr.opcode - opc_iload], varProcessor));
+          pushEx(stack, exprlist, new VarExprent(instr.getOperand(0), varTypes[instr.opcode - opc_iload], varProcessor));
           break;
         case opc_iaload:
         case opc_laload:
@@ -394,7 +362,7 @@ public class ExprProcessor implements CodeConstants {
             case opc_daload:
               vartype = VarType.VARTYPE_DOUBLE;
           }
-          pushEx(stack, exprlist, new ArrayExprent(arr, index, arrtypes[instr.opcode - opc_iaload], bytecode_offsets), vartype);
+          pushEx(stack, exprlist, new ArrayExprent(arr, index, arrTypes[instr.opcode - opc_iaload], bytecode_offsets), vartype);
           break;
         case opc_istore:
         case opc_lstore:
@@ -404,7 +372,7 @@ public class ExprProcessor implements CodeConstants {
           Exprent top = stack.pop();
           int varindex = instr.getOperand(0);
           AssignmentExprent assign =
-            new AssignmentExprent(new VarExprent(varindex, vartypes[instr.opcode - opc_istore], varProcessor), top, bytecode_offsets);
+            new AssignmentExprent(new VarExprent(varindex, varTypes[instr.opcode - opc_istore], varProcessor), top, bytecode_offsets);
           exprlist.add(assign);
           break;
         case opc_iastore:
@@ -419,7 +387,7 @@ public class ExprProcessor implements CodeConstants {
           Exprent index_store = stack.pop();
           Exprent arr_store = stack.pop();
           AssignmentExprent arrassign =
-            new AssignmentExprent(new ArrayExprent(arr_store, index_store, arrtypes[instr.opcode - opc_iastore], bytecode_offsets), value,
+            new AssignmentExprent(new ArrayExprent(arr_store, index_store, arrTypes[instr.opcode - opc_iastore], bytecode_offsets), value,
                                   bytecode_offsets);
           exprlist.add(arrassign);
           break;
@@ -502,7 +470,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_ifge:
         case opc_ifgt:
         case opc_ifle:
-          exprlist.add(new IfExprent(negifs[func5[instr.opcode - opc_ifeq]], stack, bytecode_offsets));
+          exprlist.add(new IfExprent(negIfs[func5[instr.opcode - opc_ifeq]], stack, bytecode_offsets));
           break;
         case opc_if_icmpeq:
         case opc_if_icmpne:
@@ -512,11 +480,11 @@ public class ExprProcessor implements CodeConstants {
         case opc_if_icmple:
         case opc_if_acmpeq:
         case opc_if_acmpne:
-          exprlist.add(new IfExprent(negifs[func6[instr.opcode - opc_if_icmpeq]], stack, bytecode_offsets));
+          exprlist.add(new IfExprent(negIfs[func6[instr.opcode - opc_if_icmpeq]], stack, bytecode_offsets));
           break;
         case opc_ifnull:
         case opc_ifnonnull:
-          exprlist.add(new IfExprent(negifs[func7[instr.opcode - opc_ifnull]], stack, bytecode_offsets));
+          exprlist.add(new IfExprent(negIfs[func7[instr.opcode - opc_ifnull]], stack, bytecode_offsets));
           break;
         case opc_tableswitch:
         case opc_lookupswitch:
@@ -591,7 +559,7 @@ public class ExprProcessor implements CodeConstants {
           pushEx(stack, exprlist, new NewExprent(arrType, stack, dimensions, bytecode_offsets));
           break;
         case opc_newarray:
-          pushEx(stack, exprlist, new NewExprent(new VarType(arr_type[instr.getOperand(0) - 4], 1), stack, 1, bytecode_offsets));
+          pushEx(stack, exprlist, new NewExprent(new VarType(arrTypeIds[instr.getOperand(0) - 4], 1), stack, 1, bytecode_offsets));
           break;
         case opc_dup:
           pushEx(stack, exprlist, stack.getByOffset(-1).copy());

From 249903478c597db1c489baea8834dc78cb56d95f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 21 Apr 2016 15:49:10 +0200
Subject: [PATCH 056/252] Cleanup (test data)

---
 .../classes/pkg/TestStaticNameClash.class     | Bin 443 -> 351 bytes
 .../pkg/TestSyntheticAccess$Assigner.class    | Bin 599 -> 599 bytes
 .../pkg/TestSyntheticAccess$Incrementer.class | Bin 914 -> 914 bytes
 .../classes/pkg/TestSyntheticAccess.class     | Bin 902 -> 902 bytes
 testData/results/TestStaticNameClash.dec      |  10 ++--
 testData/results/TestSyntheticAccess.dec      |  54 +++++++++---------
 testData/src/pkg/TestStaticNameClash.java     |   4 --
 testData/src/pkg/TestSyntheticAccess.java     |   4 --
 8 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/testData/classes/pkg/TestStaticNameClash.class b/testData/classes/pkg/TestStaticNameClash.class
index 16a1da3eaa4b6d04a9ca9552b68470b096425ceb..1573836f0fc84d5481c052752a2de61e3671342b 100644
GIT binary patch
delta 125
zcmdnZe4k0`)W2Q(7#J8#7=*bPSQz*@8JHOa*ck-b8H6TEc}<+NBwUt(5eOL=Shcn@
zFm41g7#X;LBpX<enSqmmn}G+&<^+l<0%?fS%?wNkrCbb5KuHdu@ti<uULc!^fe!$Q
CzYM?t

delta 197
zcmcc5w3}J#)W2Q(7#J8#7{s_3SQvyj8JHP_*%?IG8AK;adC3X+<R>TQge4YbCMM;i
zhJXl029}bH%wk3cNuP;(#Tl(9CM~PhXJ7<E1_oBG?F@_?fea=FE+EMU7G!7O2C{h|
z3V<{(kjKfu$G{I1;RLdcfiy((W(FpNW-g#1AZ;u_4af$t0*z$=Y7hXDObmhmf)^M>

diff --git a/testData/classes/pkg/TestSyntheticAccess$Assigner.class b/testData/classes/pkg/TestSyntheticAccess$Assigner.class
index 4ebd715b0d13441e9e5adde75b14eeaf08bb901d..a089dba7e5be86d809e93ff6e85bf981f1259591 100644
GIT binary patch
delta 33
pcmcc4a-C(v4Ms+}$u}AGSrr&K85Ae;GHJ7_Ft9SHPPS!|0sx>V2UY+8

delta 33
pcmcc4a-C(v4Ms+#$u}AGSydP~8B{0pGHJ7FFt9RcPPS!|0sx^)2WkKS

diff --git a/testData/classes/pkg/TestSyntheticAccess$Incrementer.class b/testData/classes/pkg/TestSyntheticAccess$Incrementer.class
index d446c62ee10cfbbb1947afdba7c8b76961f555de..d592c3413e4a9f7bc59b753b260433e2a4d0145c 100644
GIT binary patch
delta 85
zcmbQlK8bxpITItt<O(KpRxSoX2JXpQnDkir7&sXCCqD<Wgn%sJ$x_T(tYQo-4C0eL
hnYHAlfGlYSCI)c^1|TWHpaP`17#JBifuhO`OaNn<3T*%Y

delta 85
zcmbQlK8bxpITIt#<O(KpRz3zn2L8!gnDkhM7&sV&CqD<W#DFaE$x_T(tWpdt4APT5
inYHBQfGl|iCI)c^1|TWHpaP`17#JBi8KfDM8JGZUbqbjP

diff --git a/testData/classes/pkg/TestSyntheticAccess.class b/testData/classes/pkg/TestSyntheticAccess.class
index 364ce33cc273afe5ce79423d7b774011bd7b804a..9e3f5eb4270340abf07dca3c98fc675da92c7fd8 100644
GIT binary patch
delta 55
ycmZo;Z)4ve&BVw&S%ygqNV+rW0Lc<2Lm;^fOx|G92eLVsL8Jw<HjqqVRssM(><bS7

delta 55
ycmZo;Z)4ve&BVw)S%ygqNV+rW0Lc<2Lm;^fOx|G92eLVsL8Jw<HjqqVRssM-EDJ9H

diff --git a/testData/results/TestStaticNameClash.dec b/testData/results/TestStaticNameClash.dec
index b01049c..230983e 100644
--- a/testData/results/TestStaticNameClash.dec
+++ b/testData/results/TestStaticNameClash.dec
@@ -3,9 +3,9 @@ package pkg;
 public class TestStaticNameClash {
    public static String property;
 
-   public static void setProperty(String property) {
-      TestStaticNameClash.property = property;// 12
-   }// 13
+   public static void setProperty(String var0) {
+      property = var0;// 8
+   }// 9
 }
 
 class 'pkg/TestStaticNameClash' {
@@ -16,5 +16,5 @@ class 'pkg/TestStaticNameClash' {
 }
 
 Lines mapping:
-12 <-> 7
-13 <-> 8
+8 <-> 7
+9 <-> 8
diff --git a/testData/results/TestSyntheticAccess.dec b/testData/results/TestSyntheticAccess.dec
index ef400d7..9f1c0ee 100644
--- a/testData/results/TestSyntheticAccess.dec
+++ b/testData/results/TestSyntheticAccess.dec
@@ -6,34 +6,34 @@ class TestSyntheticAccess {
 
    private class Assigner {
       void assignI(int var1) {
-         TestSyntheticAccess.this.i = var1;// 36
-      }// 37
+         TestSyntheticAccess.this.i = var1;// 32
+      }// 33
 
       void assignS(int var1) {
-         TestSyntheticAccess.s = var1;// 40
-      }// 41
+         TestSyntheticAccess.s = var1;// 36
+      }// 37
    }
 
    private class Incrementer {
       void orI() {
-         TestSyntheticAccess.this.i = TestSyntheticAccess.this.i | 1;// 14
-      }// 15
+         TestSyntheticAccess.this.i = TestSyntheticAccess.this.i | 1;// 10
+      }// 11
 
       void incrementI() {
-         TestSyntheticAccess.this.i++;// 18
-      }// 19
+         TestSyntheticAccess.this.i++;// 14
+      }// 15
 
       void decrementI() {
-         --TestSyntheticAccess.this.i;// 22
-      }// 23
+         --TestSyntheticAccess.this.i;// 18
+      }// 19
 
       void incrementS() {
-         ++TestSyntheticAccess.s;// 26 27
+         ++TestSyntheticAccess.s;// 22 23
       }
 
       void decrementS() {
-         TestSyntheticAccess.s--;// 30
-      }// 31
+         TestSyntheticAccess.s--;// 26
+      }// 27
    }
 }
 
@@ -83,17 +83,17 @@ class 'pkg/TestSyntheticAccess$Incrementer' {
 }
 
 Lines mapping:
-14 <-> 19
-15 <-> 20
-18 <-> 23
-19 <-> 24
-22 <-> 27
-23 <-> 28
-26 <-> 31
-27 <-> 31
-30 <-> 35
-31 <-> 36
-36 <-> 9
-37 <-> 10
-40 <-> 13
-41 <-> 14
+10 <-> 19
+11 <-> 20
+14 <-> 23
+15 <-> 24
+18 <-> 27
+19 <-> 28
+22 <-> 31
+23 <-> 31
+26 <-> 35
+27 <-> 36
+32 <-> 9
+33 <-> 10
+36 <-> 13
+37 <-> 14
diff --git a/testData/src/pkg/TestStaticNameClash.java b/testData/src/pkg/TestStaticNameClash.java
index ced8f12..5f5a08f 100644
--- a/testData/src/pkg/TestStaticNameClash.java
+++ b/testData/src/pkg/TestStaticNameClash.java
@@ -1,9 +1,5 @@
 package pkg;
 
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 07, 2016
- */
 public class TestStaticNameClash {
 
     public static String property;
diff --git a/testData/src/pkg/TestSyntheticAccess.java b/testData/src/pkg/TestSyntheticAccess.java
index 0c4e3ea..5ef41e8 100644
--- a/testData/src/pkg/TestSyntheticAccess.java
+++ b/testData/src/pkg/TestSyntheticAccess.java
@@ -1,9 +1,5 @@
 package pkg;
 
-/**
- * @author Alexandru-Constantin Bledea
- * @since March 20, 2016
- */
 class TestSyntheticAccess {
 
   private static int s;

From a8403429efcc52bf9aa8b5c0f2bcddadc6702248 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 21 Apr 2016 21:18:37 +0200
Subject: [PATCH 057/252] Cleanup (minor optimization)

---
 .../collectors/BytecodeMappingTracer.java     |  6 +-
 .../modules/decompiler/exps/Exprent.java      | 64 ++++++++-----------
 .../modules/decompiler/stats/Statement.java   |  7 +-
 3 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
index 94c2993..a72f988 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class BytecodeMappingTracer {
+  public static final BytecodeMappingTracer DUMMY = new BytecodeMappingTracer();
+
   private int currentSourceLine;
   private StructLineNumberTableAttribute lineNumberTable = null;
   private final Map<Integer, Integer> mapping = new HashMap<Integer, Integer>();  // bytecode offset, source line
@@ -116,4 +118,4 @@ public class BytecodeMappingTracer {
     }
     return res;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index 42abbb2..77b35b3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -15,13 +15,6 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -34,8 +27,10 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 
-public class Exprent implements IMatchable {
+import java.util.*;
+import java.util.Map.Entry;
 
+public class Exprent implements IMatchable {
   public static final int MULTIPLE_USES = 1;
   public static final int SIDE_EFFECTS_FREE = 2;
   public static final int BOTH_FLAGS = 3;
@@ -144,58 +139,53 @@ public class Exprent implements IMatchable {
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
+  @Override
   public IMatchable findObject(MatchNode matchNode, int index) {
-    
-    if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+    if (matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
       return null;
     }
 
     List<Exprent> lstAllExprents = getAllExprents();
-    
-    if(lstAllExprents == null || lstAllExprents.isEmpty()) {
+    if (lstAllExprents == null || lstAllExprents.isEmpty()) {
       return null;
     }
-    
+
     String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
-    if(position != null) {
-      if(position.matches("-?\\d+")) {
-        return lstAllExprents.get((lstAllExprents.size() + Integer.parseInt(position)) % lstAllExprents.size()); // care for negative positions
+    if (position != null) {
+      if (position.matches("-?\\d+")) {
+        return lstAllExprents
+          .get((lstAllExprents.size() + Integer.parseInt(position)) % lstAllExprents.size()); // care for negative positions
       }
-    } else if(index < lstAllExprents.size()) { // use 'index' parameter
+    }
+    else if (index < lstAllExprents.size()) { // use 'index' parameter
       return lstAllExprents.get(index);
     }
 
     return null;
   }
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-    
-    if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+    if (matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
       return false;
     }
-    
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
-      switch(rule.getKey()) {
-      case EXPRENT_TYPE:
-        if(this.type != ((Integer)rule.getValue().value).intValue()) {
-          return false;
-        }
-        break;
-      case EXPRENT_RET:
-        if(!engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
-          return false;
-        }
-        break;
+
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+      MatchProperties key = rule.getKey();
+      if (key == MatchProperties.EXPRENT_TYPE && this.type != ((Integer)rule.getValue().value).intValue()) {
+        return false;
+      }
+      if (key == MatchProperties.EXPRENT_RET && !engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
+        return false;
       }
-      
     }
-    
+
     return true;
   }
 
   @Override
   public String toString() {
-    return toJava(0, new BytecodeMappingTracer()).toString();
+    return toJava(0, BytecodeMappingTracer.DUMMY).toString();
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index ced701f..5efa6cf 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -494,11 +494,6 @@ public class Statement implements IMatchable {
     return false;
   }
 
-  // to be overwritten
-  public TextBuffer toJava() {
-    return toJava(0, new BytecodeMappingTracer());
-  }
-
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     throw new RuntimeException("not implemented");
   }

From 52b31bf325fd1ff5006841e5d4b7ce24275718f5 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 21 Apr 2016 21:22:36 +0200
Subject: [PATCH 058/252] [java, java-decompiler] type annotations in class
 files

Step 1: add top-level field/method/parameter annotations to stubs; include them in decompiled text.
---
 .../java/decompiler/main/ClassWriter.java     |  65 ++++--
 .../decompiler/exps/AnnotationExprent.java    |  31 ++-
 .../decompiler/exps/TypeAnnotation.java       |  67 ++++++
 .../attr/StructAnnotationAttribute.java       |   7 +-
 .../attr/StructAnnotationTypeAttribute.java   | 194 ------------------
 .../struct/attr/StructGeneralAttribute.java   |  19 +-
 .../attr/StructTypeAnnotationAttribute.java   | 107 ++++++++++
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TypeAnnotations$MixA.class    | Bin 0 -> 404 bytes
 testData/classes/pkg/TypeAnnotations$TA.class | Bin 0 -> 387 bytes
 testData/classes/pkg/TypeAnnotations.class    | Bin 0 -> 745 bytes
 testData/results/TypeAnnotations.dec          |  44 ++++
 testData/src/pkg/TypeAnnotations.java         |  22 ++
 13 files changed, 316 insertions(+), 241 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
 delete mode 100644 src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
 create mode 100644 src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
 create mode 100644 testData/classes/pkg/TypeAnnotations$MixA.class
 create mode 100644 testData/classes/pkg/TypeAnnotations$TA.class
 create mode 100644 testData/classes/pkg/TypeAnnotations.class
 create mode 100644 testData/results/TypeAnnotations.dec
 create mode 100644 testData/src/pkg/TypeAnnotations.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index cded67e..2386798 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -23,10 +23,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
@@ -43,9 +40,7 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.gen.generics.*;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class ClassWriter {
   private final PoolInterceptor interceptor;
@@ -311,7 +306,7 @@ public class ClassWriter {
       appendComment(buffer, "synthetic class", indent);
     }
 
-    appendAnnotations(buffer, cl, indent);
+    appendAnnotations(buffer, indent, cl, -1);
 
     buffer.appendIndent(indent);
 
@@ -407,7 +402,7 @@ public class ClassWriter {
       appendComment(buffer, "synthetic field", indent);
     }
 
-    appendAnnotations(buffer, fd, indent);
+    appendAnnotations(buffer, indent, fd, TypeAnnotation.FIELD);
 
     buffer.appendIndent(indent);
 
@@ -630,7 +625,7 @@ public class ClassWriter {
         appendComment(buffer, "bridge method", indent);
       }
 
-      appendAnnotations(buffer, mt, indent);
+      appendAnnotations(buffer, indent, mt, TypeAnnotation.METHOD_RETURN_TYPE);
 
       buffer.appendIndent(indent);
 
@@ -816,7 +811,7 @@ public class ClassWriter {
           StructAnnDefaultAttribute attr = (StructAnnDefaultAttribute)mt.getAttributes().getWithKey("AnnotationDefault");
           if (attr != null) {
             buffer.append(" default ");
-            buffer.append(attr.getDefaultValue().toJava(0, new BytecodeMappingTracer())); // dummy tracer
+            buffer.append(attr.getDefaultValue().toJava(0, BytecodeMappingTracer.DUMMY));
           }
         }
 
@@ -951,26 +946,30 @@ public class ClassWriter {
 
   private static final String[] ANNOTATION_ATTRIBUTES = {
     StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS};
+  private static final String[] PARAMETER_ANNOTATION_ATTRIBUTES = {
+    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
+  private static final String[] TYPE_ANNOTATION_ATTRIBUTES = {
+    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS};
 
-  private static void appendAnnotations(TextBuffer buffer, StructMember mb, int indent) {
-    BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one
+  private static void appendAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType) {
+    Set<String> filter = new HashSet<>();
 
     for (String name : ANNOTATION_ATTRIBUTES) {
       StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttributes().getWithKey(name);
       if (attribute != null) {
         for (AnnotationExprent annotation : attribute.getAnnotations()) {
-          buffer.append(annotation.toJava(indent, tracer_dummy)).appendLineSeparator();
+          String text = annotation.toJava(indent, BytecodeMappingTracer.DUMMY).toString();
+          filter.add(text);
+          buffer.append(text).appendLineSeparator();
         }
       }
     }
+
+    appendTypeAnnotations(buffer, indent, mb, targetType, -1, filter);
   }
 
-  private static final String[] PARAMETER_ANNOTATION_ATTRIBUTES = {
-    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS,
-    StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
-
   private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, int param) {
-    BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one
+    Set<String> filter = new HashSet<>();
 
     for (String name : PARAMETER_ANNOTATION_ATTRIBUTES) {
       StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttributes().getWithKey(name);
@@ -978,7 +977,33 @@ public class ClassWriter {
         List<List<AnnotationExprent>> annotations = attribute.getParamAnnotations();
         if (param < annotations.size()) {
           for (AnnotationExprent annotation : annotations.get(param)) {
-            buffer.append(annotation.toJava(0, tracer_dummy)).append(' ');
+            String text = annotation.toJava(-1, BytecodeMappingTracer.DUMMY).toString();
+            filter.add(text);
+            buffer.append(text).append(' ');
+          }
+        }
+      }
+    }
+
+    appendTypeAnnotations(buffer, -1, mt, TypeAnnotation.METHOD_PARAMETER, param, filter);
+  }
+
+  private static void appendTypeAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType, int index, Set<String> filter) {
+    for (String name : TYPE_ANNOTATION_ATTRIBUTES) {
+      StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)mb.getAttributes().getWithKey(name);
+      if (attribute != null) {
+        for (TypeAnnotation annotation : attribute.getAnnotations()) {
+          if (annotation.isTopLevel() && annotation.getTargetType() == targetType && (index < 0 || annotation.getIndex() == index)) {
+            String text = annotation.getAnnotation().toJava(indent, BytecodeMappingTracer.DUMMY).toString();
+            if (!filter.contains(text)) {
+              buffer.append(text);
+              if (indent < 0) {
+                buffer.append(' ');
+              }
+              else {
+                buffer.appendLineSeparator();
+              }
+            }
           }
         }
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
index 9b797a9..c17d921 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
@@ -47,22 +47,31 @@ public class AnnotationExprent extends Exprent {
     buffer.append('@');
     buffer.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(className)));
 
-    if (!parNames.isEmpty()) {
+    int type = getAnnotationType();
+
+    if (type != ANNOTATION_MARKER) {
       buffer.append('(');
-      if (getAnnotationType() == ANNOTATION_SINGLE_ELEMENT) {
-        buffer.append(parValues.get(0).toJava(indent + 1, tracer));
-      }
-      else {
-        for (int i = 0; i < parNames.size(); i++) {
+
+      boolean oneLiner = type == ANNOTATION_SINGLE_ELEMENT || indent < 0;
+
+      for (int i = 0; i < parNames.size(); i++) {
+        if (!oneLiner) {
           buffer.appendLineSeparator().appendIndent(indent + 1);
+        }
+
+        if (type != ANNOTATION_SINGLE_ELEMENT) {
           buffer.append(parNames.get(i));
           buffer.append(" = ");
-          buffer.append(parValues.get(i).toJava(0, tracer));
-
-          if (i < parNames.size() - 1) {
-            buffer.append(',');
-          }
         }
+
+        buffer.append(parValues.get(i).toJava(0, tracer));
+
+        if (i < parNames.size() - 1) {
+          buffer.append(',');
+        }
+      }
+
+      if (!oneLiner) {
         buffer.appendLineSeparator().appendIndent(indent);
       }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
new file mode 100644
index 0000000..93ab87b
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.java.decompiler.modules.decompiler.exps;
+
+public class TypeAnnotation {
+  public static final int CLASS_TYPE_PARAMETER = 0x00;
+  public static final int METHOD_TYPE_PARAMETER = 0x01;
+  public static final int SUPER_TYPE_REFERENCE = 0x10;
+  public static final int CLASS_TYPE_PARAMETER_BOUND = 0x11;
+  public static final int METHOD_TYPE_PARAMETER_BOUND = 0x12;
+  public static final int FIELD = 0x13;
+  public static final int METHOD_RETURN_TYPE = 0x14;
+  public static final int METHOD_RECEIVER = 0x15;
+  public static final int METHOD_PARAMETER = 0x16;
+  public static final int THROWS_REFERENCE = 0x17;
+  public static final int LOCAL_VARIABLE = 0x40;
+  public static final int RESOURCE_VARIABLE = 0x41;
+  public static final int CATCH_CLAUSE = 0x42;
+  public static final int EXPR_INSTANCEOF = 0x43;
+  public static final int EXPR_NEW = 0x44;
+  public static final int EXPR_CONSTRUCTOR_REF = 0x45;
+  public static final int EXPR_METHOD_REF = 0x46;
+  public static final int TYPE_ARG_CAST = 0x47;
+  public static final int TYPE_ARG_CONSTRUCTOR_CALL = 0x48;
+  public static final int TYPE_ARG_METHOD_CALL = 0x49;
+  public static final int TYPE_ARG_CONSTRUCTOR_REF = 0x4A;
+  public static final int TYPE_ARG_METHOD_REF = 0x4B;
+
+  private final int target;
+  private final byte[] path;
+  private final AnnotationExprent annotation;
+
+  public TypeAnnotation(int target, byte[] path, AnnotationExprent annotation) {
+    this.target = target;
+    this.path = path;
+    this.annotation = annotation;
+  }
+
+  public int getTargetType() {
+    return target >> 24;
+  }
+
+  public int getIndex() {
+    return target & 0x0FFFF;
+  }
+
+  public boolean isTopLevel() {
+    return path == null;
+  }
+
+  public AnnotationExprent getAnnotation() {
+    return annotation;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
index 73af88d..1380427 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@ import java.util.Collections;
 import java.util.List;
 
 public class StructAnnotationAttribute extends StructGeneralAttribute {
-
   private List<AnnotationExprent> annotations;
 
   @Override
@@ -143,7 +142,7 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
           newType = new VarType(elementType.type, 1, elementType.value);
         }
 
-        NewExprent newExpr = new NewExprent(newType, Collections.<Exprent>emptyList(), null);
+        NewExprent newExpr = new NewExprent(newType, Collections.emptyList(), null);
         newExpr.setDirectArrayInit(true);
         newExpr.setLstArrayElements(elements);
         return newExpr;
@@ -181,4 +180,4 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
   public List<AnnotationExprent> getAnnotations() {
     return annotations;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
deleted file mode 100644
index 59324e3..0000000
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.struct.attr;
-
-import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
-import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class StructAnnotationTypeAttribute extends StructGeneralAttribute {
-
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_CLASS = 0x00;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_METHOD = 0x01;
-  private static final int ANNOTATION_TARGET_TYPE_EXTENDS_IMPLEMENTS = 0x10;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_CLASS_BOUND = 0x11;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_METHOD_BOUND = 0x12;
-  private static final int ANNOTATION_TARGET_TYPE_FIELD = 0x13;
-  private static final int ANNOTATION_TARGET_TYPE_RETURN = 0x14;
-  private static final int ANNOTATION_TARGET_TYPE_RECEIVER = 0x15;
-  private static final int ANNOTATION_TARGET_TYPE_FORMAL = 0x16;
-  private static final int ANNOTATION_TARGET_TYPE_THROWS = 0x17;
-  private static final int ANNOTATION_TARGET_TYPE_LOCAL_VARIABLE = 0x40;
-  private static final int ANNOTATION_TARGET_TYPE_RESOURCE_VARIABLE = 0x41;
-  private static final int ANNOTATION_TARGET_TYPE_EXCEPTION = 0x42;
-  private static final int ANNOTATION_TARGET_TYPE_INSTANCEOF = 0x43;
-  private static final int ANNOTATION_TARGET_TYPE_NEW = 0x44;
-  private static final int ANNOTATION_TARGET_TYPE_DOUBLE_COLON_NEW = 0x45;
-  private static final int ANNOTATION_TARGET_TYPE_DOUBLE_COLON_ID = 0x46;
-  private static final int ANNOTATION_TARGET_TYPE_CAST = 0x47;
-  private static final int ANNOTATION_TARGET_TYPE_INVOCATION_CONSTRUCTOR = 0x48;
-  private static final int ANNOTATION_TARGET_TYPE_INVOCATION_METHOD = 0x49;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_NEW = 0x4A;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_ID = 0x4B;
-
-  private static final int ANNOTATION_TARGET_UNION_TYPE_PARAMETER = 1;
-  private static final int ANNOTATION_TARGET_UNION_SUPERTYPE = 2;
-  private static final int ANNOTATION_TARGET_UNION_TYPE_PARAMETER_BOUND = 3;
-  private static final int ANNOTATION_TARGET_UNION_EMPTY = 4;
-  private static final int ANNOTATION_TARGET_UNION_FORMAL_PARAMETER = 5;
-  private static final int ANNOTATION_TARGET_UNION_THROWS = 6;
-  private static final int ANNOTATION_TARGET_UNION_LOCAL_VAR = 7;
-  private static final int ANNOTATION_TARGET_UNION_CATCH = 8;
-  private static final int ANNOTATION_TARGET_UNION_OFFSET = 9;
-  private static final int ANNOTATION_TARGET_UNION_TYPE_ARGUMENT = 10;
-
-  @SuppressWarnings("FieldCanBeLocal") private List<AnnotationLocation> locations;
-  @SuppressWarnings("FieldCanBeLocal") private List<AnnotationExprent> annotations;
-
-  @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
-    int len = data.readUnsignedByte();
-    if (len > 0) {
-      locations = new ArrayList<AnnotationLocation>(len);
-      annotations = new ArrayList<AnnotationExprent>(len);
-      for (int i = 0; i < len; i++) {
-        locations.add(parseAnnotationLocation(data));
-        annotations.add(StructAnnotationAttribute.parseAnnotation(data, pool));
-      }
-    }
-    else {
-      locations = Collections.emptyList();
-      annotations = Collections.emptyList();
-    }
-  }
-
-  private static AnnotationLocation parseAnnotationLocation(DataInputStream data) throws IOException {
-    AnnotationLocation ann_location = new AnnotationLocation();
-
-    // target type
-    ann_location.target_type = data.readUnsignedByte();
-
-    // target union
-    switch (ann_location.target_type) {
-      case ANNOTATION_TARGET_TYPE_GENERIC_CLASS:
-      case ANNOTATION_TARGET_TYPE_GENERIC_METHOD:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_TYPE_PARAMETER;
-        break;
-      case ANNOTATION_TARGET_TYPE_EXTENDS_IMPLEMENTS:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_SUPERTYPE;
-        break;
-      case ANNOTATION_TARGET_TYPE_GENERIC_CLASS_BOUND:
-      case ANNOTATION_TARGET_TYPE_GENERIC_METHOD_BOUND:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_TYPE_PARAMETER_BOUND;
-        break;
-      case ANNOTATION_TARGET_TYPE_FIELD:
-      case ANNOTATION_TARGET_TYPE_RETURN:
-      case ANNOTATION_TARGET_TYPE_RECEIVER:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_EMPTY;
-        break;
-      case ANNOTATION_TARGET_TYPE_FORMAL:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_FORMAL_PARAMETER;
-        break;
-      case ANNOTATION_TARGET_TYPE_THROWS:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_THROWS;
-        break;
-      case ANNOTATION_TARGET_TYPE_LOCAL_VARIABLE:
-      case ANNOTATION_TARGET_TYPE_RESOURCE_VARIABLE:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_LOCAL_VAR;
-        break;
-      case ANNOTATION_TARGET_TYPE_EXCEPTION:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_CATCH;
-        break;
-      case ANNOTATION_TARGET_TYPE_INSTANCEOF:
-      case ANNOTATION_TARGET_TYPE_NEW:
-      case ANNOTATION_TARGET_TYPE_DOUBLE_COLON_NEW:
-      case ANNOTATION_TARGET_TYPE_DOUBLE_COLON_ID:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_OFFSET;
-        break;
-      case ANNOTATION_TARGET_TYPE_CAST:
-      case ANNOTATION_TARGET_TYPE_INVOCATION_CONSTRUCTOR:
-      case ANNOTATION_TARGET_TYPE_INVOCATION_METHOD:
-      case ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_NEW:
-      case ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_ID:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_TYPE_ARGUMENT;
-        break;
-      default:
-        throw new RuntimeException("Unknown target type in a type annotation!");
-    }
-
-    // target union data
-
-    switch (ann_location.target_union) {
-      case ANNOTATION_TARGET_UNION_TYPE_PARAMETER:
-      case ANNOTATION_TARGET_UNION_FORMAL_PARAMETER:
-        ann_location.data = new int[]{data.readUnsignedByte()};
-        break;
-      case ANNOTATION_TARGET_UNION_SUPERTYPE:
-      case ANNOTATION_TARGET_UNION_THROWS:
-      case ANNOTATION_TARGET_UNION_CATCH:
-      case ANNOTATION_TARGET_UNION_OFFSET:
-        ann_location.data = new int[]{data.readUnsignedShort()};
-        break;
-      case ANNOTATION_TARGET_UNION_TYPE_PARAMETER_BOUND:
-        ann_location.data = new int[]{data.readUnsignedByte(), data.readUnsignedByte()};
-        break;
-      case ANNOTATION_TARGET_UNION_EMPTY:
-        break;
-      case ANNOTATION_TARGET_UNION_LOCAL_VAR:
-        int table_length = data.readUnsignedShort();
-
-        ann_location.data = new int[table_length * 3 + 1];
-        ann_location.data[0] = table_length;
-
-        for (int i = 0; i < table_length; ++i) {
-          ann_location.data[3 * i + 1] = data.readUnsignedShort();
-          ann_location.data[3 * i + 2] = data.readUnsignedShort();
-          ann_location.data[3 * i + 3] = data.readUnsignedShort();
-        }
-        break;
-      case ANNOTATION_TARGET_UNION_TYPE_ARGUMENT:
-        ann_location.data = new int[]{data.readUnsignedShort(), data.readUnsignedByte()};
-    }
-
-    // target path
-    int path_length = data.readUnsignedByte();
-
-    ann_location.target_path_kind = new int[path_length];
-    ann_location.target_argument_index = new int[path_length];
-
-    for (int i = 0; i < path_length; ++i) {
-      ann_location.target_path_kind[i] = data.readUnsignedByte();
-      ann_location.target_argument_index[i] = data.readUnsignedByte();
-    }
-
-    return ann_location;
-  }
-
-  private static class AnnotationLocation {
-    public int target_type;
-    public int target_union;
-    public int[] data;
-    public int[] target_path_kind;
-    public int[] target_argument_index;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index dc0ebc6..73cc535 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import java.io.IOException;
   }
 */
 public class StructGeneralAttribute {
-
   public static final String ATTRIBUTE_CODE = "Code";
   public static final String ATTRIBUTE_INNER_CLASSES = "InnerClasses";
   public static final String ATTRIBUTE_SIGNATURE = "Signature";
@@ -73,17 +72,14 @@ public class StructGeneralAttribute {
     else if (ATTRIBUTE_ENCLOSING_METHOD.equals(name)) {
       attr = new StructEnclosingMethodAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS.equals(name) ||
-             ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS.equals(name)) {
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS.equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS.equals(name)) {
       attr = new StructAnnotationAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS.equals(name) ||
-             ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS.equals(name)) {
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS.equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS.equals(name)) {
       attr = new StructAnnotationParameterAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS.equals(name) ||
-             ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(name)) {
-      attr = new StructAnnotationTypeAttribute();
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS.equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(name)) {
+      attr = new StructTypeAnnotationAttribute();
     }
     else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name)) {
       attr = new StructLocalVariableTableAttribute();
@@ -91,8 +87,7 @@ public class StructGeneralAttribute {
     else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
       attr = new StructBootstrapMethodsAttribute();
     }
-    else if (ATTRIBUTE_SYNTHETIC.equals(name) ||
-             ATTRIBUTE_DEPRECATED.equals(name)) {
+    else if (ATTRIBUTE_SYNTHETIC.equals(name) || ATTRIBUTE_DEPRECATED.equals(name)) {
       attr = new StructGeneralAttribute();
     }
     else if (ATTRIBUTE_LINE_NUMBER_TABLE.equals(name)) {
@@ -123,4 +118,4 @@ public class StructGeneralAttribute {
   public String getName() {
     return name;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
new file mode 100644
index 0000000..1cb9485
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.java.decompiler.struct.attr;
+
+import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.TypeAnnotation;
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class StructTypeAnnotationAttribute extends StructGeneralAttribute {
+  private List<TypeAnnotation> annotations = Collections.emptyList();
+
+  @Override
+  public void initContent(ConstantPool pool) throws IOException {
+    DataInputStream data = stream();
+
+    int len = data.readUnsignedShort();
+    if (len > 0) {
+      annotations = new ArrayList<>(len);
+      for (int i = 0; i < len; i++) {
+        annotations.add(parse(data, pool));
+      }
+    }
+    else {
+      annotations = Collections.emptyList();
+    }
+  }
+
+  private static TypeAnnotation parse(DataInputStream data, ConstantPool pool) throws IOException {
+    int targetType = data.readUnsignedByte();
+    int target = targetType << 24;
+
+    switch (targetType) {
+      case TypeAnnotation.CLASS_TYPE_PARAMETER:
+      case TypeAnnotation.METHOD_TYPE_PARAMETER:
+      case TypeAnnotation.METHOD_PARAMETER:
+        target |= data.readUnsignedByte();
+        break;
+
+      case TypeAnnotation.SUPER_TYPE_REFERENCE:
+      case TypeAnnotation.CLASS_TYPE_PARAMETER_BOUND:
+      case TypeAnnotation.METHOD_TYPE_PARAMETER_BOUND:
+      case TypeAnnotation.THROWS_REFERENCE:
+      case TypeAnnotation.CATCH_CLAUSE:
+      case TypeAnnotation.EXPR_INSTANCEOF:
+      case TypeAnnotation.EXPR_NEW:
+      case TypeAnnotation.EXPR_CONSTRUCTOR_REF:
+      case TypeAnnotation.EXPR_METHOD_REF:
+        target |= data.readUnsignedShort();
+        break;
+
+      case TypeAnnotation.TYPE_ARG_CAST:
+      case TypeAnnotation.TYPE_ARG_CONSTRUCTOR_CALL:
+      case TypeAnnotation.TYPE_ARG_METHOD_CALL:
+      case TypeAnnotation.TYPE_ARG_CONSTRUCTOR_REF:
+      case TypeAnnotation.TYPE_ARG_METHOD_REF:
+        data.skipBytes(3);
+        break;
+
+      case TypeAnnotation.LOCAL_VARIABLE:
+      case TypeAnnotation.RESOURCE_VARIABLE:
+        data.skipBytes(data.readUnsignedShort() * 6);
+        break;
+
+      case TypeAnnotation.FIELD:
+      case TypeAnnotation.METHOD_RETURN_TYPE:
+      case TypeAnnotation.METHOD_RECEIVER:
+        break;
+
+      default:
+        throw new RuntimeException("unknown target type: " + targetType);
+    }
+
+    int pathLength = data.readUnsignedByte();
+    byte[] path = null;
+    if (pathLength > 0) {
+      path = new byte[2 * pathLength];
+      data.readFully(path);
+    }
+
+    AnnotationExprent annotation = StructAnnotationAttribute.parseAnnotation(data, pool);
+
+    return new TypeAnnotation(target, path, annotation);
+  }
+
+  public List<TypeAnnotation> getAnnotations() {
+    return annotations;
+  }
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 84434a9..3d14216 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -84,6 +84,7 @@ public class SingleClassesTest {
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
   @Test public void testMoreAnnotations() { doTest("pkg/MoreAnnotations"); }
+  @Test public void testTypeAnnotations() { doTest("pkg/TypeAnnotations"); }
   @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
   @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
   @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
diff --git a/testData/classes/pkg/TypeAnnotations$MixA.class b/testData/classes/pkg/TypeAnnotations$MixA.class
new file mode 100644
index 0000000000000000000000000000000000000000..2795bce3a3ce50fbdd6f761accd7a5745bb9129a
GIT binary patch
literal 404
zcmZutO-sW-5Pg#-CdR7OR?ve8B1JFe;>}ah6bco^L_s{rwk%<5x+%$~=wI{T5Aa8c
z69f~ahxuUMn|U+y_5JY)-~v4tTP}87>=K-%NJ~lRot}+nVkv@D=p=|tu5@xq@T08E
zr*f#$iW9#t<Us4p2%|DxoL3EmgZok&HJ6X7P?NMtARIP^ioebv7I`8K&p%#`hpC)P
zZ7Mw`Im1ynz9x9_(_Q%T5QQ$fg#E>968zif<VL*>2=;GikF=KgRVs=?7KBcH-|b{3
zr-pD;mm1sEClb0VRQdqHVr%g`$!0w`oVBpV-hvB{;~wMdZ1yuO2_GAkYoo)E&t<|U
Hw)@@>xdm&8

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TypeAnnotations$TA.class b/testData/classes/pkg/TypeAnnotations$TA.class
new file mode 100644
index 0000000000000000000000000000000000000000..d02171e1070d5a4a5a106a5c0ebe06920d3b2385
GIT binary patch
literal 387
zcmZutO-sW-5Pj38CdRL5MerbkNYRVAc=J>wf*>d+3gSVwWe8iho04n_{xuK&0DqJ?
zxtJh5%<S;y&Ad1J{qy++;1WY0TRtKmyM)0~nVJdvXXke_wN$ZDHjh(RYMWmX!nCN%
zDc@+*aI%jDkF717a=Nh9MKeG+e5|e0bAHy9o|rCyaMW3<{wCv0l{q`vf3mut7@o6r
zjh>K#?ByYOdrA`@dxV3<dmjIDa+-|^y(VqmTFd3NQB}niA!={BpUimb2*)kdanzng
v7_Lwl0iqz$moFrb;9($DA8V3(@Da!xNq=3!dj&B<Y+y&wP!KVO?NRUxQa)$h

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TypeAnnotations.class b/testData/classes/pkg/TypeAnnotations.class
new file mode 100644
index 0000000000000000000000000000000000000000..0e8e34a2abe9b35f51d0ed5a687f3cc98fcb6348
GIT binary patch
literal 745
zcmZuuO;6iE6r6QF96|_b5-5dIQiu@cKm_8}s#1hhDN@=>#p-<nOSIJ9MD{vr{}UHZ
zNF4Y9{HUt438bx+gLn76H#2YE^W*RP2LPvNmyyGckCu<OK6VB2pY_kKK&5AliqArs
zBr5T-C*TE4dsoK-_5QV-$WAEDuybx>ZHDg!cD|*?>PYp>L??O>s^HgHb&VNWY4yk?
z0vrADk6|a1ZU<eG3lkZpN}znDRe0I5q`F=w0$W+x|0FjTO1cRsTAhhW^DJ2WppCX4
z1#$=PzH`#E(Iwlg_O(%8(rBRKK+-oGM;wxvp1^XfY#N(qM-d(64|<NhG?uZ9lvOcp
zpO4b`LVePX-ONmQ<d#)I15JU(f(;1N{;u=u;96Z+?rH(BJ^M53i%LNkEqMHu;OSur
zWzamM6^I5<VYHH<%F-%J9%?KtGx=gxsQ-hVr<@pF6S2nEHgCbZaCirC%ZI=^&*C&$
z<m)9iDD0qHPtaWL@FoMCH)_sJy&`0joEg_eo+D*jtW7OeAzas|d0rE`Jte%M5unaE
O&#$mwg3r6OU-|=`bCk3I

literal 0
HcmV?d00001

diff --git a/testData/results/TypeAnnotations.dec b/testData/results/TypeAnnotations.dec
new file mode 100644
index 0000000..590d894
--- /dev/null
+++ b/testData/results/TypeAnnotations.dec
@@ -0,0 +1,44 @@
+package pkg;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+class TypeAnnotations {
+   @TypeAnnotations.TA("field type")
+   private String f1;
+   @TypeAnnotations.MixA("field and type")
+   private String f2;
+
+   @TypeAnnotations.TA("return type")
+   int m1() {
+      return 42;// 18
+   }
+
+   void m2(@TypeAnnotations.TA("parameter") int var1) {
+   }// 21
+
+   @Target({ElementType.FIELD, ElementType.TYPE_USE})
+   @interface MixA {
+      String value();
+   }
+
+   @Target({ElementType.TYPE_USE})
+   @interface TA {
+      String value();
+   }
+}
+
+class 'pkg/TypeAnnotations' {
+   method 'm1 ()I' {
+      0      13
+      2      13
+   }
+
+   method 'm2 (I)V' {
+      0      17
+   }
+}
+
+Lines mapping:
+18 <-> 14
+21 <-> 18
diff --git a/testData/src/pkg/TypeAnnotations.java b/testData/src/pkg/TypeAnnotations.java
new file mode 100644
index 0000000..0760dde
--- /dev/null
+++ b/testData/src/pkg/TypeAnnotations.java
@@ -0,0 +1,22 @@
+package pkg;
+
+import java.lang.annotation.*;
+import java.util.*;
+
+class TypeAnnotations {
+  @Target(ElementType.TYPE_USE)
+  @interface TA { String value(); }
+
+  @Target({ElementType.FIELD, ElementType.TYPE_USE})
+  @interface MixA { String value(); }
+
+  private @TA("field type") String f1;
+
+  private @MixA("field and type") String f2;
+
+  @TA("return type") int m1() {
+    return 42;
+  }
+
+  void m2(@TA("parameter") int i) { }
+}
\ No newline at end of file

From aaca7aa494e23d0e9f41636591bd07b0c6f27cef Mon Sep 17 00:00:00 2001
From: dw <dw@ge40>
Date: Tue, 26 Apr 2016 15:13:24 +0200
Subject: [PATCH 059/252] Supports Asserts that have the throw in the else
 clause instead of the if clause

---
 .../java/decompiler/main/AssertProcessor.java | 95 ++++++++++++++-----
 1 file changed, 69 insertions(+), 26 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
index abb51ce..18f1ca9 100644
--- a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
@@ -157,14 +157,24 @@ public class AssertProcessor {
 
   private static boolean replaceAssertion(Statement parent, IfStatement stat, String classname, String key) {
 
+    boolean throwInIf = true;
     Statement ifstat = stat.getIfstat();
     InvocationExprent throwError = isAssertionError(ifstat);
 
     if (throwError == null) {
-      return false;
+      //check else:
+      Statement elsestat = stat.getElsestat();
+      throwError = isAssertionError(elsestat);
+      if (throwError == null) {
+          return false;
+      }
+      else {
+          throwInIf = false;
+      }
     }
 
-    Object[] exprres = getAssertionExprent(stat.getHeadexprent().getCondition().copy(), classname, key);
+
+    Object[] exprres = getAssertionExprent(stat.getHeadexprent().getCondition().copy(), classname, key, throwInIf);
     if (!(Boolean)exprres[1]) {
       return false;
     }
@@ -172,10 +182,17 @@ public class AssertProcessor {
     List<Exprent> lstParams = new ArrayList<Exprent>();
 
     Exprent ascond = null, retcond = null;
-    if (exprres[0] != null) {
-      ascond = new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, (Exprent)exprres[0], throwError.bytecode);
-      retcond = SecondaryFunctionsHelper.propagateBoolNot(ascond);
+    if (throwInIf) {
+      if (exprres[0] != null) {
+        ascond = new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, (Exprent)exprres[0], throwError.bytecode);
+        retcond = SecondaryFunctionsHelper.propagateBoolNot(ascond);
+      }
     }
+    else {
+        ascond =  (Exprent) exprres[0];
+        retcond = ascond;
+    }
+
 
     lstParams.add(retcond == null ? ascond : retcond);
     if (!throwError.getLstParameters().isEmpty()) {
@@ -202,7 +219,12 @@ public class AssertProcessor {
       }
       lstStatements.add(newstat);
       if (stat.iftype == IfStatement.IFTYPE_IFELSE) {
-        lstStatements.add(stat.getElsestat());
+        if (throwInIf) {
+          lstStatements.add(stat.getElsestat());
+        }
+        else {
+          lstStatements.add(stat.getIfstat());
+        }
       }
 
       SequenceStatement sequence = new SequenceStatement(lstStatements);
@@ -213,10 +235,16 @@ public class AssertProcessor {
                                                              sequence.getStats().get(i), sequence.getStats().get(i + 1)));
       }
 
-      if (stat.iftype == IfStatement.IFTYPE_IFELSE) {
-        Statement ifelse = stat.getElsestat();
+      if (stat.iftype == IfStatement.IFTYPE_IFELSE || !throwInIf) {
+        Statement stmts;
+        if (throwInIf) {
+          stmts = stat.getElsestat();
+        }
+        else {
+          stmts = stat.getIfstat();
+        }
 
-        List<StatEdge> lstSuccs = ifelse.getAllSuccessorEdges();
+        List<StatEdge> lstSuccs = stmts.getAllSuccessorEdges();
         if (!lstSuccs.isEmpty()) {
           StatEdge endedge = lstSuccs.get(0);
           if (endedge.closure == stat) {
@@ -255,16 +283,21 @@ public class AssertProcessor {
     return null;
   }
 
-  private static Object[] getAssertionExprent(Exprent exprent, String classname, String key) {
+  private static Object[] getAssertionExprent(Exprent exprent, String classname, String key, boolean throwInIf) {
 
     if (exprent.type == Exprent.EXPRENT_FUNCTION) {
+      int desiredOperation = FunctionExprent.FUNCTION_CADD;
+      if (!throwInIf) {
+        desiredOperation = FunctionExprent.FUNCTION_COR;
+      }
+
       FunctionExprent fexpr = (FunctionExprent)exprent;
-      if (fexpr.getFuncType() == FunctionExprent.FUNCTION_CADD) {
+      if (fexpr.getFuncType() == desiredOperation) {
 
         for (int i = 0; i < 2; i++) {
           Exprent param = fexpr.getLstOperands().get(i);
 
-          if (isAssertionField(param, classname, key)) {
+          if (isAssertionField(param, classname, key, throwInIf)) {
             return new Object[]{fexpr.getLstOperands().get(1 - i), true};
           }
         }
@@ -272,7 +305,7 @@ public class AssertProcessor {
         for (int i = 0; i < 2; i++) {
           Exprent param = fexpr.getLstOperands().get(i);
 
-          Object[] res = getAssertionExprent(param, classname, key);
+          Object[] res = getAssertionExprent(param, classname, key, throwInIf);
           if ((Boolean)res[1]) {
             if (param != res[0]) {
               fexpr.getLstOperands().set(i, (Exprent)res[0]);
@@ -281,7 +314,7 @@ public class AssertProcessor {
           }
         }
       }
-      else if (isAssertionField(fexpr, classname, key)) {
+      else if (isAssertionField(fexpr, classname, key, throwInIf)) {
         // assert false;
         return new Object[]{null, true};
       }
@@ -290,20 +323,30 @@ public class AssertProcessor {
     return new Object[]{exprent, false};
   }
 
-  private static boolean isAssertionField(Exprent exprent, String classname, String key) {
-
-    if (exprent.type == Exprent.EXPRENT_FUNCTION) {
-      FunctionExprent fparam = (FunctionExprent)exprent;
-      if (fparam.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT &&
-          fparam.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
-        FieldExprent fdparam = (FieldExprent)fparam.getLstOperands().get(0);
-        if (classname.equals(fdparam.getClassname())
-            && key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString))) {
-          return true;
+  private static boolean isAssertionField(Exprent exprent, String classname, String key, boolean throwInIf) {
+    if (throwInIf) {
+      if (exprent.type == Exprent.EXPRENT_FUNCTION) {
+        FunctionExprent fparam = (FunctionExprent)exprent;
+        if (fparam.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT &&
+            fparam.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
+          FieldExprent fdparam = (FieldExprent)fparam.getLstOperands().get(0);
+          if (classname.equals(fdparam.getClassname())
+              && key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString))) {
+            return true;
+          }
         }
       }
+      return false;
+    }
+    else {
+      if (exprent.type == Exprent.EXPRENT_FIELD) {
+        FieldExprent fdparam = (FieldExprent) exprent;
+        if (classname.equals(fdparam.getClassname())
+            && key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString))) {
+            return true;
+        }
+      }
+      return false;
     }
-
-    return false;
   }
 }

From ffd54ff4f47019a7647b66877e2593f419fadc62 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Wed, 18 May 2016 11:57:04 +0200
Subject: [PATCH 060/252] anonym -> lambda

---
 .../decompiler/code/InstructionSequence.java  | 45 +++++++++----------
 .../main/collectors/ImportCollector.java      | 12 +++--
 .../modules/decompiler/DomHelper.java         |  6 +--
 .../java/decompiler/SingleClassesTest.java    |  7 +--
 4 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
index bce3b60..cde9284 100644
--- a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
@@ -186,35 +186,32 @@ public int getOffset(int index) {
 
   public void sortHandlers(final StructContext context) {
 
-    Collections.sort(exceptionTable.getHandlers(), new Comparator<ExceptionHandler>() {
+    Collections.sort(exceptionTable.getHandlers(), (handler0, handler1) -> {
 
-      public int compare(ExceptionHandler handler0, ExceptionHandler handler1) {
-
-        if (handler0.to == handler1.to) {
-          if (handler0.exceptionClass == null) {
-            return 1;
-          }
-          else {
-            if (handler1.exceptionClass == null) {
-              return -1;
-            }
-            else if (handler0.exceptionClass.equals(handler1.exceptionClass)) {
-              return (handler0.from > handler1.from) ? -1 : 1; // invalid code
-            }
-            else {
-              if (Util.instanceOf(context, handler0.exceptionClass, handler1.exceptionClass)) {
-                return -1;
-              }
-              else {
-                return 1;
-              }
-            }
-          }
+      if (handler0.to == handler1.to) {
+        if (handler0.exceptionClass == null) {
+          return 1;
         }
         else {
-          return (handler0.to > handler1.to) ? 1 : -1;
+          if (handler1.exceptionClass == null) {
+            return -1;
+          }
+          else if (handler0.exceptionClass.equals(handler1.exceptionClass)) {
+            return (handler0.from > handler1.from) ? -1 : 1; // invalid code
+          }
+          else {
+            if (Util.instanceOf(context, handler0.exceptionClass, handler1.exceptionClass)) {
+              return -1;
+            }
+            else {
+              return 1;
+            }
+          }
         }
       }
+      else {
+        return (handler0.to > handler1.to) ? 1 : -1;
+      }
     });
   }
 
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index ada6abc..48f8db8 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -133,14 +133,12 @@ public class ImportCollector {
   private List<String> packImports() {
     List<Entry<String, String>> lst = new ArrayList<Entry<String, String>>(mapSimpleNames.entrySet());
 
-    Collections.sort(lst, new Comparator<Entry<String, String>>() {
-      public int compare(Entry<String, String> par0, Entry<String, String> par1) {
-        int res = par0.getValue().compareTo(par1.getValue());
-        if (res == 0) {
-          res = par0.getKey().compareTo(par1.getKey());
-        }
-        return res;
+    Collections.sort(lst, (par0, par1) -> {
+      int res = par0.getValue().compareTo(par1.getValue());
+      if (res == 0) {
+        res = par0.getKey().compareTo(par1.getKey());
       }
+      return res;
     });
 
     List<String> res = new ArrayList<String>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
index c93be38..00eea78 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
@@ -191,11 +191,7 @@ public class DomHelper {
         lstPosts.add(stt.id);
       }
 
-      Collections.sort(lstPosts, new Comparator<Integer>() {
-        public int compare(Integer o1, Integer o2) {
-          return mapSortOrder.get(o1).compareTo(mapSortOrder.get(o2));
-        }
-      });
+      Collections.sort(lstPosts, (o1, o2) -> mapSortOrder.get(o1).compareTo(mapSortOrder.get(o2)));
 
       if (lstPosts.size() > 1 && lstPosts.get(0).intValue() == st.id) {
         lstPosts.add(lstPosts.remove(0));
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 3d14216..f20ae55 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -124,11 +124,8 @@ public class SingleClassesTest {
     File parent = classFile.getParentFile();
     if (parent != null) {
       final String pattern = classFile.getName().replace(".class", "") + "\\$.+\\.class";
-      File[] inner = parent.listFiles(new FilenameFilter() {
-        @Override
-        public boolean accept(File dir, String name) {
-          return name.matches(pattern);
-        }
+      File[] inner = parent.listFiles((dir, name) -> {
+        return name.matches(pattern);
       });
       if (inner != null) Collections.addAll(files, inner);
     }

From f0e7494a6525181eed83ff69548a7f7b62f76369 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 20 May 2016 19:40:42 +0200
Subject: [PATCH 061/252] Cleanup (formatting; typos)

---
 .../main/collectors/ImportCollector.java      | 89 +++++++++----------
 1 file changed, 42 insertions(+), 47 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 48f8db8..b0c311f 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,24 +24,25 @@ import org.jetbrains.java.decompiler.struct.StructContext;
 import java.util.*;
 import java.util.Map.Entry;
 
-
 public class ImportCollector {
-
   private static final String JAVA_LANG_PACKAGE = "java.lang";
 
   private final Map<String, String> mapSimpleNames = new HashMap<String, String>();
   private final Set<String> setNotImportedNames = new HashSet<String>();
-  private String currentPackageSlash = "";
-  private String currentPackagePoint = "";
+  private final String currentPackageSlash;
+  private final String currentPackagePoint;
 
   public ImportCollector(ClassNode root) {
-
-    String clname = root.classStruct.qualifiedName;
-    int index = clname.lastIndexOf("/");
+    String clName = root.classStruct.qualifiedName;
+    int index = clName.lastIndexOf('/');
     if (index >= 0) {
-      currentPackageSlash = clname.substring(0, index);
-      currentPackagePoint = currentPackageSlash.replace('/', '.');
-      currentPackageSlash += "/";
+      String packageName = clName.substring(0, index);
+      currentPackageSlash = packageName + '/';
+      currentPackagePoint = packageName.replace('/', '.');
+    }
+    else {
+      currentPackageSlash = "";
+      currentPackagePoint = "";
     }
   }
 
@@ -49,42 +50,38 @@ public class ImportCollector {
     return getShortName(fullname, true);
   }
 
-  public String getShortName(String fullname, boolean imported) {
-
-    ClassesProcessor clproc = DecompilerContext.getClassProcessor();
-    ClassNode node = clproc.getMapRootClasses().get(fullname.replace('.', '/'));
-
-    String retname = null;
+  public String getShortName(String fullName, boolean imported) {
+    ClassesProcessor clProc = DecompilerContext.getClassProcessor();
+    ClassNode node = clProc.getMapRootClasses().get(fullName.replace('.', '/'));
 
+    String result = null;
     if (node != null && node.classStruct.isOwn()) {
-
-      retname = node.simpleName;
+      result = node.simpleName;
 
       while (node.parent != null && node.type == ClassNode.CLASS_MEMBER) {
-        retname = node.parent.simpleName + "." + retname;
+        result = node.parent.simpleName + '.' + result;
         node = node.parent;
       }
 
       if (node.type == ClassNode.CLASS_ROOT) {
-        fullname = node.classStruct.qualifiedName;
-        fullname = fullname.replace('/', '.');
+        fullName = node.classStruct.qualifiedName;
+        fullName = fullName.replace('/', '.');
       }
       else {
-        return retname;
+        return result;
       }
     }
     else {
-      fullname = fullname.replace('$', '.');
+      fullName = fullName.replace('$', '.');
     }
 
-    String nshort = fullname;
-    String npackage = "";
+    String shortName = fullName;
+    String packageName = "";
 
-    int lastpoint = fullname.lastIndexOf(".");
-
-    if (lastpoint >= 0) {
-      nshort = fullname.substring(lastpoint + 1);
-      npackage = fullname.substring(0, lastpoint);
+    int lastDot = fullName.lastIndexOf('.');
+    if (lastDot >= 0) {
+      shortName = fullName.substring(lastDot + 1);
+      packageName = fullName.substring(0, lastDot);
     }
 
     StructContext context = DecompilerContext.getStructContext();
@@ -92,42 +89,40 @@ public class ImportCollector {
     // check for another class which could 'shadow' this one. Two cases:
     // 1) class with the same short name in the current package
     // 2) class with the same short name in the default package
-    boolean existsDefaultClass = (context.getClass(currentPackageSlash + nshort) != null
-                                  && !npackage.equals(currentPackagePoint)) // current package
-                                 || (context.getClass(nshort) != null 
-                                  && !currentPackagePoint.isEmpty());  // default package
+    boolean existsDefaultClass =
+      (context.getClass(currentPackageSlash + shortName) != null && !packageName.equals(currentPackagePoint)) || // current package
+      (context.getClass(shortName) != null && !currentPackagePoint.isEmpty());  // default package
 
     if (existsDefaultClass ||
-        (mapSimpleNames.containsKey(nshort) && !npackage.equals(mapSimpleNames.get(nshort)))) {
+        (mapSimpleNames.containsKey(shortName) && !packageName.equals(mapSimpleNames.get(shortName)))) {
       //  don't return full name because if the class is a inner class, full name refers to the parent full name, not the child full name
-      return retname == null ? fullname : (npackage + "." + retname);
+      return result == null ? fullName : (packageName + "." + result);
     }
-    else if (!mapSimpleNames.containsKey(nshort)) {
-      mapSimpleNames.put(nshort, npackage);
-
+    else if (!mapSimpleNames.containsKey(shortName)) {
+      mapSimpleNames.put(shortName, packageName);
       if (!imported) {
-        setNotImportedNames.add(nshort);
+        setNotImportedNames.add(shortName);
       }
     }
 
-    return retname == null ? nshort : retname;
+    return result == null ? shortName : result;
   }
 
   public int writeImports(TextBuffer buffer) {
-    int importlines_written = 0;
+    int importLinesWritten = 0;
 
     List<String> imports = packImports();
 
     for (String s : imports) {
       buffer.append("import ");
       buffer.append(s);
-      buffer.append(";");
+      buffer.append(';');
       buffer.appendLineSeparator();
 
-      importlines_written++;
+      importLinesWritten++;
     }
 
-    return importlines_written;
+    return importLinesWritten;
   }
 
   private List<String> packImports() {
@@ -153,4 +148,4 @@ public class ImportCollector {
 
     return res;
   }
-}
+}
\ No newline at end of file

From 2867a8d41fc0e398de4160b9b4f3b4bebbab9b75 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 20 May 2016 19:41:40 +0200
Subject: [PATCH 062/252] Cleanup (formatting; typos)

---
 .../java/decompiler/main/collectors/ImportCollector.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index b0c311f..eea621b 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.java.decompiler.main.collectors;
 
-import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
@@ -46,13 +45,12 @@ public class ImportCollector {
     }
   }
 
-  public String getShortName(String fullname) {
-    return getShortName(fullname, true);
+  public String getShortName(String fullName) {
+    return getShortName(fullName, true);
   }
 
   public String getShortName(String fullName, boolean imported) {
-    ClassesProcessor clProc = DecompilerContext.getClassProcessor();
-    ClassNode node = clProc.getMapRootClasses().get(fullName.replace('.', '/'));
+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(fullName.replace('.', '/'));
 
     String result = null;
     if (node != null && node.classStruct.isOwn()) {

From 71bb82acbefa2ed4b29bee0881067c10d8859ff2 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 20 May 2016 20:15:46 +0200
Subject: [PATCH 063/252] [java-decompiler] correct decompilation of refs to
 inner generic classes (IDEA-155430)

---
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 0a3f9d3..509783a 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -209,7 +209,7 @@ public class GenericMain {
     else {
       for (GenericType tp : enclosingClasses) {
         if (buffer.length() == 0) {
-          buffer.append(DecompilerContext.getImportCollector().getShortName(tp.value));
+          buffer.append(DecompilerContext.getImportCollector().getShortName(tp.value.replace('/', '.')));
         }
         else {
           buffer.append(tp.value);

From 7067504c27fdd71272588a2ce1ecd1f86c023564 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Tue, 24 May 2016 12:25:16 +0200
Subject: [PATCH 064/252] block lambda -> expr lambda

---
 test/org/jetbrains/java/decompiler/SingleClassesTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index f20ae55..f715f4f 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -124,9 +124,7 @@ public class SingleClassesTest {
     File parent = classFile.getParentFile();
     if (parent != null) {
       final String pattern = classFile.getName().replace(".class", "") + "\\$.+\\.class";
-      File[] inner = parent.listFiles((dir, name) -> {
-        return name.matches(pattern);
-      });
+      File[] inner = parent.listFiles((dir, name) -> name.matches(pattern));
       if (inner != null) Collections.addAll(files, inner);
     }
 

From 7628ddfd2c8c2b038bdca8e538e116ec33cc3fc5 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 26 May 2016 13:53:27 +0300
Subject: [PATCH 065/252] toString impls for debug

---
 src/org/jetbrains/java/decompiler/struct/StructClass.java  | 5 +++++
 src/org/jetbrains/java/decompiler/struct/StructField.java  | 5 +++++
 src/org/jetbrains/java/decompiler/struct/StructMethod.java | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
index 895e4c1..9a355ab 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -194,4 +194,9 @@ public class StructClass extends StructMember {
 
     return CodeConstants.BYTECODE_JAVA_LE_4;
   }
+
+  @Override
+  public String toString() {
+    return qualifiedName;
+  }
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/StructField.java b/src/org/jetbrains/java/decompiler/struct/StructField.java
index 796d77f..87ba1d8 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructField.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructField.java
@@ -55,4 +55,9 @@ public class StructField extends StructMember {
   public String getDescriptor() {
     return descriptor;
   }
+
+  @Override
+  public String toString() {
+    return name;
+  }
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index 4ed9be3..48362f3 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -393,4 +393,9 @@ public class StructMethod extends StructMember {
   public StructLocalVariableTableAttribute getLocalVariableAttr() {
     return (StructLocalVariableTableAttribute)getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
   }
+
+  @Override
+  public String toString() {
+    return name;
+  }
 }
\ No newline at end of file

From 9d5a863e4d63b62c8041d034b23b7425e5cec620 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 30 May 2016 16:30:00 +0300
Subject: [PATCH 066/252] Cleanup (minor optimization)

---
 .../modules/decompiler/exps/ExitExprent.java        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index 7b4a5ac..c6b962c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.util.ArrayList;
@@ -83,14 +82,14 @@ public class ExitExprent extends Exprent {
     tracer.addMapping(bytecode);
 
     if (exitType == EXIT_RETURN) {
-      TextBuffer buffer = new TextBuffer();
+      TextBuffer buffer = new TextBuffer("return");
 
       if (retType.type != CodeConstants.TYPE_VOID) {
-        buffer.append(" ");
+        buffer.append(' ');
         ExprProcessor.getCastedExprent(value, retType, buffer, indent, false, tracer);
       }
 
-      return buffer.prepend("return");
+      return buffer;
     }
     else {
       MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
@@ -115,9 +114,9 @@ public class ExitExprent extends Exprent {
 
           if (classname != null) {
             VarType exType = new VarType(classname, true);
-            TextBuffer buffer = new TextBuffer();
+            TextBuffer buffer = new TextBuffer("throw ");
             ExprProcessor.getCastedExprent(value, exType, buffer, indent, false, tracer);
-            return buffer.prepend("throw ");
+            return buffer;
           }
         }
       }

From d586edbb3fb56d911af032ff6661492209d57c81 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 26 Jul 2016 15:15:04 +0200
Subject: [PATCH 067/252] use assertJ instead of hamcrest

---
 java-decompiler-engine.iml                         |  2 +-
 .../java/decompiler/DecompilerTestFixture.java     | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/java-decompiler-engine.iml b/java-decompiler-engine.iml
index 5880ebf..dc3ddfe 100644
--- a/java-decompiler-engine.iml
+++ b/java-decompiler-engine.iml
@@ -9,6 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="library" name="assertJ" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index 58f6db0..1621142 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.java.decompiler;
 
-import org.hamcrest.Matchers;
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -26,8 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class DecompilerTestFixture {
@@ -37,7 +35,7 @@ public class DecompilerTestFixture {
   private ConsoleDecompiler decompiler;
 
   public void setUp(String... optionPairs) throws IOException {
-    assertEquals(0, optionPairs.length % 2);
+    assertThat(optionPairs.length % 2).isEqualTo(0);
 
     testDataDir = new File("testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("community/plugins/java-decompiler/engine/testData");
@@ -49,10 +47,10 @@ public class DecompilerTestFixture {
 
     //noinspection SSBasedInspection
     tempDir = File.createTempFile("decompiler_test_", "_dir");
-    assertTrue(tempDir.delete());
+    assertThat(tempDir.delete()).isTrue();
 
     targetDir = new File(tempDir, "decompiled");
-    assertTrue(targetDir.mkdirs());
+    assertThat(targetDir.mkdirs()).isTrue();
 
     Map<String, Object> options = new HashMap<String, Object>();
     options.put(IFernflowerPreferences.LOG_LEVEL, "warn");
@@ -106,13 +104,13 @@ public class DecompilerTestFixture {
   public static void assertFilesEqual(File expected, File actual) {
     if (expected.isDirectory()) {
       String[] children = Objects.requireNonNull(expected.list());
-      assertThat(actual.list(), Matchers.arrayContainingInAnyOrder(children));
+      assertThat(actual.list()).contains(children);
       for (String name : children) {
         assertFilesEqual(new File(expected, name), new File(actual, name));
       }
     }
     else {
-      assertEquals(getContent(expected), getContent(actual));
+      assertThat(getContent(actual)).isEqualTo(getContent(expected));
     }
   }
 

From 21668f8479890b3abdbfb58d156d21396c062c94 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 1 Aug 2016 08:48:08 -0700
Subject: [PATCH 068/252] [java-decompiler] fixes standalone build

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index d23cf1f..04cbf1a 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,7 @@
   <path id="junit">
     <file name="${basedir}/../../../lib/junit-4.12.jar"/>
     <file name="${basedir}/../../../lib/hamcrest-core-1.3.jar"/>
-    <file name="${basedir}/../../../lib/hamcrest-library-1.3.jar"/>
+    <file name="${basedir}/../../../lib/dev/assertj-core-3.4.1.jar"/>
   </path>
 
   <target name="clean" depends="init">

From 947fae191f9365bc45120cf19c574a85afca8c9e Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Mon, 8 Aug 2016 16:41:19 +0200
Subject: [PATCH 069/252] explicit types to diamonds

---
 .../decompiler/code/InstructionSequence.java  |  2 +-
 .../java/decompiler/code/cfg/BasicBlock.java  | 12 ++--
 .../decompiler/code/cfg/ControlFlowGraph.java | 56 +++++++++----------
 .../code/cfg/ExceptionRangeCFG.java           |  6 +-
 .../java/decompiler/main/AssertProcessor.java |  4 +-
 .../main/ClassReference14Processor.java       |  4 +-
 .../decompiler/main/ClassesProcessor.java     | 24 ++++----
 .../decompiler/main/DecompilerContext.java    |  4 +-
 .../decompiler/main/InitializerProcessor.java |  4 +-
 .../java/decompiler/main/TextBuffer.java      | 14 ++---
 .../collectors/BytecodeMappingTracer.java     |  6 +-
 .../main/collectors/BytecodeSourceMapper.java | 14 ++---
 .../main/collectors/ImportCollector.java      |  8 +--
 .../main/collectors/VarNamesCollector.java    |  2 +-
 .../main/decompiler/ConsoleDecompiler.java    | 12 ++--
 .../decompiler/main/rels/ClassWrapper.java    | 10 ++--
 .../decompiler/main/rels/LambdaProcessor.java |  2 +-
 .../decompiler/main/rels/MethodWrapper.java   |  2 +-
 .../main/rels/NestedClassProcessor.java       | 44 +++++++--------
 .../main/rels/NestedMemberAccess.java         |  6 +-
 .../modules/code/DeadCodeHelper.java          | 32 +++++------
 .../modules/decompiler/ClearStructHelper.java |  2 +-
 .../decompiler/ConcatenationHelper.java       |  6 +-
 .../modules/decompiler/DecHelper.java         | 10 ++--
 .../modules/decompiler/DomHelper.java         | 46 +++++++--------
 .../decompiler/EliminateLoopsHelper.java      |  8 +--
 .../modules/decompiler/ExitHelper.java        |  2 +-
 .../modules/decompiler/ExprProcessor.java     | 24 ++++----
 .../modules/decompiler/FinallyProcessor.java  | 54 +++++++++---------
 .../modules/decompiler/IfHelper.java          | 18 +++---
 .../decompiler/InlineSingleBlockHelper.java   |  2 +-
 .../modules/decompiler/LabelHelper.java       | 20 +++----
 .../modules/decompiler/LoopExtractHelper.java |  2 +-
 .../modules/decompiler/MergeHelper.java       |  6 +-
 .../modules/decompiler/PPandMMHelper.java     |  4 +-
 .../decompiler/PrimitiveExprsList.java        |  2 +-
 .../decompiler/SecondaryFunctionsHelper.java  |  8 +--
 .../modules/decompiler/SequenceHelper.java    |  6 +-
 .../decompiler/SimplifyExprentsHelper.java    | 10 ++--
 .../decompiler/StackVarsProcessor.java        | 40 ++++++-------
 .../modules/decompiler/StatEdge.java          |  2 +-
 .../decompiler/StrongConnectivityHelper.java  | 18 +++---
 .../decompiler/decompose/DominatorEngine.java |  2 +-
 .../DominatorTreeExceptionFilter.java         | 16 +++---
 .../FastExtendedPostdominanceHelper.java      | 26 ++++-----
 .../decompose/GenericDominatorEngine.java     |  2 +-
 .../deobfuscator/ExceptionDeobfuscator.java   | 32 +++++------
 .../IrreducibleCFGDeobfuscator.java           |  8 +--
 .../modules/decompiler/exps/ArrayExprent.java |  2 +-
 .../decompiler/exps/AssignmentExprent.java    |  2 +-
 .../modules/decompiler/exps/ConstExprent.java |  2 +-
 .../modules/decompiler/exps/ExitExprent.java  |  2 +-
 .../modules/decompiler/exps/Exprent.java      |  6 +-
 .../modules/decompiler/exps/FieldExprent.java |  2 +-
 .../decompiler/exps/FunctionExprent.java      | 10 ++--
 .../modules/decompiler/exps/IfExprent.java    |  2 +-
 .../decompiler/exps/InvocationExprent.java    | 10 ++--
 .../decompiler/exps/MonitorExprent.java       |  2 +-
 .../modules/decompiler/exps/NewExprent.java   | 14 ++---
 .../decompiler/exps/SwitchExprent.java        |  8 +--
 .../modules/decompiler/exps/VarExprent.java   |  2 +-
 .../decompiler/sforms/DirectGraph.java        | 22 ++++----
 .../modules/decompiler/sforms/DirectNode.java |  6 +-
 .../sforms/FlattenStatementsHelper.java       | 34 +++++------
 .../sforms/SSAConstructorSparseEx.java        | 22 ++++----
 .../sforms/SSAUConstructorSparseEx.java       | 38 ++++++-------
 .../decompiler/stats/CatchAllStatement.java   |  2 +-
 .../decompiler/stats/CatchStatement.java      | 10 ++--
 .../modules/decompiler/stats/DoStatement.java |  8 +--
 .../decompiler/stats/DummyExitStatement.java  |  2 +-
 .../decompiler/stats/GeneralStatement.java    |  2 +-
 .../modules/decompiler/stats/IfStatement.java |  6 +-
 .../modules/decompiler/stats/Statement.java   | 50 ++++++++---------
 .../decompiler/stats/SwitchStatement.java     | 34 +++++------
 .../stats/SynchronizedStatement.java          |  4 +-
 .../decompiler/vars/CheckTypesResult.java     |  4 +-
 .../decompiler/vars/VarDefinitionHelper.java  | 22 ++++----
 .../modules/decompiler/vars/VarProcessor.java | 14 ++---
 .../decompiler/vars/VarTypeProcessor.java     |  8 +--
 .../decompiler/vars/VarVersionNode.java       |  6 +-
 .../decompiler/vars/VarVersionsGraph.java     | 22 ++++----
 .../decompiler/vars/VarVersionsProcessor.java | 26 ++++-----
 .../modules/renamer/ClassWrapperNode.java     |  2 +-
 .../modules/renamer/ConverterHelper.java      |  6 +-
 .../modules/renamer/IdentifierConverter.java  | 40 ++++++-------
 .../modules/renamer/PoolInterceptor.java      |  4 +-
 .../java/decompiler/struct/ContextUnit.java   | 10 ++--
 .../java/decompiler/struct/StructClass.java   |  4 +-
 .../java/decompiler/struct/StructContext.java |  4 +-
 .../java/decompiler/struct/StructMember.java  |  2 +-
 .../java/decompiler/struct/StructMethod.java  |  6 +-
 .../attr/StructAnnotationAttribute.java       |  8 +--
 .../StructAnnotationParameterAttribute.java   |  2 +-
 .../attr/StructBootstrapMethodsAttribute.java |  6 +-
 .../attr/StructExceptionsAttribute.java       |  2 +-
 .../attr/StructInnerClassesAttribute.java     |  2 +-
 .../StructLocalVariableTableAttribute.java    |  2 +-
 .../struct/consts/ConstantPool.java           |  2 +-
 .../java/decompiler/struct/gen/DataPoint.java |  6 +-
 .../struct/gen/MethodDescriptor.java          |  2 +-
 .../gen/generics/GenericClassDescriptor.java  |  6 +-
 .../struct/gen/generics/GenericMain.java      |  2 +-
 .../gen/generics/GenericMethodDescriptor.java |  8 +--
 .../struct/gen/generics/GenericType.java      |  6 +-
 .../decompiler/struct/lazy/LazyLoader.java    |  2 +-
 .../decompiler/struct/match/MatchEngine.java  | 22 ++++----
 .../decompiler/struct/match/MatchNode.java    |  4 +-
 .../decompiler/util/FastFixedSetFactory.java  | 12 ++--
 .../java/decompiler/util/FastSetFactory.java  | 10 ++--
 .../decompiler/util/FastSparseSetFactory.java | 10 ++--
 .../java/decompiler/util/InterpreterUtil.java |  2 +-
 .../java/decompiler/util/ListStack.java       |  2 +-
 .../decompiler/util/SFormsFastMapDirect.java  |  2 +-
 .../decompiler/util/VBStyleCollection.java    | 16 +++---
 .../decompiler/DecompilerTestFixture.java     |  2 +-
 .../java/decompiler/SingleClassesTest.java    |  2 +-
 116 files changed, 634 insertions(+), 634 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
index cde9284..ec22827 100644
--- a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
@@ -41,7 +41,7 @@ public abstract class InstructionSequence {
   protected ExceptionTable exceptionTable = ExceptionTable.EMPTY;
 
   protected InstructionSequence() {
-    this(new VBStyleCollection<Instruction, Integer>());
+    this(new VBStyleCollection<>());
   }
 
   protected InstructionSequence(VBStyleCollection<Instruction, Integer> collinstr) {
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
index 0bbaf72..55d7462 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -40,15 +40,15 @@ public class BasicBlock implements IGraphNode {
 
   private InstructionSequence seq = new SimpleInstructionSequence();
 
-  private List<BasicBlock> preds = new ArrayList<BasicBlock>();
+  private List<BasicBlock> preds = new ArrayList<>();
 
-  private List<BasicBlock> succs = new ArrayList<BasicBlock>();
+  private List<BasicBlock> succs = new ArrayList<>();
 
-  private final List<Integer> instrOldOffsets = new ArrayList<Integer>();
+  private final List<Integer> instrOldOffsets = new ArrayList<>();
 
-  private List<BasicBlock> predExceptions = new ArrayList<BasicBlock>();
+  private List<BasicBlock> predExceptions = new ArrayList<>();
 
-  private List<BasicBlock> succExceptions = new ArrayList<BasicBlock>();
+  private List<BasicBlock> succExceptions = new ArrayList<>();
 
   public BasicBlock(int id) {
     this.id = id;
@@ -216,7 +216,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public List<? extends IGraphNode> getPredecessors() {
-    List<BasicBlock> lst = new ArrayList<BasicBlock>(preds);
+    List<BasicBlock> lst = new ArrayList<>(preds);
     lst.addAll(predExceptions);
     return lst;
   }
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 2f4761e..4706bf6 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -47,7 +47,7 @@ public class ControlFlowGraph implements CodeConstants {
 
   private Map<BasicBlock, BasicBlock> subroutines;
 
-  private Set<BasicBlock> finallyExits = new HashSet<BasicBlock>();
+  private Set<BasicBlock> finallyExits = new HashSet<>();
 
   // *****************************************************************************
   // constructors
@@ -225,7 +225,7 @@ public class ControlFlowGraph implements CodeConstants {
 
     short[] states = findStartInstructions(instrseq);
 
-    Map<Integer, BasicBlock> mapInstrBlocks = new HashMap<Integer, BasicBlock>();
+    Map<Integer, BasicBlock> mapInstrBlocks = new HashMap<>();
     VBStyleCollection<BasicBlock, Integer> colBlocks = createBasicBlocks(states, instrseq, mapInstrBlocks);
 
     blocks = colBlocks;
@@ -244,7 +244,7 @@ public class ControlFlowGraph implements CodeConstants {
     int len = seq.length();
     short[] inststates = new short[len];
 
-    Set<Integer> excSet = new HashSet<Integer>();
+    Set<Integer> excSet = new HashSet<>();
 
     for (ExceptionHandler handler : seq.getExceptionTable().getHandlers()) {
       excSet.add(handler.from_instr);
@@ -293,7 +293,7 @@ public class ControlFlowGraph implements CodeConstants {
                                                                    InstructionSequence instrseq,
                                                                    Map<Integer, BasicBlock> mapInstrBlocks) {
 
-    VBStyleCollection<BasicBlock, Integer> col = new VBStyleCollection<BasicBlock, Integer>();
+    VBStyleCollection<BasicBlock, Integer> col = new VBStyleCollection<>();
 
     InstructionSequence currseq = null;
     List<Integer> lstOffs = null;
@@ -367,9 +367,9 @@ public class ControlFlowGraph implements CodeConstants {
 
   private void setExceptionEdges(InstructionSequence instrseq, Map<Integer, BasicBlock> instrBlocks) {
 
-    exceptions = new ArrayList<ExceptionRangeCFG>();
+    exceptions = new ArrayList<>();
 
-    Map<String, ExceptionRangeCFG> mapRanges = new HashMap<String, ExceptionRangeCFG>();
+    Map<String, ExceptionRangeCFG> mapRanges = new HashMap<>();
 
     for (ExceptionHandler handler : instrseq.getExceptionTable().getHandlers()) {
 
@@ -385,7 +385,7 @@ public class ControlFlowGraph implements CodeConstants {
       }
       else {
 
-        List<BasicBlock> protectedRange = new ArrayList<BasicBlock>();
+        List<BasicBlock> protectedRange = new ArrayList<>();
         for (int j = from.id; j < to.id; j++) {
           BasicBlock block = blocks.getWithKey(j);
           protectedRange.add(block);
@@ -404,19 +404,19 @@ public class ControlFlowGraph implements CodeConstants {
 
   private void setSubroutineEdges() {
 
-    final Map<BasicBlock, BasicBlock> subroutines = new HashMap<BasicBlock, BasicBlock>();
+    final Map<BasicBlock, BasicBlock> subroutines = new HashMap<>();
 
     for (BasicBlock block : blocks) {
 
       if (block.getSeq().getLastInstr().opcode == CodeConstants.opc_jsr) {
 
-        LinkedList<BasicBlock> stack = new LinkedList<BasicBlock>();
-        LinkedList<LinkedList<BasicBlock>> stackJsrStacks = new LinkedList<LinkedList<BasicBlock>>();
+        LinkedList<BasicBlock> stack = new LinkedList<>();
+        LinkedList<LinkedList<BasicBlock>> stackJsrStacks = new LinkedList<>();
 
-        Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+        Set<BasicBlock> setVisited = new HashSet<>();
 
         stack.add(block);
-        stackJsrStacks.add(new LinkedList<BasicBlock>());
+        stackJsrStacks.add(new LinkedList<>());
 
         while (!stack.isEmpty()) {
 
@@ -449,7 +449,7 @@ public class ControlFlowGraph implements CodeConstants {
             for (BasicBlock succ : node.getSuccs()) {
               if (!setVisited.contains(succ)) {
                 stack.add(succ);
-                stackJsrStacks.add(new LinkedList<BasicBlock>(jsrstack));
+                stackJsrStacks.add(new LinkedList<>(jsrstack));
               }
             }
           }
@@ -480,7 +480,7 @@ public class ControlFlowGraph implements CodeConstants {
 
   private int processJsrRanges() {
 
-    List<JsrRecord> lstJsrAll = new ArrayList<JsrRecord>();
+    List<JsrRecord> lstJsrAll = new ArrayList<>();
 
     // get all jsr ranges
     for (Entry<BasicBlock, BasicBlock> ent : subroutines.entrySet()) {
@@ -492,7 +492,7 @@ public class ControlFlowGraph implements CodeConstants {
 
     // sort ranges
     // FIXME: better sort order
-    List<JsrRecord> lstJsr = new ArrayList<JsrRecord>();
+    List<JsrRecord> lstJsr = new ArrayList<>();
     for (JsrRecord arr : lstJsrAll) {
       int i = 0;
       for (; i < lstJsr.size(); i++) {
@@ -514,7 +514,7 @@ public class ControlFlowGraph implements CodeConstants {
         Set<BasicBlock> set1 = arr1.range;
 
         if (!set.contains(arr1.jsr) && !set1.contains(arr.jsr)) { // rang 0 doesn't contain entry 1 and vice versa
-          Set<BasicBlock> setc = new HashSet<BasicBlock>(set);
+          Set<BasicBlock> setc = new HashSet<>(set);
           setc.retainAll(set1);
 
           if (!setc.isEmpty()) {
@@ -530,9 +530,9 @@ public class ControlFlowGraph implements CodeConstants {
 
   private Set<BasicBlock> getJsrRange(BasicBlock jsr, BasicBlock ret) {
 
-    Set<BasicBlock> blocks = new HashSet<BasicBlock>();
+    Set<BasicBlock> blocks = new HashSet<>();
 
-    List<BasicBlock> lstNodes = new LinkedList<BasicBlock>();
+    List<BasicBlock> lstNodes = new LinkedList<>();
     lstNodes.add(jsr);
 
     BasicBlock dom = jsr.getSuccs().get(0);
@@ -594,8 +594,8 @@ public class ControlFlowGraph implements CodeConstants {
 
   private void splitJsrRange(BasicBlock jsr, BasicBlock ret, Set<BasicBlock> common_blocks) {
 
-    List<BasicBlock> lstNodes = new LinkedList<BasicBlock>();
-    Map<Integer, BasicBlock> mapNewNodes = new HashMap<Integer, BasicBlock>();
+    List<BasicBlock> lstNodes = new LinkedList<>();
+    Map<Integer, BasicBlock> mapNewNodes = new HashMap<>();
 
     lstNodes.add(jsr);
     mapNewNodes.put(jsr.id, jsr);
@@ -680,14 +680,14 @@ public class ControlFlowGraph implements CodeConstants {
       ExceptionRangeCFG range = exceptions.get(i);
       List<BasicBlock> lstRange = range.getProtectedRange();
 
-      HashSet<BasicBlock> setBoth = new HashSet<BasicBlock>(common_blocks);
+      HashSet<BasicBlock> setBoth = new HashSet<>(common_blocks);
       setBoth.retainAll(lstRange);
 
       if (setBoth.size() > 0) {
         List<BasicBlock> lstNewRange;
 
         if (setBoth.size() == lstRange.size()) {
-          lstNewRange = new ArrayList<BasicBlock>();
+          lstNewRange = new ArrayList<>();
           ExceptionRangeCFG newRange = new ExceptionRangeCFG(lstNewRange,
                                                              mapNewNodes.get(range.getHandler().id), range.getExceptionTypes());
           exceptions.add(newRange);
@@ -751,7 +751,7 @@ public class ControlFlowGraph implements CodeConstants {
       if (suc.mark != 1) {
 
         DataPoint point = new DataPoint();
-        point.setLocalVariables(new ArrayList<VarType>(data.getLocalVariables()));
+        point.setLocalVariables(new ArrayList<>(data.getLocalVariables()));
         point.getStack().push(new VarType(CodeConstants.TYPE_OBJECT, 0, null));
 
         removeJsrInstructions(pool, suc, point);
@@ -774,7 +774,7 @@ public class ControlFlowGraph implements CodeConstants {
 
   public List<BasicBlock> getReversePostOrder() {
 
-    List<BasicBlock> res = new LinkedList<BasicBlock>();
+    List<BasicBlock> res = new LinkedList<>();
     addToReversePostOrderListIterative(first, res);
 
     return res;
@@ -782,10 +782,10 @@ public class ControlFlowGraph implements CodeConstants {
 
   private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
 
-    LinkedList<BasicBlock> stackNode = new LinkedList<BasicBlock>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+    LinkedList<BasicBlock> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
-    Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+    Set<BasicBlock> setVisited = new HashSet<>();
 
     stackNode.add(root);
     stackIndex.add(0);
@@ -797,7 +797,7 @@ public class ControlFlowGraph implements CodeConstants {
 
       setVisited.add(node);
 
-      List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(node.getSuccs());
+      List<BasicBlock> lstSuccs = new ArrayList<>(node.getSuccs());
       lstSuccs.addAll(node.getSuccExceptions());
 
       for (; index < lstSuccs.size(); index++) {
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
index 47e0e21..38a105b 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
@@ -24,7 +24,7 @@ import java.util.Set;
 
 public class ExceptionRangeCFG {
 
-  private List<BasicBlock> protectedRange = new ArrayList<BasicBlock>(); // FIXME: replace with set
+  private List<BasicBlock> protectedRange = new ArrayList<>(); // FIXME: replace with set
 
   private BasicBlock handler;
 
@@ -35,7 +35,7 @@ public class ExceptionRangeCFG {
     this.handler = handler;
 
     if (exceptionType != null) {
-      this.exceptionTypes = new ArrayList<String>(exceptionType);
+      this.exceptionTypes = new ArrayList<>(exceptionType);
     }
   }
 
@@ -105,7 +105,7 @@ public class ExceptionRangeCFG {
       return null;
     }
 
-    Set<String> setExceptionStrings = new HashSet<String>();
+    Set<String> setExceptionStrings = new HashSet<>();
 
     for (String exceptionType : exceptionTypes) { // normalize order
       setExceptionStrings.add(exceptionType);
diff --git a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
index abb51ce..2ccbe3d 100644
--- a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
@@ -169,7 +169,7 @@ public class AssertProcessor {
       return false;
     }
 
-    List<Exprent> lstParams = new ArrayList<Exprent>();
+    List<Exprent> lstParams = new ArrayList<>();
 
     Exprent ascond = null, retcond = null;
     if (exprres[0] != null) {
@@ -196,7 +196,7 @@ public class AssertProcessor {
       first.removeSuccessor(stat.getIfEdge());
       first.removeSuccessor(stat.getElseEdge());
 
-      List<Statement> lstStatements = new ArrayList<Statement>();
+      List<Statement> lstStatements = new ArrayList<>();
       if (first.getExprents() != null && !first.getExprents().isEmpty()) {
         lstStatements.add(first);
       }
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index e97c47e..3ccc2d7 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,12 +74,12 @@ public class ClassReference14Processor {
 
   public static void processClassReferences(ClassNode node) {
     // find the synthetic method Class class$(String) if present
-    HashMap<ClassWrapper, MethodWrapper> mapClassMeths = new HashMap<ClassWrapper, MethodWrapper>();
+    HashMap<ClassWrapper, MethodWrapper> mapClassMeths = new HashMap<>();
     mapClassMethods(node, mapClassMeths);
     if (mapClassMeths.isEmpty()) {
       return;
     }
-    HashSet<ClassWrapper> setFound = new HashSet<ClassWrapper>();
+    HashSet<ClassWrapper> setFound = new HashSet<>();
     processClassRec(node, mapClassMeths, setFound);
 
     if (!setFound.isEmpty()) {
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 17331e9..4afeddf 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -42,7 +42,7 @@ import java.util.Map.Entry;
 public class ClassesProcessor {
   public static final int AVERAGE_CLASS_SIZE = 16 * 1024;
 
-  private final Map<String, ClassNode> mapRootClasses = new HashMap<String, ClassNode>();
+  private final Map<String, ClassNode> mapRootClasses = new HashMap<>();
 
   private static class Inner {
     private String simpleName;
@@ -55,10 +55,10 @@ public class ClassesProcessor {
   }
 
   public ClassesProcessor(StructContext context) {
-    Map<String, Inner> mapInnerClasses = new HashMap<String, Inner>();
-    Map<String, Set<String>> mapNestedClassReferences = new HashMap<String, Set<String>>();
-    Map<String, Set<String>> mapEnclosingClassReferences = new HashMap<String, Set<String>>();
-    Map<String, String> mapNewSimpleNames = new HashMap<String, String>();
+    Map<String, Inner> mapInnerClasses = new HashMap<>();
+    Map<String, Set<String>> mapNestedClassReferences = new HashMap<>();
+    Map<String, Set<String>> mapEnclosingClassReferences = new HashMap<>();
+    Map<String, String> mapNewSimpleNames = new HashMap<>();
 
     boolean bDecompileInner = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_INNER);
 
@@ -116,14 +116,14 @@ public class ClassesProcessor {
                   // reference to the nested class
                   Set<String> set = mapNestedClassReferences.get(enclClassName);
                   if (set == null) {
-                    mapNestedClassReferences.put(enclClassName, set = new HashSet<String>());
+                    mapNestedClassReferences.put(enclClassName, set = new HashSet<>());
                   }
                   set.add(innerName);
 
                   // reference to the enclosing class
                   set = mapEnclosingClassReferences.get(innerName);
                   if (set == null) {
-                    mapEnclosingClassReferences.put(innerName, set = new HashSet<String>());
+                    mapEnclosingClassReferences.put(innerName, set = new HashSet<>());
                   }
                   set.add(enclClassName);
                 }
@@ -143,8 +143,8 @@ public class ClassesProcessor {
       for (Entry<String, ClassNode> ent : mapRootClasses.entrySet()) {
         // root class?
         if (!mapInnerClasses.containsKey(ent.getKey())) {
-          Set<String> setVisited = new HashSet<String>();
-          LinkedList<String> stack = new LinkedList<String>();
+          Set<String> setVisited = new HashSet<>();
+          LinkedList<String> stack = new LinkedList<>();
 
           stack.add(ent.getKey());
           setVisited.add(ent.getKey());
@@ -347,10 +347,10 @@ public class ClassesProcessor {
     private ClassWrapper wrapper;
     public String enclosingMethod;
     public InvocationExprent superInvocation;
-    public final Map<String, VarVersionPair> mapFieldsToVars = new HashMap<String, VarVersionPair>();
+    public final Map<String, VarVersionPair> mapFieldsToVars = new HashMap<>();
     public VarType anonymousClassType;
-    public final List<ClassNode> nested = new ArrayList<ClassNode>();
-    public final Set<String> enclosingClasses = new HashSet<String>();
+    public final List<ClassNode> nested = new ArrayList<>();
+    public final Set<String> enclosingClasses = new HashSet<>();
     public ClassNode parent;
     public LambdaInformation lambdaInformation;
     public boolean namelessConstructorStub = false;
diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
index c31c57a..39619ce 100644
--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -35,7 +35,7 @@ public class DecompilerContext {
   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
   public static final String CURRENT_VAR_PROCESSOR = "CURRENT_VAR_PROCESSOR";
 
-  private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<DecompilerContext>();
+  private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<>();
 
   private final Map<String, Object> properties;
   private StructContext structContext;
@@ -52,7 +52,7 @@ public class DecompilerContext {
   }
 
   public static void initContext(Map<String, Object> propertiesCustom) {
-    Map<String, Object> properties = new HashMap<String, Object>(IFernflowerPreferences.DEFAULTS);
+    Map<String, Object> properties = new HashMap<>(IFernflowerPreferences.DEFAULTS);
     if (propertiesCustom != null) {
       properties.putAll(propertiesCustom);
     }
diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index 206b669..18a13d9 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -156,8 +156,8 @@ public class InitializerProcessor {
 
     boolean isAnonymous = DecompilerContext.getClassProcessor().getMapRootClasses().get(cl.qualifiedName).type == ClassNode.CLASS_ANONYMOUS;
 
-    List<List<Exprent>> lstFirst = new ArrayList<List<Exprent>>();
-    List<MethodWrapper> lstMethodWrappers = new ArrayList<MethodWrapper>();
+    List<List<Exprent>> lstFirst = new ArrayList<>();
+    List<MethodWrapper> lstMethodWrappers = new ArrayList<>();
 
     for (MethodWrapper method : wrapper.getMethods()) {
       if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) { // successfully decompiled constructor
diff --git a/src/org/jetbrains/java/decompiler/main/TextBuffer.java b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
index 952b26f..4e0b09a 100644
--- a/src/org/jetbrains/java/decompiler/main/TextBuffer.java
+++ b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
@@ -105,7 +105,7 @@ public class TextBuffer {
       int currentLine = 0;
       int previousMarkLine = 0;
       int dumpedLines = 0;
-      ArrayList<Integer> linesWithMarks = new ArrayList<Integer>(myLineToOffsetMapping.keySet());
+      ArrayList<Integer> linesWithMarks = new ArrayList<>(myLineToOffsetMapping.keySet());
       Collections.sort(linesWithMarks);
       for (Integer markLine : linesWithMarks) {
         Integer markOffset = myLineToOffsetMapping.get(markLine);
@@ -194,7 +194,7 @@ public class TextBuffer {
   public void setLength(int position) {
     myStringBuilder.setLength(position);
     if (myLineToOffsetMapping != null) {
-      HashMap<Integer, Integer> newMap = new HashMap<Integer, Integer>();
+      HashMap<Integer, Integer> newMap = new HashMap<>();
       for (Map.Entry<Integer, Integer> entry : myLineToOffsetMapping.entrySet()) {
         if (entry.getValue() <= position) {
           newMap.put(entry.getKey(), entry.getValue());
@@ -217,7 +217,7 @@ public class TextBuffer {
 
   private void shiftMapping(int startOffset, int shiftOffset) {
     if (myLineToOffsetMapping != null) {
-      HashMap<Integer, Integer> newMap = new HashMap<Integer, Integer>();
+      HashMap<Integer, Integer> newMap = new HashMap<>();
       for (Map.Entry<Integer, Integer> entry : myLineToOffsetMapping.entrySet()) {
         int newValue = entry.getValue();
         if (newValue >= startOffset) {
@@ -233,7 +233,7 @@ public class TextBuffer {
 
   private void checkMapCreated() {
     if (myLineToOffsetMapping == null) {
-      myLineToOffsetMapping = new HashMap<Integer, Integer>();
+      myLineToOffsetMapping = new HashMap<>();
     }
   }
 
@@ -264,7 +264,7 @@ public class TextBuffer {
     if (srcLines.size() < 2 || srcLines.size() <= requiredLineNumber) {
       return srcLines;
     }
-    List<String> res = new LinkedList<String>(srcLines);
+    List<String> res = new LinkedList<>(srcLines);
     // first join lines with a single { or }
     for (int i = res.size()-1; i > 0 ; i--) {
       String s = res.get(i);
@@ -294,12 +294,12 @@ public class TextBuffer {
 
   public void dumpOriginalLineNumbers(int[] lineMapping) {
     if (lineMapping.length > 0) {
-      myLineMapping = new HashMap<Integer, Set<Integer>>();
+      myLineMapping = new HashMap<>();
       for (int i = 0; i < lineMapping.length; i += 2) {
         int key = lineMapping[i + 1];
         Set<Integer> existing = myLineMapping.get(key);
         if (existing == null) {
-          existing = new TreeSet<Integer>();
+          existing = new TreeSet<>();
           myLineMapping.put(key, existing);
         }
         existing.add(lineMapping[i]);
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
index a72f988..18e1b78 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -25,7 +25,7 @@ public class BytecodeMappingTracer {
 
   private int currentSourceLine;
   private StructLineNumberTableAttribute lineNumberTable = null;
-  private final Map<Integer, Integer> mapping = new HashMap<Integer, Integer>();  // bytecode offset, source line
+  private final Map<Integer, Integer> mapping = new HashMap<>();  // bytecode offset, source line
 
   public BytecodeMappingTracer() { }
 
@@ -81,7 +81,7 @@ public class BytecodeMappingTracer {
     this.lineNumberTable = lineNumberTable;
   }
 
-  private final Set<Integer> unmappedLines = new HashSet<Integer>();
+  private final Set<Integer> unmappedLines = new HashSet<>();
 
   public Set<Integer> getUnmappedLines() {
     return unmappedLines;
@@ -92,7 +92,7 @@ public class BytecodeMappingTracer {
       return Collections.emptyMap();
     }
 
-    Map<Integer, Integer> res = new HashMap<Integer, Integer>();
+    Map<Integer, Integer> res = new HashMap<>();
 
     // first match offsets from line number table
     int[] data = lineNumberTable.getRawData();
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
index 8d3770b..8531f50 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
@@ -26,21 +26,21 @@ public class BytecodeSourceMapper {
   private int offset_total;
 
   // class, method, bytecode offset, source line
-  private final Map<String, Map<String, Map<Integer, Integer>>> mapping = new LinkedHashMap<String, Map<String, Map<Integer, Integer>>>();
+  private final Map<String, Map<String, Map<Integer, Integer>>> mapping = new LinkedHashMap<>();
 
   // original line to decompiled line
-  private final Map<Integer, Integer> linesMapping = new HashMap<Integer, Integer>();
-  private final Set<Integer> unmappedLines = new TreeSet<Integer>();
+  private final Map<Integer, Integer> linesMapping = new HashMap<>();
+  private final Set<Integer> unmappedLines = new TreeSet<>();
 
   public void addMapping(String className, String methodName, int bytecodeOffset, int sourceLine) {
     Map<String, Map<Integer, Integer>> class_mapping = mapping.get(className);
     if (class_mapping == null) {
-      mapping.put(className, class_mapping = new LinkedHashMap<String, Map<Integer, Integer>>()); // need to preserve order
+      mapping.put(className, class_mapping = new LinkedHashMap<>()); // need to preserve order
     }
 
     Map<Integer, Integer> method_mapping = class_mapping.get(methodName);
     if (method_mapping == null) {
-      class_mapping.put(methodName, method_mapping = new HashMap<Integer, Integer>());
+      class_mapping.put(methodName, method_mapping = new HashMap<>());
     }
 
     // don't overwrite
@@ -78,7 +78,7 @@ public class BytecodeSourceMapper {
 
         buffer.appendIndent(1).append("method '" + method_entry.getKey() + "' {" + lineSeparator);
 
-        List<Integer> lstBytecodeOffsets = new ArrayList<Integer>(method_mapping.keySet());
+        List<Integer> lstBytecodeOffsets = new ArrayList<>(method_mapping.keySet());
         Collections.sort(lstBytecodeOffsets);
 
         for (Integer offset : lstBytecodeOffsets) {
@@ -97,7 +97,7 @@ public class BytecodeSourceMapper {
 
     // lines mapping
     buffer.append("Lines mapping:").appendLineSeparator();
-    Map<Integer, Integer> sorted = new TreeMap<Integer, Integer>(linesMapping);
+    Map<Integer, Integer> sorted = new TreeMap<>(linesMapping);
     for (Entry<Integer, Integer> entry : sorted.entrySet()) {
       buffer.append(entry.getKey()).append(" <-> ").append(entry.getValue() + offset_total + 1).appendLineSeparator();
     }
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index eea621b..cb13140 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -26,8 +26,8 @@ import java.util.Map.Entry;
 public class ImportCollector {
   private static final String JAVA_LANG_PACKAGE = "java.lang";
 
-  private final Map<String, String> mapSimpleNames = new HashMap<String, String>();
-  private final Set<String> setNotImportedNames = new HashSet<String>();
+  private final Map<String, String> mapSimpleNames = new HashMap<>();
+  private final Set<String> setNotImportedNames = new HashSet<>();
   private final String currentPackageSlash;
   private final String currentPackagePoint;
 
@@ -124,7 +124,7 @@ public class ImportCollector {
   }
 
   private List<String> packImports() {
-    List<Entry<String, String>> lst = new ArrayList<Entry<String, String>>(mapSimpleNames.entrySet());
+    List<Entry<String, String>> lst = new ArrayList<>(mapSimpleNames.entrySet());
 
     Collections.sort(lst, (par0, par1) -> {
       int res = par0.getValue().compareTo(par1.getValue());
@@ -134,7 +134,7 @@ public class ImportCollector {
       return res;
     });
 
-    List<String> res = new ArrayList<String>();
+    List<String> res = new ArrayList<>();
     for (Entry<String, String> ent : lst) {
       // exclude a current class or one of the nested ones, java.lang and empty packages
       if (!setNotImportedNames.contains(ent.getKey()) &&
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
index 33bf42c..05aac72 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
@@ -20,7 +20,7 @@ import java.util.Set;
 
 public class VarNamesCollector {
 
-  private final Set<String> usedNames = new HashSet<String>();
+  private final Set<String> usedNames = new HashSet<>();
 
   public VarNamesCollector() { }
 
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index ea08023..8925ad7 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -41,9 +41,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       return;
     }
 
-    Map<String, Object> mapOptions = new HashMap<String, Object>();
-    List<File> lstSources = new ArrayList<File>();
-    List<File> lstLibraries = new ArrayList<File>();
+    Map<String, Object> mapOptions = new HashMap<>();
+    List<File> lstSources = new ArrayList<>();
+    List<File> lstLibraries = new ArrayList<>();
 
     boolean isOption = true;
     for (int i = 0; i < args.length - 1; ++i) { // last parameter - destination
@@ -113,8 +113,8 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
 
   private final File root;
   private final Fernflower fernflower;
-  private final Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<String, ZipOutputStream>();
-  private final Map<String, Set<String>> mapArchiveEntries = new HashMap<String, Set<String>>();
+  private final Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<>();
+  private final Map<String, Set<String>> mapArchiveEntries = new HashMap<>();
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
   public ConsoleDecompiler(File destination, Map<String, Object> options) {
@@ -266,7 +266,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   private boolean checkEntry(String entryName, String file) {
     Set<String> set = mapArchiveEntries.get(file);
     if (set == null) {
-      mapArchiveEntries.put(file, set = new HashSet<String>());
+      mapArchiveEntries.put(file, set = new HashSet<>());
     }
 
     boolean added = set.add(entryName);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index ef09bd0..39adbc9 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -40,10 +40,10 @@ import java.util.Set;
 public class ClassWrapper {
 
   private final StructClass classStruct;
-  private final Set<String> hiddenMembers = new HashSet<String>();
-  private final VBStyleCollection<Exprent, String> staticFieldInitializers = new VBStyleCollection<Exprent, String>();
-  private final VBStyleCollection<Exprent, String> dynamicFieldInitializers = new VBStyleCollection<Exprent, String>();
-  private final VBStyleCollection<MethodWrapper, String> methods = new VBStyleCollection<MethodWrapper, String>();
+  private final Set<String> hiddenMembers = new HashSet<>();
+  private final VBStyleCollection<Exprent, String> staticFieldInitializers = new VBStyleCollection<>();
+  private final VBStyleCollection<Exprent, String> dynamicFieldInitializers = new VBStyleCollection<>();
+  private final VBStyleCollection<MethodWrapper, String> methods = new VBStyleCollection<>();
 
   public ClassWrapper(StructClass classStruct) {
     this.classStruct = classStruct;
@@ -55,7 +55,7 @@ public class ClassWrapper {
     DecompilerContext.getLogger().startClass(classStruct.qualifiedName);
 
     // collect field names
-    Set<String> setFieldNames = new HashSet<String>();
+    Set<String> setFieldNames = new HashSet<>();
     for (StructField fd : classStruct.getFields()) {
       setFieldNames.add(fd.getName());
     }
diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
index b5ac0fb..0063a15 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
@@ -78,7 +78,7 @@ public class LambdaProcessor {
       return false; // no lambda bootstrap constant found
     }
 
-    Map<String, String> mapMethodsLambda = new HashMap<String, String>();
+    Map<String, String> mapMethodsLambda = new HashMap<>();
 
     // iterate over code and find invocations of bootstrap methods. Replace them with anonymous classes.
     for (StructMethod mt : cl.getMethods()) {
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
index eb397d1..3060c73 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
@@ -31,7 +31,7 @@ public class MethodWrapper {
   public final VarProcessor varproc;
   public final StructMethod methodStruct;
   public final CounterContainer counter;
-  public final HashSet<String> setOuterVarNames = new HashSet<String>();
+  public final HashSet<String> setOuterVarNames = new HashSet<>();
 
   public DirectGraph graph;
   public List<VarVersionPair> signatureFields;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index c529a44..12e2de1 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -130,7 +130,7 @@ public class NestedClassProcessor {
       method.varproc.setVarName(new VarVersionPair(0, 0), parent.simpleName + ".this");
     }
 
-    final Map<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
+    final Map<VarVersionPair, String> mapNewNames = new HashMap<>();
 
     enclosingMethod.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
       @Override
@@ -168,7 +168,7 @@ public class NestedClassProcessor {
     });
 
     // update names of local variables
-    Set<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
+    Set<String> setNewOuterNames = new HashSet<>(mapNewNames.values());
     setNewOuterNames.removeAll(method.setOuterVarNames);
 
     method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
@@ -180,7 +180,7 @@ public class NestedClassProcessor {
   }
 
   private static void checkNotFoundClasses(ClassNode root, ClassNode node) {
-    List<ClassNode> copy = new ArrayList<ClassNode>(node.nested);
+    List<ClassNode> copy = new ArrayList<>(node.nested);
 
     for (ClassNode child : copy) {
       if (child.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
@@ -225,7 +225,7 @@ public class NestedClassProcessor {
   private static boolean insertNestedClass(ClassNode root, ClassNode child) {
     Set<String> setEnclosing = child.enclosingClasses;
 
-    LinkedList<ClassNode> stack = new LinkedList<ClassNode>();
+    LinkedList<ClassNode> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
@@ -248,7 +248,7 @@ public class NestedClassProcessor {
   private static void computeLocalVarsAndDefinitions(final ClassNode node) {
     // local var masks
     // class name, constructor descriptor, field mask
-    final Map<String, Map<String, List<VarFieldPair>>> mapVarMasks = new HashMap<String, Map<String, List<VarFieldPair>>>();
+    final Map<String, Map<String, List<VarFieldPair>>> mapVarMasks = new HashMap<>();
 
     int clTypes = 0;
 
@@ -274,7 +274,7 @@ public class NestedClassProcessor {
     }
 
     // local var masks
-    final Map<String, Map<String, List<VarFieldPair>>> mapVarFieldPairs = new HashMap<String, Map<String, List<VarFieldPair>>>();
+    final Map<String, Map<String, List<VarFieldPair>>> mapVarFieldPairs = new HashMap<>();
 
     if (clTypes != ClassNode.CLASS_MEMBER) {
       // iterate enclosing class
@@ -298,10 +298,10 @@ public class NestedClassProcessor {
                       List<VarFieldPair> mask = mapVarMasks.get(refClassName).get(constructor.getStringDescriptor());
 
                       if (!mapVarFieldPairs.containsKey(refClassName)) {
-                        mapVarFieldPairs.put(refClassName, new HashMap<String, List<VarFieldPair>>());
+                        mapVarFieldPairs.put(refClassName, new HashMap<>());
                       }
 
-                      List<VarFieldPair> lstTemp = new ArrayList<VarFieldPair>();
+                      List<VarFieldPair> lstTemp = new ArrayList<>();
 
                       for (int i = 0; i < mask.size(); i++) {
                         Exprent param = constructor.getLstParameters().get(i);
@@ -356,7 +356,7 @@ public class NestedClassProcessor {
       if (mapVarFieldPairs.containsKey(enclosing.getKey())) {
         for (List<VarFieldPair> mask : mapVarFieldPairs.get(enclosing.getKey()).values()) {
           if (interPairMask == null) {
-            interPairMask = new ArrayList<VarFieldPair>(mask);
+            interPairMask = new ArrayList<>(mask);
           }
           else {
             mergeListSignatures(interPairMask, mask, false);
@@ -368,7 +368,7 @@ public class NestedClassProcessor {
       // merge all constructors
       for (List<VarFieldPair> mask : enclosing.getValue().values()) {
         if (interMask == null) {
-          interMask = new ArrayList<VarFieldPair>(mask);
+          interMask = new ArrayList<>(mask);
         }
         else {
           mergeListSignatures(interMask, mask, false);
@@ -376,7 +376,7 @@ public class NestedClassProcessor {
       }
 
       if (interPairMask == null) { // member or local and never instantiated
-        interPairMask = interMask != null ? new ArrayList<VarFieldPair>(interMask) : new ArrayList<VarFieldPair>();
+        interPairMask = interMask != null ? new ArrayList<>(interMask) : new ArrayList<>();
 
         boolean found = false;
 
@@ -403,7 +403,7 @@ public class NestedClassProcessor {
         mergeListSignatures(entry.getValue(), interPairMask, false);
 
         MethodWrapper method = nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entry.getKey());
-        method.signatureFields = new ArrayList<VarVersionPair>();
+        method.signatureFields = new ArrayList<>();
 
         for (VarFieldPair pair : entry.getValue()) {
           method.signatureFields.add(pair == null ? null : pair.varPair);
@@ -419,10 +419,10 @@ public class NestedClassProcessor {
     // iterate all child methods
     for (final MethodWrapper method : child.getWrapper().getMethods()) {
       if (method.root != null) { // neither abstract nor native
-        Map<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();  // local var names
-        Map<VarVersionPair, VarType> mapNewTypes = new HashMap<VarVersionPair, VarType>();  // local var types
+        Map<VarVersionPair, String> mapNewNames = new HashMap<>();  // local var names
+        Map<VarVersionPair, VarType> mapNewTypes = new HashMap<>();  // local var types
 
-        final Map<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<Integer, VarVersionPair>();
+        final Map<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<>();
         if (method.signatureFields != null) {
           int index = 0, varIndex = 1;
           MethodDescriptor md = MethodDescriptor.parseDescriptor(method.methodStruct.getDescriptor());
@@ -462,7 +462,7 @@ public class NestedClassProcessor {
           }
         }
 
-        final Map<String, VarVersionPair> mapFieldsToNewVars = new HashMap<String, VarVersionPair>();
+        final Map<String, VarVersionPair> mapFieldsToNewVars = new HashMap<>();
         for (ClassNode classNode = child; classNode != null; classNode = classNode.parent) {
           for (Entry<String, VarVersionPair> entry : classNode.mapFieldsToVars.entrySet()) {
             VarVersionPair newVar = new VarVersionPair(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
@@ -503,7 +503,7 @@ public class NestedClassProcessor {
           }
         }
 
-        Set<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
+        Set<String> setNewOuterNames = new HashSet<>(mapNewNames.values());
         setNewOuterNames.removeAll(method.setOuterVarNames);
 
         method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
@@ -593,7 +593,7 @@ public class NestedClassProcessor {
   }
 
   private static Map<String, List<VarFieldPair>> getMaskLocalVars(ClassWrapper wrapper) {
-    Map<String, List<VarFieldPair>> mapMasks = new HashMap<String, List<VarFieldPair>>();
+    Map<String, List<VarFieldPair>> mapMasks = new HashMap<>();
 
     StructClass cl = wrapper.getClassStruct();
 
@@ -605,7 +605,7 @@ public class NestedClassProcessor {
         DirectGraph graph = method.getOrBuildGraph();
 
         if (graph != null) { // something gone wrong, should not be null
-          List<VarFieldPair> fields = new ArrayList<VarFieldPair>();
+          List<VarFieldPair> fields = new ArrayList<>();
 
           int varIndex = 1;
           for (int i = 0; i < md.params.length; i++) {  // no static methods allowed
@@ -754,7 +754,7 @@ public class NestedClassProcessor {
   private static void setLocalClassDefinition(MethodWrapper method, ClassNode node) {
     RootStatement root = method.root;
 
-    Set<Statement> setStats = new HashSet<Statement>();
+    Set<Statement> setStats = new HashSet<>();
     VarType classType = new VarType(node.classStruct.qualifiedName, true);
 
     Statement statement = getDefStatement(root, classType, setStats);
@@ -793,7 +793,7 @@ public class NestedClassProcessor {
   }
 
   private static Statement findFirstBlock(Statement stat, Set<Statement> setStats) {
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(stat);
 
     while (!stack.isEmpty()) {
@@ -827,7 +827,7 @@ public class NestedClassProcessor {
   }
 
   private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
     if (stat.getExprents() == null) {
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index e7e0f01..a460ef9 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -36,7 +36,7 @@ public class NestedMemberAccess {
   private enum MethodAccess {NORMAL, FIELD_GET, FIELD_SET, METHOD, FUNCTION}
 
   private boolean noSynthFlag;
-  private final Map<MethodWrapper, MethodAccess> mapMethodType = new HashMap<MethodWrapper, MethodAccess>();
+  private final Map<MethodWrapper, MethodAccess> mapMethodType = new HashMap<>();
 
 
   public void propagateMemberAccess(ClassNode root) {
@@ -231,8 +231,8 @@ public class NestedMemberAccess {
 
         DirectGraph graph = meth.getOrBuildGraph();
 
-        HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
-        LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+        HashSet<DirectNode> setVisited = new HashSet<>();
+        LinkedList<DirectNode> stack = new LinkedList<>();
         stack.add(graph.first);
 
         while (!stack.isEmpty()) {  // TODO: replace with interface iterator?
diff --git a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
index d79367f..2522489 100644
--- a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
@@ -30,8 +30,8 @@ public class DeadCodeHelper {
 
   public static void removeDeadBlocks(ControlFlowGraph graph) {
 
-    LinkedList<BasicBlock> stack = new LinkedList<BasicBlock>();
-    HashSet<BasicBlock> setStacked = new HashSet<BasicBlock>();
+    LinkedList<BasicBlock> stack = new LinkedList<>();
+    HashSet<BasicBlock> setStacked = new HashSet<>();
 
     stack.add(graph.getFirst());
     setStacked.add(graph.getFirst());
@@ -39,7 +39,7 @@ public class DeadCodeHelper {
     while (!stack.isEmpty()) {
       BasicBlock block = stack.removeFirst();
 
-      List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(block.getSuccs());
+      List<BasicBlock> lstSuccs = new ArrayList<>(block.getSuccs());
       lstSuccs.addAll(block.getSuccExceptions());
 
       for (BasicBlock succ : lstSuccs) {
@@ -50,7 +50,7 @@ public class DeadCodeHelper {
       }
     }
 
-    HashSet<BasicBlock> setAllBlocks = new HashSet<BasicBlock>(graph.getBlocks());
+    HashSet<BasicBlock> setAllBlocks = new HashSet<>(graph.getBlocks());
     setAllBlocks.removeAll(setStacked);
 
     for (BasicBlock block : setAllBlocks) {
@@ -94,7 +94,7 @@ public class DeadCodeHelper {
         }
       }
 
-      HashSet<BasicBlock> setExits = new HashSet<BasicBlock>(graph.getLast().getPreds());
+      HashSet<BasicBlock> setExits = new HashSet<>(graph.getLast().getPreds());
 
       if (block.getPredExceptions().isEmpty() &&
           (!setExits.contains(block) || block.getPreds().size() == 1)) {
@@ -109,15 +109,15 @@ public class DeadCodeHelper {
           }
         }
 
-        HashSet<BasicBlock> setPreds = new HashSet<BasicBlock>(block.getPreds());
-        HashSet<BasicBlock> setSuccs = new HashSet<BasicBlock>(block.getSuccs());
+        HashSet<BasicBlock> setPreds = new HashSet<>(block.getPreds());
+        HashSet<BasicBlock> setSuccs = new HashSet<>(block.getSuccs());
 
         // collect common exception ranges of predecessors and successors
         HashSet<BasicBlock> setCommonExceptionHandlers = null;
         for (int i = 0; i < 2; ++i) {
           for (BasicBlock pred : i == 0 ? setPreds : setSuccs) {
             if (setCommonExceptionHandlers == null) {
-              setCommonExceptionHandlers = new HashSet<BasicBlock>(pred.getSuccExceptions());
+              setCommonExceptionHandlers = new HashSet<>(pred.getSuccExceptions());
             }
             else {
               setCommonExceptionHandlers.retainAll(pred.getSuccExceptions());
@@ -159,7 +159,7 @@ public class DeadCodeHelper {
           BasicBlock pred = block.getPreds().get(0);
           pred.removeSuccessor(block);
 
-          List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(block.getSuccs());
+          List<BasicBlock> lstSuccs = new ArrayList<>(block.getSuccs());
           for (BasicBlock succ : lstSuccs) {
             block.removeSuccessor(succ);
             pred.addSuccessor(succ);
@@ -205,13 +205,13 @@ public class DeadCodeHelper {
 
   public static boolean isDominator(ControlFlowGraph graph, BasicBlock block, BasicBlock dom) {
 
-    HashSet<BasicBlock> marked = new HashSet<BasicBlock>();
+    HashSet<BasicBlock> marked = new HashSet<>();
 
     if (block == dom) {
       return true;
     }
 
-    LinkedList<BasicBlock> lstNodes = new LinkedList<BasicBlock>();
+    LinkedList<BasicBlock> lstNodes = new LinkedList<>();
     lstNodes.add(block);
 
     while (!lstNodes.isEmpty()) {
@@ -262,7 +262,7 @@ public class DeadCodeHelper {
   public static void connectDummyExitBlock(ControlFlowGraph graph) {
 
     BasicBlock exit = graph.getLast();
-    for (BasicBlock block : new HashSet<BasicBlock>(exit.getPreds())) {
+    for (BasicBlock block : new HashSet<>(exit.getPreds())) {
       exit.removePredecessor(block);
       block.addSuccessor(exit);
     }
@@ -311,8 +311,8 @@ public class DeadCodeHelper {
 
           if (!block.getPreds().isEmpty()) {
 
-            HashSet<BasicBlock> setPredHandlersUnion = new HashSet<BasicBlock>();
-            HashSet<BasicBlock> setPredHandlersIntersection = new HashSet<BasicBlock>();
+            HashSet<BasicBlock> setPredHandlersUnion = new HashSet<>();
+            HashSet<BasicBlock> setPredHandlersIntersection = new HashSet<>();
 
             boolean firstpred = true;
             for (BasicBlock pred : block.getPreds()) {
@@ -339,7 +339,7 @@ public class DeadCodeHelper {
             }
 
             // remove redundant ranges
-            HashSet<BasicBlock> setRangesToBeRemoved = new HashSet<BasicBlock>(block.getSuccExceptions());
+            HashSet<BasicBlock> setRangesToBeRemoved = new HashSet<>(block.getSuccExceptions());
             setRangesToBeRemoved.removeAll(setPredHandlersUnion);
 
             for (BasicBlock handler : setRangesToBeRemoved) {
@@ -369,7 +369,7 @@ public class DeadCodeHelper {
               }
 
               // remove superfluous ranges from successors
-              for (BasicBlock succ : new HashSet<BasicBlock>(block.getSuccExceptions())) {
+              for (BasicBlock succ : new HashSet<>(block.getSuccExceptions())) {
                 if (!bpred.getSuccExceptions().contains(succ)) {
                   ExceptionRangeCFG range = graph.getExceptionRange(succ, block);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
index c6495e6..30d39fb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
@@ -25,7 +25,7 @@ public class ClearStructHelper {
 
   public static void clearStatements(RootStatement root) {
 
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
index 90d2732..aea5afa 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
@@ -70,7 +70,7 @@ public class ConcatenationHelper {
 
 
     // iterate in depth, collecting possible operands
-    List<Exprent> lstOperands = new ArrayList<Exprent>();
+    List<Exprent> lstOperands = new ArrayList<>();
 
     while (true) {
 
@@ -160,7 +160,7 @@ public class ConcatenationHelper {
       if (constant.type == CodeConstants.CONSTANT_String) {
         String recipe = ((PrimitiveConstant)constant).getString();
 
-        List<Exprent> res = new ArrayList<Exprent>();
+        List<Exprent> res = new ArrayList<>();
         StringBuilder acc = new StringBuilder();
         int parameterId = 0;
         for (int i = 0; i < recipe.length(); i++) {
@@ -195,7 +195,7 @@ public class ConcatenationHelper {
         return res;
       }
     }
-    return new ArrayList<Exprent>(parameters);
+    return new ArrayList<>(parameters);
   }
 
   private static boolean isAppendConcat(InvocationExprent expr, VarType cltype) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
index 9c719db..3dc4cf0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
@@ -25,9 +25,9 @@ public class DecHelper {
 
   public static boolean checkStatementExceptions(List<Statement> lst) {
 
-    Set<Statement> all = new HashSet<Statement>(lst);
+    Set<Statement> all = new HashSet<>(lst);
 
-    Set<Statement> handlers = new HashSet<Statement>();
+    Set<Statement> handlers = new HashSet<>();
     Set<Statement> intersection = null;
 
     for (Statement stat : lst) {
@@ -37,7 +37,7 @@ public class DecHelper {
         intersection = setNew;
       }
       else {
-        HashSet<Statement> interclone = new HashSet<Statement>(intersection);
+        HashSet<Statement> interclone = new HashSet<>(intersection);
         interclone.removeAll(setNew);
 
         intersection.retainAll(setNew);
@@ -197,7 +197,7 @@ public class DecHelper {
 
   public static HashSet<Statement> getUniquePredExceptions(Statement head) {
 
-    HashSet<Statement> setHandlers = new HashSet<Statement>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_FORWARD));
+    HashSet<Statement> setHandlers = new HashSet<>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_FORWARD));
 
     Iterator<Statement> it = setHandlers.iterator();
     while (it.hasNext()) {
@@ -209,7 +209,7 @@ public class DecHelper {
   }
 
   public static List<Exprent> copyExprentList(List<Exprent> lst) {
-    List<Exprent> ret = new ArrayList<Exprent>();
+    List<Exprent> ret = new ArrayList<>();
     for (Exprent expr : lst) {
       ret.add(expr.copy());
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
index 00eea78..ea8e537 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
@@ -35,7 +35,7 @@ public class DomHelper {
 
   private static RootStatement graphToStatement(ControlFlowGraph graph) {
 
-    VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<Statement, Integer>();
+    VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<>();
     VBStyleCollection<BasicBlock, Integer> blocks = graph.getBlocks();
 
     for (BasicBlock block : blocks) {
@@ -103,14 +103,14 @@ public class DomHelper {
 
   public static VBStyleCollection<List<Integer>, Integer> calcPostDominators(Statement container) {
 
-    HashMap<Statement, FastFixedSet<Statement>> lists = new HashMap<Statement, FastFixedSet<Statement>>();
+    HashMap<Statement, FastFixedSet<Statement>> lists = new HashMap<>();
 
     StrongConnectivityHelper schelper = new StrongConnectivityHelper(container);
     List<List<Statement>> components = schelper.getComponents();
 
     List<Statement> lstStats = container.getPostReversePostOrderList(StrongConnectivityHelper.getExitReps(components));
 
-    FastFixedSetFactory<Statement> factory = new FastFixedSetFactory<Statement>(lstStats);
+    FastFixedSetFactory<Statement> factory = new FastFixedSetFactory<>(lstStats);
 
     FastFixedSet<Statement> setFlagNodes = factory.spawnEmptySet();
     setFlagNodes.setAllElements();
@@ -176,17 +176,17 @@ public class DomHelper {
     }
     while (!setFlagNodes.isEmpty());
 
-    VBStyleCollection<List<Integer>, Integer> ret = new VBStyleCollection<List<Integer>, Integer>();
+    VBStyleCollection<List<Integer>, Integer> ret = new VBStyleCollection<>();
     List<Statement> lstRevPost = container.getReversePostOrderList(); // sort order crucial!
 
-    final HashMap<Integer, Integer> mapSortOrder = new HashMap<Integer, Integer>();
+    final HashMap<Integer, Integer> mapSortOrder = new HashMap<>();
     for (int i = 0; i < lstRevPost.size(); i++) {
       mapSortOrder.put(lstRevPost.get(i).id, i);
     }
 
     for (Statement st : lstStats) {
 
-      List<Integer> lstPosts = new ArrayList<Integer>();
+      List<Integer> lstPosts = new ArrayList<>();
       for (Statement stt : lists.get(st)) {
         lstPosts.add(stt.id);
       }
@@ -207,7 +207,7 @@ public class DomHelper {
 
     RootStatement root = graphToStatement(graph);
 
-    if (!processStatement(root, new HashMap<Integer, Set<Integer>>())) {
+    if (!processStatement(root, new HashMap<>())) {
 
       //			try {
       //				DotExporter.toDotFile(root.getFirst().getStats().get(13), new File("c:\\Temp\\stat1.dot"));
@@ -217,7 +217,7 @@ public class DomHelper {
       throw new RuntimeException("parsing failure!");
     }
 
-    LabelHelper.lowContinueLabels(root, new HashSet<StatEdge>());
+    LabelHelper.lowContinueLabels(root, new HashSet<>());
 
     SequenceHelper.condenseSequences(root);
     root.buildMonitorFlags();
@@ -287,7 +287,7 @@ public class DomHelper {
                 SynchronizedStatement sync = new SynchronizedStatement(current, ca.getFirst(), ca.getHandler());
                 sync.setAllParent();
 
-                for (StatEdge edge : new HashSet<StatEdge>(ca.getLabelEdges())) {
+                for (StatEdge edge : new HashSet<>(ca.getLabelEdges())) {
                   sync.addLabeledEdge(edge);
                 }
 
@@ -357,7 +357,7 @@ public class DomHelper {
           //						DotExporter.toDotFile(general, new File("c:\\Temp\\stat1.dot"));
           //					} catch(Exception ex) {ex.printStackTrace();}
 
-          mapExtPost = new HashMap<Integer, Set<Integer>>();
+          mapExtPost = new HashMap<>();
           mapRefreshed = true;
         }
 
@@ -378,7 +378,7 @@ public class DomHelper {
             Statement stat = findGeneralStatement(general, forceall, mapExtPost);
 
             if (stat != null) {
-              boolean complete = processStatement(stat, general.getFirst() == stat ? mapExtPost : new HashMap<Integer, Set<Integer>>());
+              boolean complete = processStatement(stat, general.getFirst() == stat ? mapExtPost : new HashMap<>());
 
               if (complete) {
                 // replace general purpose statement with simple one
@@ -388,7 +388,7 @@ public class DomHelper {
                 return false;
               }
 
-              mapExtPost = new HashMap<Integer, Set<Integer>>();
+              mapExtPost = new HashMap<>();
               mapRefreshed = true;
               reducibility = 0;
             }
@@ -409,7 +409,7 @@ public class DomHelper {
         break;
       }
       else {
-        mapExtPost = new HashMap<Integer, Set<Integer>>();
+        mapExtPost = new HashMap<>();
       }
     }
 
@@ -427,13 +427,13 @@ public class DomHelper {
     }
 
     if (forceall) {
-      vbPost = new VBStyleCollection<List<Integer>, Integer>();
+      vbPost = new VBStyleCollection<>();
       List<Statement> lstAll = stat.getPostReversePostOrderList();
 
       for (Statement st : lstAll) {
         Set<Integer> set = mapExtPost.get(st.id);
         if (set != null) {
-          vbPost.addWithKey(new ArrayList<Integer>(set), st.id); // FIXME: sort order!!
+          vbPost.addWithKey(new ArrayList<>(set), st.id); // FIXME: sort order!!
         }
       }
 
@@ -443,7 +443,7 @@ public class DomHelper {
         for (Integer id : setFirst) {
           List<Integer> lst = vbPost.getWithKey(id);
           if (lst == null) {
-            vbPost.addWithKey(lst = new ArrayList<Integer>(), id);
+            vbPost.addWithKey(lst = new ArrayList<>(), id);
           }
           lst.add(id);
         }
@@ -482,11 +482,11 @@ public class DomHelper {
 
         boolean same = (post == head);
 
-        HashSet<Statement> setNodes = new HashSet<Statement>();
-        HashSet<Statement> setPreds = new HashSet<Statement>();
+        HashSet<Statement> setNodes = new HashSet<>();
+        HashSet<Statement> setPreds = new HashSet<>();
 
         // collect statement nodes
-        HashSet<Statement> setHandlers = new HashSet<Statement>();
+        HashSet<Statement> setHandlers = new HashSet<>();
         setHandlers.add(head);
         while (true) {
 
@@ -504,7 +504,7 @@ public class DomHelper {
             }
 
             if (addhd) {
-              LinkedList<Statement> lstStack = new LinkedList<Statement>();
+              LinkedList<Statement> lstStack = new LinkedList<>();
               lstStack.add(handler);
 
               while (!lstStack.isEmpty()) {
@@ -618,14 +618,14 @@ public class DomHelper {
 
           // update the postdominator map
           if (!mapExtPost.isEmpty()) {
-            HashSet<Integer> setOldNodes = new HashSet<Integer>();
+            HashSet<Integer> setOldNodes = new HashSet<>();
             for (Statement old : result.getStats()) {
               setOldNodes.add(old.id);
             }
 
             Integer newid = result.id;
 
-            for (Integer key : new ArrayList<Integer>(mapExtPost.keySet())) {
+            for (Integer key : new ArrayList<>(mapExtPost.keySet())) {
               Set<Integer> set = mapExtPost.get(key);
 
               int oldsize = set.size();
@@ -634,7 +634,7 @@ public class DomHelper {
               if (setOldNodes.contains(key)) {
                 Set<Integer> setNew = mapExtPost.get(newid);
                 if (setNew == null) {
-                  mapExtPost.put(newid, setNew = new HashSet<Integer>());
+                  mapExtPost.put(newid, setNew = new HashSet<>());
                 }
                 setNew.addAll(set);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
index 16f7da0..3bad6c6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
@@ -76,7 +76,7 @@ public class EliminateLoopsHelper {
     }
 
     // collect relevant break edges
-    List<StatEdge> lstBreakEdges = new ArrayList<StatEdge>();
+    List<StatEdge> lstBreakEdges = new ArrayList<>();
     for (StatEdge edge : loop.getLabelEdges()) {
       if (edge.getType() == StatEdge.TYPE_BREAK) { // all break edges are explicit because of LOOP_DO type
         lstBreakEdges.add(edge);
@@ -99,8 +99,8 @@ public class EliminateLoopsHelper {
     if (!lstBreakEdges.isEmpty()) {
       if (firstok) {
 
-        HashMap<Integer, Boolean> statLabeled = new HashMap<Integer, Boolean>();
-        List<Statement> lstEdgeClosures = new ArrayList<Statement>();
+        HashMap<Integer, Boolean> statLabeled = new HashMap<>();
+        List<Statement> lstEdgeClosures = new ArrayList<>();
 
         for (StatEdge edge : lstBreakEdges) {
           Statement minclosure = LowBreakHelper.getMinClosure(loopcontent, edge.getSource());
@@ -193,7 +193,7 @@ public class EliminateLoopsHelper {
   private static void eliminateLoop(Statement loop, Statement parentloop) {
 
     // move continue edges to the parent loop
-    List<StatEdge> lst = new ArrayList<StatEdge>(loop.getLabelEdges());
+    List<StatEdge> lst = new ArrayList<>(loop.getLabelEdges());
     for (StatEdge edge : lst) {
       loop.removePredecessor(edge);
       edge.getSource().changeEdgeNode(Statement.DIRECTION_FORWARD, edge, parentloop);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
index 6d0d381..26a3b23 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
@@ -61,7 +61,7 @@ public class ExitHelper {
               set.remove(secondlast);
 
               if (set.isEmpty()) {
-                last.setExprents(new ArrayList<Exprent>());
+                last.setExprents(new ArrayList<>());
                 found = true;
                 break;
               }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 71e2231..5931826 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -46,7 +46,7 @@ public class ExprProcessor implements CodeConstants {
   public static final String UNKNOWN_TYPE_STRING = "<unknown>";
   public static final String NULL_TYPE_STRING = "<null>";
 
-  private static final Map<Integer, Integer> mapConsts = new HashMap<Integer, Integer>();
+  private static final Map<Integer, Integer> mapConsts = new HashMap<>();
   static {
     mapConsts.put(opc_arraylength, FunctionExprent.FUNCTION_ARRAY_LENGTH);
     mapConsts.put(opc_checkcast, FunctionExprent.FUNCTION_CAST);
@@ -120,32 +120,32 @@ public class ExprProcessor implements CodeConstants {
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
     // collect finally entry points
-    Set<String> setFinallyShortRangeEntryPoints = new HashSet<String>();
+    Set<String> setFinallyShortRangeEntryPoints = new HashSet<>();
     for (List<FinallyPathWrapper> lst : dgraph.mapShortRangeFinallyPaths.values()) {
       for (FinallyPathWrapper finwrap : lst) {
         setFinallyShortRangeEntryPoints.add(finwrap.entry);
       }
     }
 
-    Set<String> setFinallyLongRangeEntryPaths = new HashSet<String>();
+    Set<String> setFinallyLongRangeEntryPaths = new HashSet<>();
     for (List<FinallyPathWrapper> lst : dgraph.mapLongRangeFinallyPaths.values()) {
       for (FinallyPathWrapper finwrap : lst) {
         setFinallyLongRangeEntryPaths.add(finwrap.source + "##" + finwrap.entry);
       }
     }
 
-    Map<String, VarExprent> mapCatch = new HashMap<String, VarExprent>();
+    Map<String, VarExprent> mapCatch = new HashMap<>();
     collectCatchVars(root, flatthelper, mapCatch);
 
-    Map<DirectNode, Map<String, PrimitiveExprsList>> mapData = new HashMap<DirectNode, Map<String, PrimitiveExprsList>>();
+    Map<DirectNode, Map<String, PrimitiveExprsList>> mapData = new HashMap<>();
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
-    LinkedList<LinkedList<String>> stackEntryPoint = new LinkedList<LinkedList<String>>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
+    LinkedList<LinkedList<String>> stackEntryPoint = new LinkedList<>();
 
     stack.add(dgraph.first);
-    stackEntryPoint.add(new LinkedList<String>());
+    stackEntryPoint.add(new LinkedList<>());
 
-    Map<String, PrimitiveExprsList> map = new HashMap<String, PrimitiveExprsList>();
+    Map<String, PrimitiveExprsList> map = new HashMap<>();
     map.put(null, new PrimitiveExprsList());
     mapData.put(dgraph.first, map);
 
@@ -187,10 +187,10 @@ public class ExprProcessor implements CodeConstants {
 
           Map<String, PrimitiveExprsList> mapSucc = mapData.get(nd);
           if (mapSucc == null) {
-            mapData.put(nd, mapSucc = new HashMap<String, PrimitiveExprsList>());
+            mapData.put(nd, mapSucc = new HashMap<>());
           }
 
-          LinkedList<String> ndentrypoints = new LinkedList<String>(entrypoints);
+          LinkedList<String> ndentrypoints = new LinkedList<>(entrypoints);
 
           if (setFinallyLongRangeEntryPaths.contains(node.id + "##" + nd.id)) {
             ndentrypoints.addLast(node.id);
@@ -641,7 +641,7 @@ public class ExprProcessor implements CodeConstants {
 
     int base = VarExprent.STACK_BASE + stack.size();
 
-    LinkedList<VarExprent> lst = new LinkedList<VarExprent>();
+    LinkedList<VarExprent> lst = new LinkedList<>();
 
     for (int i = -1; i >= offset; i--) {
       Exprent varex = stack.pop();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index d3e1d04..0123691 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -46,8 +46,8 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class FinallyProcessor {
-  private final Map<Integer, Integer> finallyBlockIDs = new HashMap<Integer, Integer>();
-  private final Map<Integer, Integer> catchallBlockIDs = new HashMap<Integer, Integer>();
+  private final Map<Integer, Integer> finallyBlockIDs = new HashMap<>();
+  private final Map<Integer, Integer> catchallBlockIDs = new HashMap<>();
 
   private final MethodDescriptor methodDescriptor;
   private final VarProcessor varProcessor;
@@ -64,7 +64,7 @@ public class FinallyProcessor {
   private boolean processStatementEx(StructMethod mt, RootStatement root, ControlFlowGraph graph) {
     int bytecode_version = mt.getClassStruct().getBytecodeVersion();
 
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
@@ -191,7 +191,7 @@ public class FinallyProcessor {
   }
 
   private Record getFinallyInformation(StructMethod mt, RootStatement root, CatchAllStatement fstat) {
-    Map<BasicBlock, Boolean> mapLast = new HashMap<BasicBlock, Boolean>();
+    Map<BasicBlock, Boolean> mapLast = new HashMap<>();
 
     BasicBlockStatement firstBlockStatement = fstat.getHandler().getBasichead();
     BasicBlock firstBasicBlock = firstBlockStatement.getBlock();
@@ -220,10 +220,10 @@ public class FinallyProcessor {
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
     stack.add(dgraph.first);
 
-    Set<DirectNode> setVisited = new HashSet<DirectNode>();
+    Set<DirectNode> setVisited = new HashSet<>();
 
     while (!stack.isEmpty()) {
 
@@ -374,7 +374,7 @@ public class FinallyProcessor {
                                       Record information,
                                       int bytecode_version) {
 
-    Set<BasicBlock> setCopy = new HashSet<BasicBlock>(setTry);
+    Set<BasicBlock> setCopy = new HashSet<>(setTry);
 
     int finallytype = information.firstCode;
     Map<BasicBlock, Boolean> mapLast = information.mapLast;
@@ -464,7 +464,7 @@ public class FinallyProcessor {
     setCopy.add(newhead);
     setCopy.add(newheadinit);
 
-    for (BasicBlock hd : new HashSet<BasicBlock>(newheadinit.getSuccExceptions())) {
+    for (BasicBlock hd : new HashSet<>(newheadinit.getSuccExceptions())) {
       ExceptionRangeCFG range = graph.getExceptionRange(hd, newheadinit);
 
       if (setCopy.containsAll(range.getProtectedRange())) {
@@ -477,7 +477,7 @@ public class FinallyProcessor {
 
   private static void insertBlockBefore(ControlFlowGraph graph, BasicBlock oldblock, BasicBlock newblock) {
 
-    List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
+    List<BasicBlock> lstTemp = new ArrayList<>();
     lstTemp.addAll(oldblock.getPreds());
     lstTemp.addAll(oldblock.getPredExceptions());
 
@@ -510,7 +510,7 @@ public class FinallyProcessor {
 
   private static HashSet<BasicBlock> getAllBasicBlocks(Statement stat) {
 
-    List<Statement> lst = new LinkedList<Statement>();
+    List<Statement> lst = new LinkedList<>();
     lst.add(stat);
 
     int index = 0;
@@ -527,7 +527,7 @@ public class FinallyProcessor {
     }
     while (index < lst.size());
 
-    HashSet<BasicBlock> res = new HashSet<BasicBlock>();
+    HashSet<BasicBlock> res = new HashSet<>();
 
     for (Statement st : lst) {
       res.add(((BasicBlockStatement)st).getBlock());
@@ -569,7 +569,7 @@ public class FinallyProcessor {
     }
 
     // identify start blocks
-    HashSet<BasicBlock> startBlocks = new HashSet<BasicBlock>();
+    HashSet<BasicBlock> startBlocks = new HashSet<>();
     for (BasicBlock block : tryBlocks) {
       startBlocks.addAll(block.getSuccs());
     }
@@ -578,7 +578,7 @@ public class FinallyProcessor {
     startBlocks.remove(graph.getLast());
     startBlocks.removeAll(tryBlocks);
 
-    List<Area> lstAreas = new ArrayList<Area>();
+    List<Area> lstAreas = new ArrayList<>();
 
     for (BasicBlock start : startBlocks) {
 
@@ -648,17 +648,17 @@ public class FinallyProcessor {
       public BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) {
         this.blockCatch = blockCatch;
         this.blockSample = blockSample;
-        this.lstStoreVars = new ArrayList<int[]>(lstStoreVars);
+        this.lstStoreVars = new ArrayList<>(lstStoreVars);
       }
     }
 
-    List<BlockStackEntry> stack = new LinkedList<BlockStackEntry>();
+    List<BlockStackEntry> stack = new LinkedList<>();
 
-    Set<BasicBlock> setSample = new HashSet<BasicBlock>();
+    Set<BasicBlock> setSample = new HashSet<>();
 
-    Map<String, BasicBlock[]> mapNext = new HashMap<String, BasicBlock[]>();
+    Map<String, BasicBlock[]> mapNext = new HashMap<>();
 
-    stack.add(new BlockStackEntry(startCatch, startSample, new ArrayList<int[]>()));
+    stack.add(new BlockStackEntry(startCatch, startSample, new ArrayList<>()));
 
     while (!stack.isEmpty()) {
 
@@ -719,7 +719,7 @@ public class FinallyProcessor {
 
                   if (instrCatch.opcode == CodeConstants.opc_astore &&
                       instrSample.opcode == CodeConstants.opc_astore) {
-                    lst = new ArrayList<int[]>(lst);
+                    lst = new ArrayList<>(lst);
                     lst.add(new int[]{instrCatch.getOperand(0), instrSample.getOperand(0)});
                   }
                 }
@@ -738,7 +738,7 @@ public class FinallyProcessor {
       }
 
       if (isLastBlock) {
-        Set<BasicBlock> setSuccs = new HashSet<BasicBlock>(blockSample.getSuccs());
+        Set<BasicBlock> setSuccs = new HashSet<>(blockSample.getSuccs());
         setSuccs.removeAll(setSample);
 
         for (BlockStackEntry stackent : stack) {
@@ -753,7 +753,7 @@ public class FinallyProcessor {
       }
     }
 
-    return new Area(startSample, setSample, getUniqueNext(graph, new HashSet<BasicBlock[]>(mapNext.values())));
+    return new Area(startSample, setSample, getUniqueNext(graph, new HashSet<>(mapNext.values())));
   }
 
   private static BasicBlock getUniqueNext(ControlFlowGraph graph, Set<BasicBlock[]> setNext) {
@@ -887,7 +887,7 @@ public class FinallyProcessor {
     if (seqPattern.length() < seqSample.length()) { // split in two blocks
 
       SimpleInstructionSequence seq = new SimpleInstructionSequence();
-      LinkedList<Integer> oldOffsets = new LinkedList<Integer>();
+      LinkedList<Integer> oldOffsets = new LinkedList<>();
       for (int i = seqSample.length() - 1; i >= seqPattern.length(); i--) {
         seq.addInstruction(0, seqSample.getInstr(i), -1);
         oldOffsets.addFirst(sample.getOldOffset(i));
@@ -898,7 +898,7 @@ public class FinallyProcessor {
       newblock.setSeq(seq);
       newblock.getInstrOldOffsets().addAll(oldOffsets);
 
-      List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
+      List<BasicBlock> lstTemp = new ArrayList<>();
       lstTemp.addAll(sample.getSuccs());
 
       // move successors
@@ -976,14 +976,14 @@ public class FinallyProcessor {
     }
 
     // collect common exception ranges of predecessors and successors
-    Set<BasicBlock> setCommonExceptionHandlers = new HashSet<BasicBlock>(next.getSuccExceptions());
+    Set<BasicBlock> setCommonExceptionHandlers = new HashSet<>(next.getSuccExceptions());
     for (BasicBlock pred : start.getPreds()) {
       setCommonExceptionHandlers.retainAll(pred.getSuccExceptions());
     }
 
     boolean is_outside_range = false;
 
-    Set<BasicBlock> setPredecessors = new HashSet<BasicBlock>(start.getPreds());
+    Set<BasicBlock> setPredecessors = new HashSet<>(start.getPreds());
 
     // replace start with next
     for (BasicBlock pred : setPredecessors) {
@@ -1005,7 +1005,7 @@ public class FinallyProcessor {
           is_outside_range = true;
         }
 
-        Set<ExceptionRangeCFG> setRemovedExceptionRanges = new HashSet<ExceptionRangeCFG>();
+        Set<ExceptionRangeCFG> setRemovedExceptionRanges = new HashSet<>();
         for (BasicBlock handler : block.getSuccExceptions()) {
           setRemovedExceptionRanges.add(graph.getExceptionRange(handler, block));
         }
@@ -1020,7 +1020,7 @@ public class FinallyProcessor {
         // shift extern edges on splitted blocks
         if (block.getSeq().isEmpty() && block.getSuccs().size() == 1) {
           BasicBlock succs = block.getSuccs().get(0);
-          for (BasicBlock pred : new ArrayList<BasicBlock>(block.getPreds())) {
+          for (BasicBlock pred : new ArrayList<>(block.getPreds())) {
             if (!setBlocks.contains(pred)) {
               pred.replaceSuccessor(block, succs);
             }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index 3adf70c..3a88aca 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -34,7 +34,7 @@ public class IfHelper {
 
   public static boolean mergeAllIfs(RootStatement root) {
 
-    boolean res = mergeAllIfsRec(root, new HashSet<Integer>());
+    boolean res = mergeAllIfsRec(root, new HashSet<>());
 
     if (res) {
       SequenceHelper.condenseSequences(root);
@@ -88,7 +88,7 @@ public class IfHelper {
 
       boolean updated = false;
 
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       if (statement.type == Statement.TYPE_IF) {
         lst.add(statement);
       }
@@ -196,7 +196,7 @@ public class IfHelper {
             // merge if conditions
             IfExprent statexpr = ifparent.getHeadexprent();
 
-            List<Exprent> lstOperands = new ArrayList<Exprent>();
+            List<Exprent> lstOperands = new ArrayList<>();
             lstOperands.add(statexpr.getCondition());
             lstOperands.add(ifchild.getHeadexprent().getCondition());
 
@@ -250,7 +250,7 @@ public class IfHelper {
             // merge if conditions
             IfExprent statexpr = ifparent.getHeadexprent();
 
-            List<Exprent> lstOperands = new ArrayList<Exprent>();
+            List<Exprent> lstOperands = new ArrayList<>();
             lstOperands.add(statexpr.getCondition());
             lstOperands.add(new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, ifchild.getHeadexprent().getCondition(), null));
             statexpr.setCondition(new FunctionExprent(FunctionExprent.FUNCTION_CADD, lstOperands, null));
@@ -305,7 +305,7 @@ public class IfHelper {
             // merge if conditions
             IfExprent statexpr = secondif.getHeadexprent();
 
-            List<Exprent> lstOperands = new ArrayList<Exprent>();
+            List<Exprent> lstOperands = new ArrayList<>();
             lstOperands.add(firstif.getHeadexprent().getCondition());
 
             if (path == 2) {
@@ -509,7 +509,7 @@ public class IfHelper {
       SequenceStatement sequence = (SequenceStatement)parent;
 
       // build and cut the new else statement
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       for (int i = sequence.getStats().size() - 1; i >= 0; i--) {
         Statement sttemp = sequence.getStats().get(i);
         if (sttemp == ifstat) {
@@ -597,7 +597,7 @@ public class IfHelper {
         SequenceStatement sequence = (SequenceStatement)parent;
 
         // build and cut the new else statement
-        List<Statement> lst = new ArrayList<Statement>();
+        List<Statement> lst = new ArrayList<>();
         for (int i = sequence.getStats().size() - 1; i >= 0; i--) {
           Statement sttemp = sequence.getStats().get(i);
           if (sttemp == ifstat) {
@@ -735,8 +735,8 @@ public class IfHelper {
   private static class IfNode {
     public final Statement value;
 
-    public final List<IfNode> succs = new ArrayList<IfNode>();
-    public final List<Integer> edgetypes = new ArrayList<Integer>();
+    public final List<IfNode> succs = new ArrayList<>();
+    public final List<Integer> edgetypes = new ArrayList<>();
 
     public IfNode(Statement value) {
       this.value = value;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
index adeda02..205e25c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
@@ -68,7 +68,7 @@ public class InlineSingleBlockHelper {
     Statement parent = source.getParent();
     source.removeSuccessor(edge);
 
-    List<Statement> lst = new ArrayList<Statement>();
+    List<Statement> lst = new ArrayList<>();
     for (int i = seq.getStats().size() - 1; i >= index; i--) {
       lst.add(0, seq.getStats().remove(i));
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
index 26cc638..bba1484 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
@@ -33,7 +33,7 @@ public class LabelHelper {
 
     liftClosures(root);
 
-    lowContinueLabels(root, new HashSet<StatEdge>());
+    lowContinueLabels(root, new HashSet<>());
 
     lowClosures(root);
   }
@@ -63,7 +63,7 @@ public class LabelHelper {
           if (dest.type != Statement.TYPE_DUMMYEXIT) {
             Statement parent = dest.getParent();
 
-            List<Statement> lst = new ArrayList<Statement>();
+            List<Statement> lst = new ArrayList<>();
             if (parent.type == Statement.TYPE_SEQUENCE) {
               lst.addAll(parent.getStats());
             }
@@ -131,14 +131,14 @@ public class LabelHelper {
         lowContinueLabels(st, edges);
       }
       else {
-        lowContinueLabels(st, new HashSet<StatEdge>());
+        lowContinueLabels(st, new HashSet<>());
       }
     }
   }
 
   public static void lowClosures(Statement stat) {
 
-    for (StatEdge edge : new ArrayList<StatEdge>(stat.getLabelEdges())) {
+    for (StatEdge edge : new ArrayList<>(stat.getLabelEdges())) {
 
       if (edge.getType() == StatEdge.TYPE_BREAK) {  // FIXME: ?
         for (Statement st : stat.getStats()) {
@@ -181,7 +181,7 @@ public class LabelHelper {
 
   private static HashMap<Statement, List<StatEdge>> setExplicitEdges(Statement stat) {
 
-    HashMap<Statement, List<StatEdge>> mapEdges = new HashMap<Statement, List<StatEdge>>();
+    HashMap<Statement, List<StatEdge>> mapEdges = new HashMap<>();
 
     if (stat.getExprents() != null) {
       return mapEdges;
@@ -279,7 +279,7 @@ public class LabelHelper {
           Statement stlast = swst.getCaseStatements().get(last);
           if (stlast.getExprents() != null && stlast.getExprents().isEmpty()) {
             StatEdge edge = stlast.getAllSuccessorEdges().get(0);
-            mapEdges.put(edge.getDestination(), new ArrayList<StatEdge>(Arrays.asList(new StatEdge[]{edge})));
+            mapEdges.put(edge.getDestination(), new ArrayList<>(Arrays.asList(new StatEdge[]{edge})));
           }
           else {
             mapEdges = setExplicitEdges(stlast);
@@ -340,7 +340,7 @@ public class LabelHelper {
             edge.explicit = false;
           }
 
-          mapEdges.put(newedge.getDestination(), new ArrayList<StatEdge>(Arrays.asList(new StatEdge[]{newedge})));
+          mapEdges.put(newedge.getDestination(), new ArrayList<>(Arrays.asList(new StatEdge[]{newedge})));
         }
       }
     }
@@ -388,7 +388,7 @@ public class LabelHelper {
     }
 
     if (statedge != null) {
-      mapEdges.put(statedge.getDestination(), new ArrayList<StatEdge>(Arrays.asList(new StatEdge[]{statedge})));
+      mapEdges.put(statedge.getDestination(), new ArrayList<>(Arrays.asList(new StatEdge[]{statedge})));
     }
   }
 
@@ -422,8 +422,8 @@ public class LabelHelper {
 
   private static HashSet<Statement>[] processStatementLabel(Statement stat) {
 
-    HashSet<Statement> setBreak = new HashSet<Statement>();
-    HashSet<Statement> setContinue = new HashSet<Statement>();
+    HashSet<Statement> setBreak = new HashSet<>();
+    HashSet<Statement> setContinue = new HashSet<>();
 
     if (stat.getExprents() == null) {
       for (Statement st : stat.getStats()) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
index d5c9e8f..1fac826 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
@@ -189,7 +189,7 @@ public class LoopExtractHelper {
 
     loop.addSuccessor(new StatEdge(StatEdge.TYPE_REGULAR, loop, target));
 
-    for (StatEdge edge : new ArrayList<StatEdge>(block.getLabelEdges())) {
+    for (StatEdge edge : new ArrayList<>(block.getLabelEdges())) {
       if (edge.getType() == StatEdge.TYPE_CONTINUE || edge == ifedge) {
         loop.addLabeledEdge(edge);
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
index 71d3d79..0bc723d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -185,7 +185,7 @@ public class MergeHelper {
               if (firstif == stat.getFirst()) {
                 BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
                   DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-                bstat.setExprents(new ArrayList<Exprent>());
+                bstat.setExprents(new ArrayList<>());
                 stat.replaceStatement(firstif, bstat);
               }
               else {
@@ -224,7 +224,7 @@ public class MergeHelper {
               if (firstif.getIfstat() == null) {
                 BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
                   DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-                bstat.setExprents(new ArrayList<Exprent>());
+                bstat.setExprents(new ArrayList<>());
 
                 ifedge.setSource(bstat);
                 bstat.addSuccessor(ifedge);
@@ -382,7 +382,7 @@ public class MergeHelper {
     if (stat == dostat.getFirst()) {
       BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
         DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-      bstat.setExprents(new ArrayList<Exprent>());
+      bstat.setExprents(new ArrayList<>());
       dostat.replaceStatement(stat, bstat);
     }
     else {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
index 4eb366b..2371a72 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
@@ -38,10 +38,10 @@ public class PPandMMHelper {
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
     stack.add(dgraph.first);
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
+    HashSet<DirectNode> setVisited = new HashSet<>();
 
     boolean res = false;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
index 0a1831e..fff1841 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 public class PrimitiveExprsList {
 
-  private final List<Exprent> lstExprents = new ArrayList<Exprent>();
+  private final List<Exprent> lstExprents = new ArrayList<>();
 
   private ExprentStack stack = new ExprentStack();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
index 12aecbb..f95d2c3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
@@ -43,7 +43,7 @@ public class SecondaryFunctionsHelper {
     FunctionExprent.FUNCTION_CADD
   };
 
-  private static final HashMap<Integer, Integer[]> mapNumComparisons = new HashMap<Integer, Integer[]>();
+  private static final HashMap<Integer, Integer[]> mapNumComparisons = new HashMap<>();
 
   static {
     mapNumComparisons.put(FunctionExprent.FUNCTION_EQ,
@@ -102,7 +102,7 @@ public class SecondaryFunctionsHelper {
     while (replaced) {
       replaced = false;
 
-      List<Object> lstObjects = new ArrayList<Object>(stat.getExprents() == null ? stat.getSequentialObjects() : stat.getExprents());
+      List<Object> lstObjects = new ArrayList<>(stat.getExprents() == null ? stat.getSequentialObjects() : stat.getExprents());
 
       for (int i = 0; i < lstObjects.size(); i++) {
         Object obj = lstObjects.get(i);
@@ -229,7 +229,7 @@ public class SecondaryFunctionsHelper {
                 }
 
                 if (val == -1) {
-                  List<Exprent> lstBitNotOperand = new ArrayList<Exprent>();
+                  List<Exprent> lstBitNotOperand = new ArrayList<>();
                   lstBitNotOperand.add(lstOperands.get(1 - i));
                   return new FunctionExprent(FunctionExprent.FUNCTION_BIT_NOT, lstBitNotOperand, fexpr.bytecode);
                 }
@@ -250,7 +250,7 @@ public class SecondaryFunctionsHelper {
                     return lstOperands.get(1 - i);
                   }
                   else {
-                    List<Exprent> lstNotOperand = new ArrayList<Exprent>();
+                    List<Exprent> lstNotOperand = new ArrayList<>();
                     lstNotOperand.add(lstOperands.get(1 - i));
                     return new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, lstNotOperand, fexpr.bytecode);
                   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
index 75bbd39..05c7bd5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
@@ -39,7 +39,7 @@ public class SequenceHelper {
 
     if (stat.type == Statement.TYPE_SEQUENCE) {
 
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       lst.addAll(stat.getStats());
 
       boolean unfolded = false;
@@ -84,7 +84,7 @@ public class SequenceHelper {
               st.removeSuccessor(edge);
             }
 
-            for (StatEdge edge : new HashSet<StatEdge>(st.getLabelEdges())) {
+            for (StatEdge edge : new HashSet<>(st.getLabelEdges())) {
               if (edge.getSource() != last) {
                 last.addLabeledEdge(edge);
               }
@@ -302,7 +302,7 @@ public class SequenceHelper {
     BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
       DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
     if (stat.getExprents() == null) {
-      bstat.setExprents(new ArrayList<Exprent>());
+      bstat.setExprents(new ArrayList<>());
     }
     else {
       bstat.setExprents(DecHelper.copyExprentList(stat.getExprents()));
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index ddf6865..28b76e9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -310,7 +310,7 @@ public class SimplifyExprentsHelper {
 
           VarExprent arrvar = (VarExprent)as.getLeft();
 
-          HashMap<Integer, Exprent> mapInit = new HashMap<Integer, Exprent>();
+          HashMap<Integer, Exprent> mapInit = new HashMap<>();
 
           int i = 1;
           while (index + i < list.size() && i <= size) {
@@ -350,7 +350,7 @@ public class SimplifyExprentsHelper {
           if ((arrvar.isStack() && fraction > 0) || (size <= 7 && fraction >= 0.3) ||
               (size > 7 && fraction >= 0.7)) {
 
-            List<Exprent> lstRet = new ArrayList<Exprent>();
+            List<Exprent> lstRet = new ArrayList<>();
 
             VarType arrtype = newex.getNewType().decreaseArrayDim();
 
@@ -813,7 +813,7 @@ public class SimplifyExprentsHelper {
                 }
 
                 if (found) {
-                  List<Exprent> data = new ArrayList<Exprent>();
+                  List<Exprent> data = new ArrayList<>();
                   data.addAll(stif.getFirst().getExprents());
 
                   data.add(new AssignmentExprent(ifvar, new FunctionExprent(FunctionExprent.FUNCTION_IIF,
@@ -854,7 +854,7 @@ public class SimplifyExprentsHelper {
                 return false;
               }
 
-              List<Exprent> data = new ArrayList<Exprent>();
+              List<Exprent> data = new ArrayList<>();
               data.addAll(stif.getFirst().getExprents());
 
               data.add(new ExitExprent(ifex.getExitType(), new FunctionExprent(FunctionExprent.FUNCTION_IIF,
@@ -918,7 +918,7 @@ public class SimplifyExprentsHelper {
 
       assfirst.replaceExprent(assfirst.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null));
       
-      List<Exprent> data = new ArrayList<Exprent>();
+      List<Exprent> data = new ArrayList<>();
       data.addAll(stat.getFirst().getExprents());
 
       stat.setExprents(data);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index 62d3465..ea52cb3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -39,7 +39,7 @@ public class StackVarsProcessor {
 
   public void simplifyStackVars(RootStatement root, StructMethod mt, StructClass cl) {
 
-    HashSet<Integer> setReorderedIfs = new HashSet<Integer>();
+    HashSet<Integer> setReorderedIfs = new HashSet<>();
 
     SSAUConstructorSparseEx ssau = null;
 
@@ -149,12 +149,12 @@ public class StackVarsProcessor {
 
     boolean res = false;
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
-    LinkedList<HashMap<VarVersionPair, Exprent>> stackMaps = new LinkedList<HashMap<VarVersionPair, Exprent>>();
+    HashSet<DirectNode> setVisited = new HashSet<>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
+    LinkedList<HashMap<VarVersionPair, Exprent>> stackMaps = new LinkedList<>();
 
     stack.add(dgraph.first);
-    stackMaps.add(new HashMap<VarVersionPair, Exprent>());
+    stackMaps.add(new HashMap<>());
 
     while (!stack.isEmpty()) {
 
@@ -166,7 +166,7 @@ public class StackVarsProcessor {
       }
       setVisited.add(nd);
 
-      List<List<Exprent>> lstLists = new ArrayList<List<Exprent>>();
+      List<List<Exprent>> lstLists = new ArrayList<>();
 
       if (!nd.exprents.isEmpty()) {
         lstLists.add(nd.exprents);
@@ -211,7 +211,7 @@ public class StackVarsProcessor {
 
       for (DirectNode ndx : nd.succs) {
         stack.add(ndx);
-        stackMaps.add(new HashMap<VarVersionPair, Exprent>(mapVarValues));
+        stackMaps.add(new HashMap<>(mapVarValues));
       }
 
       // make sure the 3 special exprent lists in a loop (init, condition, increment) are not empty
@@ -329,7 +329,7 @@ public class StackVarsProcessor {
 
     VarVersionPair leftpaar = new VarVersionPair(left);
 
-    List<VarVersionNode> usedVers = new ArrayList<VarVersionNode>();
+    List<VarVersionNode> usedVers = new ArrayList<>();
     boolean notdom = getUsedVersions(ssau, leftpaar, usedVers);
 
     if (!notdom && usedVers.isEmpty()) {
@@ -395,7 +395,7 @@ public class StackVarsProcessor {
     boolean verreplaced = false;
 
 
-    HashSet<VarVersionPair> setTempUsedVers = new HashSet<VarVersionPair>();
+    HashSet<VarVersionPair> setTempUsedVers = new HashSet<>();
 
     for (VarVersionNode usedvar : usedVers) {
       VarVersionPair usedver = new VarVersionPair(usedvar.var, usedvar.version);
@@ -440,9 +440,9 @@ public class StackVarsProcessor {
 
   private static HashSet<VarVersionPair> getAllVersions(Exprent exprent) {
 
-    HashSet<VarVersionPair> res = new HashSet<VarVersionPair>();
+    HashSet<VarVersionPair> res = new HashSet<>();
 
-    List<Exprent> listTemp = new ArrayList<Exprent>(exprent.getAllExprents(true));
+    List<Exprent> listTemp = new ArrayList<>(exprent.getAllExprents(true));
     listTemp.add(exprent);
 
     for (Exprent expr : listTemp) {
@@ -523,7 +523,7 @@ public class StackVarsProcessor {
 
     VarVersionPair leftpaar = new VarVersionPair(left);
 
-    List<VarVersionNode> usedVers = new ArrayList<VarVersionNode>();
+    List<VarVersionNode> usedVers = new ArrayList<>();
     boolean notdom = getUsedVersions(ssau, leftpaar, usedVers);
 
     if (!notdom && usedVers.isEmpty()) {
@@ -557,7 +557,7 @@ public class StackVarsProcessor {
 
     boolean vernotreplaced = false;
 
-    HashSet<VarVersionPair> setTempUsedVers = new HashSet<VarVersionPair>();
+    HashSet<VarVersionPair> setTempUsedVers = new HashSet<>();
 
     for (VarVersionNode usedvar : usedVers) {
       VarVersionPair usedver = new VarVersionPair(usedvar.var, usedvar.version);
@@ -594,11 +594,11 @@ public class StackVarsProcessor {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
-    HashSet<VarVersionNode> setVisited = new HashSet<VarVersionNode>();
+    HashSet<VarVersionNode> setVisited = new HashSet<>();
 
-    HashSet<VarVersionNode> setNotDoms = new HashSet<VarVersionNode>();
+    HashSet<VarVersionNode> setNotDoms = new HashSet<>();
 
-    LinkedList<VarVersionNode> stack = new LinkedList<VarVersionNode>();
+    LinkedList<VarVersionNode> stack = new LinkedList<>();
     stack.add(varnode);
 
     while (!stack.isEmpty()) {
@@ -663,7 +663,7 @@ public class StackVarsProcessor {
         return false;
       }
 
-      HashSet<VarVersionNode> domset = new HashSet<VarVersionNode>();
+      HashSet<VarVersionNode> domset = new HashSet<>();
       for (VarVersionPair verpaar : ent.getValue()) {
         domset.add(ssuversions.nodes.getWithKey(verpaar));
       }
@@ -691,7 +691,7 @@ public class StackVarsProcessor {
                                                                              Exprent exprent,
                                                                              SSAUConstructorSparseEx ssau) {
 
-    HashMap<Integer, HashSet<VarVersionPair>> map = new HashMap<Integer, HashSet<VarVersionPair>>();
+    HashMap<Integer, HashSet<VarVersionPair>> map = new HashMap<>();
     SFormsFastMapDirect mapLiveVars = ssau.getLiveVarVersionsMap(leftvar);
 
     List<Exprent> lst = exprent.getAllExprents(true);
@@ -702,7 +702,7 @@ public class StackVarsProcessor {
         int varindex = ((VarExprent)expr).getIndex();
         if (leftvar.var != varindex) {
           if (mapLiveVars.containsKey(varindex)) {
-            HashSet<VarVersionPair> verset = new HashSet<VarVersionPair>();
+            HashSet<VarVersionPair> verset = new HashSet<>();
             for (Integer vers : mapLiveVars.get(varindex)) {
               verset.add(new VarVersionPair(varindex, vers.intValue()));
             }
@@ -720,7 +720,7 @@ public class StackVarsProcessor {
         if (ssau.getMapFieldVars().containsKey(expr.id)) {
           int varindex = ssau.getMapFieldVars().get(expr.id);
           if (mapLiveVars.containsKey(varindex)) {
-            HashSet<VarVersionPair> verset = new HashSet<VarVersionPair>();
+            HashSet<VarVersionPair> verset = new HashSet<>();
             for (Integer vers : mapLiveVars.get(varindex)) {
               verset.add(new VarVersionPair(varindex, vers.intValue()));
             }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
index 26d427b..8d5e762 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
@@ -66,7 +66,7 @@ public class StatEdge {
   public StatEdge(Statement source, Statement destination, List<String> exceptions) {
     this(TYPE_EXCEPTION, source, destination);
     if (exceptions != null) {
-      this.exceptions = new ArrayList<String>(exceptions);
+      this.exceptions = new ArrayList<>(exceptions);
     }
   }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
index 23f778d..047accd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
@@ -92,8 +92,8 @@ public class StrongConnectivityHelper {
 
   public List<List<Statement>> findComponents(Statement stat) {
 
-    components = new ArrayList<List<Statement>>();
-    setProcessed = new HashSet<Statement>();
+    components = new ArrayList<>();
+    setProcessed = new HashSet<>();
 
     visitTree(stat.getFirst());
 
@@ -115,7 +115,7 @@ public class StrongConnectivityHelper {
 
   public static boolean isExitComponent(List<Statement> lst) {
 
-    HashSet<Statement> set = new HashSet<Statement>();
+    HashSet<Statement> set = new HashSet<>();
     for (Statement stat : lst) {
       set.addAll(stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD));
     }
@@ -126,7 +126,7 @@ public class StrongConnectivityHelper {
 
   public static List<Statement> getExitReps(List<List<Statement>> lst) {
 
-    List<Statement> res = new ArrayList<Statement>();
+    List<Statement> res = new ArrayList<>();
 
     for (List<Statement> comp : lst) {
       if (isExitComponent(comp)) {
@@ -142,11 +142,11 @@ public class StrongConnectivityHelper {
   // *****************************************************************************
 
   private void visitTree(Statement stat) {
-    lstack = new ListStack<Statement>();
+    lstack = new ListStack<>();
     ncounter = 0;
-    tset = new HashSet<Statement>();
-    dfsnummap = new HashMap<Statement, Integer>();
-    lowmap = new HashMap<Statement, Integer>();
+    tset = new HashSet<>();
+    dfsnummap = new HashMap<>();
+    lowmap = new HashMap<>();
 
     visit(stat);
 
@@ -181,7 +181,7 @@ public class StrongConnectivityHelper {
 
 
     if (lowmap.get(stat).intValue() == dfsnummap.get(stat).intValue()) {
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       Statement v;
       do {
         v = lstack.pop();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
index a61d44c..608d56c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
@@ -25,7 +25,7 @@ public class DominatorEngine {
 
   private final Statement statement;
 
-  private final VBStyleCollection<Integer, Integer> colOrderedIDoms = new VBStyleCollection<Integer, Integer>();
+  private final VBStyleCollection<Integer, Integer> colOrderedIDoms = new VBStyleCollection<>();
 
 
   public DominatorEngine(Statement statement) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
index 89e6849..59b6b15 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
@@ -27,16 +27,16 @@ public class DominatorTreeExceptionFilter {
   private final Statement statement;
 
   // idom, nodes
-  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<Integer, Set<Integer>>();
+  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<>();
 
   // handler, range nodes
-  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<Integer, Set<Integer>>();
+  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<>();
 
   // handler, head dom
-  private Map<Integer, Integer> mapExceptionDoms = new HashMap<Integer, Integer>();
+  private Map<Integer, Integer> mapExceptionDoms = new HashMap<>();
 
   // statement, handler, exit nodes
-  private final Map<Integer, Map<Integer, Integer>> mapExceptionRangeUniqueExit = new HashMap<Integer, Map<Integer, Integer>>();
+  private final Map<Integer, Map<Integer, Integer>> mapExceptionRangeUniqueExit = new HashMap<>();
 
   private DominatorEngine domEngine;
 
@@ -86,7 +86,7 @@ public class DominatorTreeExceptionFilter {
 
       Set<Integer> set = mapTreeBranches.get(idom);
       if (set == null) {
-        mapTreeBranches.put(idom, set = new HashSet<Integer>());
+        mapTreeBranches.put(idom, set = new HashSet<>());
       }
       set.add(key);
     }
@@ -101,7 +101,7 @@ public class DominatorTreeExceptionFilter {
       List<Statement> lstPreds = stat.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_BACKWARD);
       if (!lstPreds.isEmpty()) {
 
-        Set<Integer> set = new HashSet<Integer>();
+        Set<Integer> set = new HashSet<>();
 
         for (Statement st : lstPreds) {
           set.add(st.id);
@@ -116,7 +116,7 @@ public class DominatorTreeExceptionFilter {
 
   private Map<Integer, Integer> buildExceptionDoms(Integer id) {
 
-    Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+    Map<Integer, Integer> map = new HashMap<>();
 
     Set<Integer> children = mapTreeBranches.get(id);
     if (children != null) {
@@ -140,7 +140,7 @@ public class DominatorTreeExceptionFilter {
 
   private void buildFilter(Integer id) {
 
-    Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+    Map<Integer, Integer> map = new HashMap<>();
 
     Set<Integer> children = mapTreeBranches.get(id);
     if (children != null) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
index 52338f9..f37aedc 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
@@ -28,9 +28,9 @@ public class FastExtendedPostdominanceHelper {
 
   private List<Statement> lstReversePostOrderList;
 
-  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<Integer, FastFixedSet<Integer>>();
+  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<>();
 
-  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<Integer, FastFixedSet<Integer>>();
+  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<>();
 
   private Statement statement;
 
@@ -40,11 +40,11 @@ public class FastExtendedPostdominanceHelper {
 
     this.statement = statement;
 
-    HashSet<Integer> set = new HashSet<Integer>();
+    HashSet<Integer> set = new HashSet<>();
     for (Statement st : statement.getStats()) {
       set.add(st.id);
     }
-    this.factory = new FastFixedSetFactory<Integer>(set);
+    this.factory = new FastFixedSetFactory<>(set);
 
     lstReversePostOrderList = statement.getReversePostOrderList();
 
@@ -65,7 +65,7 @@ public class FastExtendedPostdominanceHelper {
 
     filterOnDominance(filter);
 
-    HashMap<Integer, Set<Integer>> res = new HashMap<Integer, Set<Integer>>();
+    HashMap<Integer, Set<Integer>> res = new HashMap<>();
     for (Entry<Integer, FastFixedSet<Integer>> entry : mapExtPostdominators.entrySet()) {
       res.put(entry.getKey(), entry.getValue().toPlainSet());
     }
@@ -78,17 +78,17 @@ public class FastExtendedPostdominanceHelper {
 
     DominatorEngine engine = filter.getDomEngine();
 
-    for (Integer head : new HashSet<Integer>(mapExtPostdominators.keySet())) {
+    for (Integer head : new HashSet<>(mapExtPostdominators.keySet())) {
 
       FastFixedSet<Integer> setPostdoms = mapExtPostdominators.get(head);
 
-      LinkedList<Statement> stack = new LinkedList<Statement>();
-      LinkedList<FastFixedSet<Integer>> stackPath = new LinkedList<FastFixedSet<Integer>>();
+      LinkedList<Statement> stack = new LinkedList<>();
+      LinkedList<FastFixedSet<Integer>> stackPath = new LinkedList<>();
 
       stack.add(statement.getStats().getWithKey(head));
       stackPath.add(factory.spawnEmptySet());
 
-      Set<Statement> setVisited = new HashSet<Statement>();
+      Set<Statement> setVisited = new HashSet<>();
 
       setVisited.add(stack.getFirst());
       
@@ -134,7 +134,7 @@ public class FastExtendedPostdominanceHelper {
   private void filterOnExceptionRanges(DominatorTreeExceptionFilter filter) {
 
 
-    for (Integer head : new HashSet<Integer>(mapExtPostdominators.keySet())) {
+    for (Integer head : new HashSet<>(mapExtPostdominators.keySet())) {
 
       FastFixedSet<Integer> set = mapExtPostdominators.get(head);
       for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
@@ -151,7 +151,7 @@ public class FastExtendedPostdominanceHelper {
 
   private void removeErroneousNodes() {
 
-    mapSupportPoints = new HashMap<Integer, FastFixedSet<Integer>>();
+    mapSupportPoints = new HashMap<>();
 
     calcReachabilitySuppPoints(StatEdge.TYPE_REGULAR);
 
@@ -161,7 +161,7 @@ public class FastExtendedPostdominanceHelper {
         Integer nodeid = node.id;
 
         FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
-        List<FastFixedSet<Integer>> lstPredSets = new ArrayList<FastFixedSet<Integer>>();
+        List<FastFixedSet<Integer>> lstPredSets = new ArrayList<>();
 
         for (StatEdge prededge : node.getPredecessorEdges(StatEdge.TYPE_REGULAR)) {
           FastFixedSet<Integer> setPred = mapSets.get(prededge.getSource().id);
@@ -285,7 +285,7 @@ public class FastExtendedPostdominanceHelper {
 
       boolean iterate = false;
 
-      HashMap<Integer, FastFixedSet<Integer>> mapSets = new HashMap<Integer, FastFixedSet<Integer>>();
+      HashMap<Integer, FastFixedSet<Integer>> mapSets = new HashMap<>();
 
       for (Statement stat : lstReversePostOrderList) {
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
index fa5ccf3..d1830f3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
@@ -24,7 +24,7 @@ public class GenericDominatorEngine {
 
   private final IGraph graph;
 
-  private final VBStyleCollection<IGraphNode, IGraphNode> colOrderedIDoms = new VBStyleCollection<IGraphNode, IGraphNode>();
+  private final VBStyleCollection<IGraphNode, IGraphNode> colOrderedIDoms = new VBStyleCollection<>();
 
   private Set<? extends IGraphNode> setRoots;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index 7614807..0826e8b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -48,7 +48,7 @@ public class ExceptionDeobfuscator {
 
   public static void restorePopRanges(ControlFlowGraph graph) {
 
-    List<Range> lstRanges = new ArrayList<Range>();
+    List<Range> lstRanges = new ArrayList<>();
 
     // aggregate ranges
     for (ExceptionRangeCFG range : graph.getExceptions()) {
@@ -63,7 +63,7 @@ public class ExceptionDeobfuscator {
 
       if (!found) {
         // doesn't matter, which range chosen
-        lstRanges.add(new Range(range.getHandler(), range.getUniqueExceptionsString(), new HashSet<BasicBlock>(range.getProtectedRange()), range));
+        lstRanges.add(new Range(range.getHandler(), range.getUniqueExceptionsString(), new HashSet<>(range.getProtectedRange()), range));
       }
     }
 
@@ -81,13 +81,13 @@ public class ExceptionDeobfuscator {
 
           if (firstinstr.opcode == CodeConstants.opc_pop ||
               firstinstr.opcode == CodeConstants.opc_astore) {
-            Set<BasicBlock> setrange = new HashSet<BasicBlock>(range.protectedRange);
+            Set<BasicBlock> setrange = new HashSet<>(range.protectedRange);
 
             for (Range range_super : lstRanges) { // finally or strict superset
 
               if (range != range_super) {
 
-                Set<BasicBlock> setrange_super = new HashSet<BasicBlock>(range_super.protectedRange);
+                Set<BasicBlock> setrange_super = new HashSet<>(range_super.protectedRange);
 
                 if (!setrange.contains(range_super.handler) && !setrange_super.contains(handler)
                     && (range_super.uniqueStr == null || setrange_super.containsAll(setrange))) {
@@ -113,7 +113,7 @@ public class ExceptionDeobfuscator {
                       graph.getBlocks().addWithKey(newblock, newblock.id);
 
 
-                      List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
+                      List<BasicBlock> lstTemp = new ArrayList<>();
                       lstTemp.addAll(handler.getPreds());
                       lstTemp.addAll(handler.getPredExceptions());
 
@@ -159,7 +159,7 @@ public class ExceptionDeobfuscator {
 
   public static void insertEmptyExceptionHandlerBlocks(ControlFlowGraph graph) {
 
-    Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+    Set<BasicBlock> setVisited = new HashSet<>();
 
     for (ExceptionRangeCFG range : graph.getExceptions()) {
       BasicBlock handler = range.getHandler();
@@ -172,7 +172,7 @@ public class ExceptionDeobfuscator {
       BasicBlock emptyblock = new BasicBlock(++graph.last_id);
       graph.getBlocks().addWithKey(emptyblock, emptyblock.id);
 
-      List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
+      List<BasicBlock> lstTemp = new ArrayList<>();
       // only exception predecessors considered
       lstTemp.addAll(handler.getPredExceptions());
 
@@ -231,7 +231,7 @@ public class ExceptionDeobfuscator {
       }
 
       public Set<? extends IGraphNode> getRoots() {
-        return new HashSet<IGraphNode>(Arrays.asList(new IGraphNode[]{graph.getFirst()}));
+        return new HashSet<>(Arrays.asList(new IGraphNode[]{graph.getFirst()}));
       }
     });
 
@@ -264,10 +264,10 @@ public class ExceptionDeobfuscator {
 
   private static List<BasicBlock> getReachableBlocksRestricted(ExceptionRangeCFG range, GenericDominatorEngine engine) {
 
-    List<BasicBlock> lstRes = new ArrayList<BasicBlock>();
+    List<BasicBlock> lstRes = new ArrayList<>();
 
-    LinkedList<BasicBlock> stack = new LinkedList<BasicBlock>();
-    Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+    LinkedList<BasicBlock> stack = new LinkedList<>();
+    Set<BasicBlock> setVisited = new HashSet<>();
 
     BasicBlock handler = range.getHandler();
     stack.addFirst(handler);
@@ -280,7 +280,7 @@ public class ExceptionDeobfuscator {
       if (range.getProtectedRange().contains(block) && engine.isDominator(block, handler)) {
         lstRes.add(block);
 
-        List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(block.getSuccs());
+        List<BasicBlock> lstSuccs = new ArrayList<>(block.getSuccs());
         lstSuccs.addAll(block.getSuccExceptions());
 
         for (BasicBlock succ : lstSuccs) {
@@ -297,20 +297,20 @@ public class ExceptionDeobfuscator {
 
   public static boolean hasObfuscatedExceptions(ControlFlowGraph graph) {
 
-    Map<BasicBlock, Set<BasicBlock>> mapRanges = new HashMap<BasicBlock, Set<BasicBlock>>();
+    Map<BasicBlock, Set<BasicBlock>> mapRanges = new HashMap<>();
     for (ExceptionRangeCFG range : graph.getExceptions()) {
       Set<BasicBlock> set = mapRanges.get(range.getHandler());
       if (set == null) {
-        mapRanges.put(range.getHandler(), set = new HashSet<BasicBlock>());
+        mapRanges.put(range.getHandler(), set = new HashSet<>());
       }
       set.addAll(range.getProtectedRange());
     }
 
     for (Entry<BasicBlock, Set<BasicBlock>> ent : mapRanges.entrySet()) {
-      Set<BasicBlock> setEntries = new HashSet<BasicBlock>();
+      Set<BasicBlock> setEntries = new HashSet<>();
 
       for (BasicBlock block : ent.getValue()) {
-        Set<BasicBlock> setTemp = new HashSet<BasicBlock>(block.getPreds());
+        Set<BasicBlock> setTemp = new HashSet<>(block.getPreds());
         setTemp.removeAll(ent.getValue());
 
         if (!setTemp.isEmpty()) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
index 42ba76f..12840f2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
@@ -31,15 +31,15 @@ public class IrreducibleCFGDeobfuscator {
 
     class Node {
       public Integer id;
-      public final Set<Node> preds = new HashSet<Node>();
-      public final Set<Node> succs = new HashSet<Node>();
+      public final Set<Node> preds = new HashSet<>();
+      public final Set<Node> succs = new HashSet<>();
 
       public Node(Integer id) {
         this.id = id;
       }
     }
 
-    HashMap<Integer, Node> mapNodes = new HashMap<Integer, Node>();
+    HashMap<Integer, Node> mapNodes = new HashMap<>();
 
     // checking exceptions and creating nodes
     for (Statement stat : statement.getStats()) {
@@ -145,7 +145,7 @@ public class IrreducibleCFGDeobfuscator {
     StatEdge enteredge = splitnode.getPredecessorEdges(StatEdge.TYPE_REGULAR).iterator().next();
 
     // copy the smallest statement
-    Statement splitcopy = copyStatement(splitnode, null, new HashMap<Statement, Statement>());
+    Statement splitcopy = copyStatement(splitnode, null, new HashMap<>());
     initCopiedStatement(splitcopy);
 
     // insert the copy
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
index c8db797..3590b48 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
@@ -68,7 +68,7 @@ public class ArrayExprent extends Exprent {
   }
 
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(array);
     lst.add(index);
     return lst;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
index 95ebdc5..957f3f5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
@@ -87,7 +87,7 @@ public class AssignmentExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(left);
     lst.add(right);
     return lst;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index e618235..e82fec7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -110,7 +110,7 @@ public class ConstExprent extends Exprent {
   }
 
   public List<Exprent> getAllExprents() {
-    return new ArrayList<Exprent>();
+    return new ArrayList<>();
   }
 
   @Override
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index c6b962c..abfc4ab 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -70,7 +70,7 @@ public class ExitExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     if (value != null) {
       lst.add(value);
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index 77b35b3..a530915 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -76,7 +76,7 @@ public class Exprent implements IMatchable {
   }
 
   public boolean containsExprent(Exprent exprent) {
-    List<Exprent> listTemp = new ArrayList<Exprent>(getAllExprents(true));
+    List<Exprent> listTemp = new ArrayList<>(getAllExprents(true));
     listTemp.add(this);
 
     for (Exprent lstExpr : listTemp) {
@@ -102,7 +102,7 @@ public class Exprent implements IMatchable {
     List<Exprent> lstAllExprents = getAllExprents(true);
     lstAllExprents.add(this);
 
-    Set<VarVersionPair> set = new HashSet<VarVersionPair>();
+    Set<VarVersionPair> set = new HashSet<>();
     for (Exprent expr : lstAllExprents) {
       if (expr.type == EXPRENT_VAR) {
         set.add(new VarVersionPair((VarExprent)expr));
@@ -128,7 +128,7 @@ public class Exprent implements IMatchable {
   public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
     if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
       if (bytecode == null) {
-        bytecode = new HashSet<Integer>(bytecodeOffsets);
+        bytecode = new HashSet<>(bytecodeOffsets);
       }
       else {
         bytecode.addAll(bytecodeOffsets);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 5e6a6b5..f1c65d1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -71,7 +71,7 @@ public class FieldExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     if (instance != null) {
       lst.add(instance);
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index 48206a7..faaa6d2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -191,7 +191,7 @@ public class FunctionExprent extends Exprent {
     3    // FUNCTION_STR_CONCAT = 49;
   };
 
-  private static final Set<Integer> ASSOCIATIVITY = new HashSet<Integer>(Arrays.asList(
+  private static final Set<Integer> ASSOCIATIVITY = new HashSet<>(Arrays.asList(
     FUNCTION_ADD, FUNCTION_MUL, FUNCTION_AND, FUNCTION_OR, FUNCTION_XOR, FUNCTION_CADD, FUNCTION_COR, FUNCTION_STR_CONCAT));
 
   private int funcType;
@@ -199,7 +199,7 @@ public class FunctionExprent extends Exprent {
   private final List<Exprent> lstOperands;
 
   public FunctionExprent(int funcType, ListStack<Exprent> stack, Set<Integer> bytecodeOffsets) {
-    this(funcType, new ArrayList<Exprent>(), bytecodeOffsets);
+    this(funcType, new ArrayList<>(), bytecodeOffsets);
 
     if (funcType >= FUNCTION_BIT_NOT && funcType <= FUNCTION_PPI && funcType != FUNCTION_CAST && funcType != FUNCTION_INSTANCEOF) {
       lstOperands.add(stack.pop());
@@ -223,7 +223,7 @@ public class FunctionExprent extends Exprent {
   }
 
   public FunctionExprent(int funcType, Exprent operand, Set<Integer> bytecodeOffsets) {
-    this(funcType, new ArrayList<Exprent>(1), bytecodeOffsets);
+    this(funcType, new ArrayList<>(1), bytecodeOffsets);
     lstOperands.add(operand);
   }
 
@@ -413,14 +413,14 @@ public class FunctionExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.addAll(lstOperands);
     return lst;
   }
 
   @Override
   public Exprent copy() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     for (Exprent expr : lstOperands) {
       lst.add(expr.copy());
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
index 059270f..be4d6f6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
@@ -107,7 +107,7 @@ public class IfExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(condition);
     return lst;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 1b8188a..94c1b5d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -65,7 +65,7 @@ public class InvocationExprent extends Exprent {
   private String stringDescriptor;
   private String invokeDynamicClassSuffix;
   private int invocationTyp = INVOKE_VIRTUAL;
-  private List<Exprent> lstParameters = new ArrayList<Exprent>();
+  private List<Exprent> lstParameters = new ArrayList<>();
   private List<PooledConstant> bootstrapArguments;
 
   public InvocationExprent() {
@@ -162,7 +162,7 @@ public class InvocationExprent extends Exprent {
     invokeDynamicClassSuffix = expr.getInvokeDynamicClassSuffix();
     stringDescriptor = expr.getStringDescriptor();
     descriptor = expr.getDescriptor();
-    lstParameters = new ArrayList<Exprent>(expr.getLstParameters());
+    lstParameters = new ArrayList<>(expr.getLstParameters());
     ExprProcessor.copyEntries(lstParameters);
 
     addBytecodeOffsets(expr.bytecode);
@@ -192,7 +192,7 @@ public class InvocationExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     if (instance != null) {
       lst.add(instance);
     }
@@ -321,7 +321,7 @@ public class InvocationExprent extends Exprent {
         }
         else {
           if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0) { // non-static member class
-            sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
+            sigFields = new ArrayList<>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
             sigFields.set(0, new VarVersionPair(-1, 0));
           }
         }
@@ -358,7 +358,7 @@ public class InvocationExprent extends Exprent {
     if (cl == null) return EMPTY_BIT_SET;
 
     // check number of matches
-    List<MethodDescriptor> matches = new ArrayList<MethodDescriptor>();
+    List<MethodDescriptor> matches = new ArrayList<>();
     nextMethod:
     for (StructMethod mt : cl.getMethods()) {
       if (name.equals(mt.getName())) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
index 0ece9aa..1546064 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
@@ -46,7 +46,7 @@ public class MonitorExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(value);
     return lst;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 1edd0e4..b6a67d2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -38,8 +38,8 @@ import java.util.Set;
 public class NewExprent extends Exprent {
   private InvocationExprent constructor;
   private final VarType newType;
-  private List<Exprent> lstDims = new ArrayList<Exprent>();
-  private List<Exprent> lstArrayElements = new ArrayList<Exprent>();
+  private List<Exprent> lstDims = new ArrayList<>();
+  private List<Exprent> lstArrayElements = new ArrayList<>();
   private boolean directArrayInit;
   private boolean anonymous;
   private boolean lambda;
@@ -70,7 +70,7 @@ public class NewExprent extends Exprent {
   }
 
   private static List<Exprent> getDimensions(int arrayDim, ListStack<Exprent> stack) {
-    List<Exprent> lstDims = new ArrayList<Exprent>();
+    List<Exprent> lstDims = new ArrayList<>();
     for (int i = 0; i < arrayDim; i++) {
       lstDims.add(0, stack.pop());
     }
@@ -111,7 +111,7 @@ public class NewExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     if (newType.arrayDim == 0) {
       if (constructor != null) {
         Exprent constructor_instance = constructor.getInstance();
@@ -133,7 +133,7 @@ public class NewExprent extends Exprent {
 
   @Override
   public Exprent copy() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     for (Exprent expr : lstDims) {
       lst.add(expr.copy());
     }
@@ -199,7 +199,7 @@ public class NewExprent extends Exprent {
           else {
             if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0 &&
                 !constructor.getLstParameters().isEmpty()) { // member non-static class invoked with enclosing class instance
-              sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(constructor.getLstParameters().size(), (VarVersionPair)null));
+              sigFields = new ArrayList<>(Collections.nCopies(constructor.getLstParameters().size(), (VarVersionPair)null));
               sigFields.set(0, new VarVersionPair(-1, 0));
             }
           }
@@ -304,7 +304,7 @@ public class NewExprent extends Exprent {
           }
           else if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0 && !constructor.getLstParameters().isEmpty()) {
             // member non-static class invoked with enclosing class instance
-            sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
+            sigFields = new ArrayList<>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
             sigFields.set(0, new VarVersionPair(-1, 0));
           }
         }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
index fd77112..27730a9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
@@ -28,7 +28,7 @@ import java.util.Set;
 public class SwitchExprent extends Exprent {
 
   private Exprent value;
-  private List<List<ConstExprent>> caseValues = new ArrayList<List<ConstExprent>>();
+  private List<List<ConstExprent>> caseValues = new ArrayList<>();
 
   public SwitchExprent(Exprent value, Set<Integer> bytecodeOffsets) {
     super(EXPRENT_SWITCH);
@@ -41,9 +41,9 @@ public class SwitchExprent extends Exprent {
   public Exprent copy() {
     SwitchExprent swExpr = new SwitchExprent(value.copy(), bytecode);
 
-    List<List<ConstExprent>> lstCaseValues = new ArrayList<List<ConstExprent>>();
+    List<List<ConstExprent>> lstCaseValues = new ArrayList<>();
     for (List<ConstExprent> lst : caseValues) {
-      lstCaseValues.add(new ArrayList<ConstExprent>(lst));
+      lstCaseValues.add(new ArrayList<>(lst));
     }
     swExpr.setCaseValues(lstCaseValues);
 
@@ -80,7 +80,7 @@ public class SwitchExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(value);
     return lst;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index 4436cb5..fdd8bb9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -67,7 +67,7 @@ public class VarExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    return new ArrayList<Exprent>();
+    return new ArrayList<>();
   }
 
   @Override
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index abd844c..413cdf6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -27,24 +27,24 @@ import java.util.List;
 
 public class DirectGraph {
 
-  public final VBStyleCollection<DirectNode, String> nodes = new VBStyleCollection<DirectNode, String>();
+  public final VBStyleCollection<DirectNode, String> nodes = new VBStyleCollection<>();
 
   public DirectNode first;
 
   // exit, [source, destination]
-  public final HashMap<String, List<FinallyPathWrapper>> mapShortRangeFinallyPaths = new HashMap<String, List<FinallyPathWrapper>>();
+  public final HashMap<String, List<FinallyPathWrapper>> mapShortRangeFinallyPaths = new HashMap<>();
 
   // exit, [source, destination]
-  public final HashMap<String, List<FinallyPathWrapper>> mapLongRangeFinallyPaths = new HashMap<String, List<FinallyPathWrapper>>();
+  public final HashMap<String, List<FinallyPathWrapper>> mapLongRangeFinallyPaths = new HashMap<>();
 
   // negative if branches (recorded for handling of && and ||)
-  public final HashMap<String, String> mapNegIfBranch = new HashMap<String, String>();
+  public final HashMap<String, String> mapNegIfBranch = new HashMap<>();
 
   // nodes, that are exception exits of a finally block with monitor variable
-  public final HashMap<String, String> mapFinallyMonitorExceptionPathExits = new HashMap<String, String>();
+  public final HashMap<String, String> mapFinallyMonitorExceptionPathExits = new HashMap<>();
 
   public void sortReversePostOrder() {
-    LinkedList<DirectNode> res = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> res = new LinkedList<>();
     addToReversePostOrderListIterative(first, res);
 
     nodes.clear();
@@ -55,10 +55,10 @@ public class DirectGraph {
 
   private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
 
-    LinkedList<DirectNode> stackNode = new LinkedList<DirectNode>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+    LinkedList<DirectNode> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
+    HashSet<DirectNode> setVisited = new HashSet<>();
 
     stackNode.add(root);
     stackIndex.add(0);
@@ -94,10 +94,10 @@ public class DirectGraph {
 
   public boolean iterateExprents(ExprentIterator iter) {
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
     stack.add(first);
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
+    HashSet<DirectNode> setVisited = new HashSet<>();
 
     while (!stack.isEmpty()) {
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
index 8a39531..b71330a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
@@ -40,11 +40,11 @@ public class DirectNode {
 
   public final Statement statement;
 
-  public List<Exprent> exprents = new ArrayList<Exprent>();
+  public List<Exprent> exprents = new ArrayList<>();
 
-  public final List<DirectNode> succs = new ArrayList<DirectNode>();
+  public final List<DirectNode> succs = new ArrayList<>();
 
-  public final List<DirectNode> preds = new ArrayList<DirectNode>();
+  public final List<DirectNode> preds = new ArrayList<>();
 
   public DirectNode(int type, Statement statement, String id) {
     this.type = type;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
index 971ace5..43c63f6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
@@ -26,19 +26,19 @@ import java.util.Map.Entry;
 public class FlattenStatementsHelper {
 
   // statement.id, node.id(direct), node.id(continue)
-  private final Map<Integer, String[]> mapDestinationNodes = new HashMap<Integer, String[]>();
+  private final Map<Integer, String[]> mapDestinationNodes = new HashMap<>();
 
   // node.id(source), statement.id(destination), edge type
-  private final List<Edge> listEdges = new ArrayList<Edge>();
+  private final List<Edge> listEdges = new ArrayList<>();
 
   // node.id(exit), [node.id(source), statement.id(destination)]
-  private final Map<String, List<String[]>> mapShortRangeFinallyPathIds = new HashMap<String, List<String[]>>();
+  private final Map<String, List<String[]>> mapShortRangeFinallyPathIds = new HashMap<>();
 
   // node.id(exit), [node.id(source), statement.id(destination)]
-  private final Map<String, List<String[]>> mapLongRangeFinallyPathIds = new HashMap<String, List<String[]>>();
+  private final Map<String, List<String[]>> mapLongRangeFinallyPathIds = new HashMap<>();
 
   // positive if branches
-  private final Map<String, Integer> mapPosIfBranch = new HashMap<String, Integer>();
+  private final Map<String, Integer> mapPosIfBranch = new HashMap<>();
 
   private DirectGraph graph;
 
@@ -55,7 +55,7 @@ public class FlattenStatementsHelper {
     // dummy exit node
     Statement dummyexit = root.getDummyExit();
     DirectNode node = new DirectNode(DirectNode.NODE_DIRECT, dummyexit, dummyexit.id.toString());
-    node.exprents = new ArrayList<Exprent>();
+    node.exprents = new ArrayList<>();
     graph.nodes.addWithKey(node, node.id);
     mapDestinationNodes.put(dummyexit.id, new String[]{node.id, null});
 
@@ -85,9 +85,9 @@ public class FlattenStatementsHelper {
       }
     }
 
-    LinkedList<StatementStackEntry> lstStackStatements = new LinkedList<StatementStackEntry>();
+    LinkedList<StatementStackEntry> lstStackStatements = new LinkedList<>();
 
-    lstStackStatements.add(new StatementStackEntry(root, new LinkedList<StackEntry>(), null));
+    lstStackStatements.add(new StatementStackEntry(root, new LinkedList<>(), null));
 
     mainloop:
     while (!lstStackStatements.isEmpty()) {
@@ -100,7 +100,7 @@ public class FlattenStatementsHelper {
 
       DirectNode node, nd;
 
-      List<StatEdge> lstSuccEdges = new ArrayList<StatEdge>();
+      List<StatEdge> lstSuccEdges = new ArrayList<>();
       DirectNode sourcenode = null;
 
       if (statEntry.succEdges == null) {
@@ -143,14 +143,14 @@ public class FlattenStatementsHelper {
             mapDestinationNodes.put(stat.id, new String[]{firstnd.id, null});
             graph.nodes.putWithKey(firstnd, firstnd.id);
 
-            LinkedList<StatementStackEntry> lst = new LinkedList<StatementStackEntry>();
+            LinkedList<StatementStackEntry> lst = new LinkedList<>();
 
             for (Statement st : stat.getStats()) {
               listEdges.add(new Edge(firstnd.id, st.id, StatEdge.TYPE_REGULAR));
 
               LinkedList<StackEntry> stack = stackFinally;
               if (stat.type == Statement.TYPE_CATCHALL && ((CatchAllStatement)stat).isFinally()) {
-                stack = new LinkedList<StackEntry>(stackFinally);
+                stack = new LinkedList<>(stackFinally);
 
                 if (st == stat.getFirst()) { // catch head
                   stack.add(new StackEntry((CatchAllStatement)stat, Boolean.FALSE));
@@ -306,7 +306,7 @@ public class FlattenStatementsHelper {
 
           StatEdge edge = lstSuccEdges.get(edgeindex);
 
-          LinkedList<StackEntry> stack = new LinkedList<StackEntry>(stackFinally);
+          LinkedList<StackEntry> stack = new LinkedList<>(stackFinally);
 
           int edgetype = edge.getType();
           Statement destination = edge.getDestination();
@@ -417,14 +417,14 @@ public class FlattenStatementsHelper {
 
       List<String[]> lst = mapShortRangeFinallyPathIds.get(sourcenode.id);
       if (lst == null) {
-        mapShortRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<String[]>());
+        mapShortRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<>());
       }
       lst.add(new String[]{finallyShortRangeSource.id, destination.id.toString(), finallyShortRangeEntry.id.toString(),
         isFinallyMonitorExceptionPath ? "1" : null, isContinueEdge ? "1" : null});
 
       lst = mapLongRangeFinallyPathIds.get(sourcenode.id);
       if (lst == null) {
-        mapLongRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<String[]>());
+        mapLongRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<>());
       }
       lst.add(new String[]{finallyLongRangeSource.id, destination.id.toString(), finallyLongRangeEntry.id.toString(),
         isContinueEdge ? "1" : null});
@@ -458,7 +458,7 @@ public class FlattenStatementsHelper {
     for (int i = 0; i < 2; i++) {
       for (Entry<String, List<String[]>> ent : (i == 0 ? mapShortRangeFinallyPathIds : mapLongRangeFinallyPathIds).entrySet()) {
 
-        List<FinallyPathWrapper> newLst = new ArrayList<FinallyPathWrapper>();
+        List<FinallyPathWrapper> newLst = new ArrayList<>();
 
         List<String[]> lst = ent.getValue();
         for (String[] arr : lst) {
@@ -477,8 +477,8 @@ public class FlattenStatementsHelper {
 
         if (!newLst.isEmpty()) {
           (i == 0 ? graph.mapShortRangeFinallyPaths : graph.mapLongRangeFinallyPaths).put(ent.getKey(),
-                                                                                          new ArrayList<FinallyPathWrapper>(
-                                                                                            new HashSet<FinallyPathWrapper>(newLst)));
+                                                                                          new ArrayList<>(
+                                                                                            new HashSet<>(newLst)));
         }
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
index 76a973f..7aff2d2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
@@ -42,24 +42,24 @@ import java.util.Map.Entry;
 public class SSAConstructorSparseEx {
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<>();
 
   // node id, var, version (direct branch)
-  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<>();
 
   // node id, var, version (negative branch)
-  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<>();
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<>();
 
   // (var, version), version
-  private final HashMap<VarVersionPair, FastSparseSet<Integer>> phi = new HashMap<VarVersionPair, FastSparseSet<Integer>>();
+  private final HashMap<VarVersionPair, FastSparseSet<Integer>> phi = new HashMap<>();
 
   // var, version
-  private final HashMap<Integer, Integer> lastversion = new HashMap<Integer, Integer>();
+  private final HashMap<Integer, Integer> lastversion = new HashMap<>();
 
-  private final List<VarVersionPair> startVars = new ArrayList<VarVersionPair>();
+  private final List<VarVersionPair> startVars = new ArrayList<>();
 
   // set factory
   private FastSparseSetFactory<Integer> factory;
@@ -73,18 +73,18 @@ public class SSAConstructorSparseEx {
     // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
     // } catch(Exception ex) {ex.printStackTrace();}
 
-    HashSet<Integer> setInit = new HashSet<Integer>();
+    HashSet<Integer> setInit = new HashSet<>();
     for (int i = 0; i < 64; i++) {
       setInit.add(i);
     }
-    factory = new FastSparseSetFactory<Integer>(setInit);
+    factory = new FastSparseSetFactory<>(setInit);
 
     SFormsFastMapDirect firstmap = createFirstMap(mt);
     extraVarVersions.put(dgraph.first.id, firstmap);
 
     setCatchMaps(root, dgraph, flatthelper);
 
-    HashSet<String> updated = new HashSet<String>();
+    HashSet<String> updated = new HashSet<>();
     do {
       // System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
       ssaStatements(dgraph, updated);
@@ -348,7 +348,7 @@ public class SSAConstructorSparseEx {
       String exceptionDest = dgraph.mapFinallyMonitorExceptionPathExits.get(predid);
       boolean isExceptionMonitorExit = (exceptionDest != null && !nodeid.equals(exceptionDest));
 
-      HashSet<String> setLongPathWrapper = new HashSet<String>();
+      HashSet<String> setLongPathWrapper = new HashSet<>();
       for (FinallyPathWrapper finwraplong : dgraph.mapLongRangeFinallyPaths.get(predid)) {
         setLongPathWrapper.add(finwraplong.destination + "##" + finwraplong.source);
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
index 95cefcf..5beb232 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
@@ -40,42 +40,42 @@ import java.util.Map.Entry;
 public class SSAUConstructorSparseEx {
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> inVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
   // node id, var, version (direct branch)
-  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> outVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
   // node id, var, version (negative branch)
-  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> outNegVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> extraVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
   // (var, version), version
-  private final HashMap<VarVersionPair, HashSet<Integer>> phi = new HashMap<VarVersionPair, HashSet<Integer>>();
+  private final HashMap<VarVersionPair, HashSet<Integer>> phi = new HashMap<>();
 
   // var, version
-  private final HashMap<Integer, Integer> lastversion = new HashMap<Integer, Integer>();
+  private final HashMap<Integer, Integer> lastversion = new HashMap<>();
 
   // version, protected ranges (catch, finally)
-  private final HashMap<VarVersionPair, Integer> mapVersionFirstRange = new HashMap<VarVersionPair, Integer>();
+  private final HashMap<VarVersionPair, Integer> mapVersionFirstRange = new HashMap<>();
 
   // version, version
-  private final HashMap<VarVersionPair, VarVersionPair> phantomppnodes = new HashMap<VarVersionPair, VarVersionPair>(); // ++ and --
+  private final HashMap<VarVersionPair, VarVersionPair> phantomppnodes = new HashMap<>(); // ++ and --
 
   // node.id, version, version
   private final HashMap<String, HashMap<VarVersionPair, VarVersionPair>> phantomexitnodes =
-    new HashMap<String, HashMap<VarVersionPair, VarVersionPair>>(); // finally exits
+    new HashMap<>(); // finally exits
 
   // versions memory dependencies
   private final VarVersionsGraph ssuversions = new VarVersionsGraph();
 
   // field access vars (exprent id, var id)
-  private final HashMap<Integer, Integer> mapFieldVars = new HashMap<Integer, Integer>();
+  private final HashMap<Integer, Integer> mapFieldVars = new HashMap<>();
 
   // field access counter
   private int fieldvarcounter = -1;
@@ -88,11 +88,11 @@ public class SSAUConstructorSparseEx {
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    HashSet<Integer> setInit = new HashSet<Integer>();
+    HashSet<Integer> setInit = new HashSet<>();
     for (int i = 0; i < 64; i++) {
       setInit.add(i);
     }
-    factory = new FastSparseSetFactory<Integer>(setInit);
+    factory = new FastSparseSetFactory<>(setInit);
 
     extraVarVersions.put(dgraph.first.id, createFirstMap(mt, root));
 
@@ -102,7 +102,7 @@ public class SSAUConstructorSparseEx {
     //			DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
     //		} catch(Exception ex) {ex.printStackTrace();}
 
-    HashSet<String> updated = new HashSet<String>();
+    HashSet<String> updated = new HashSet<>();
     do {
       //			System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
       ssaStatements(dgraph, updated, false);
@@ -426,14 +426,14 @@ public class SSAUConstructorSparseEx {
   private void createOrUpdatePhiNode(VarVersionPair phivar, FastSparseSet<Integer> vers, Statement stat) {
 
     FastSparseSet<Integer> versCopy = vers.getCopy();
-    HashSet<Integer> phiVers = new HashSet<Integer>();
+    HashSet<Integer> phiVers = new HashSet<>();
 
     // take into account the corresponding mm/pp node if existing
     int ppvers = phantomppnodes.containsKey(phivar) ? phantomppnodes.get(phivar).version : -1;
 
     // ssu graph
     VarVersionNode phinode = ssuversions.nodes.getWithKey(phivar);
-    List<VarVersionEdge> lstPreds = new ArrayList<VarVersionEdge>(phinode.preds);
+    List<VarVersionEdge> lstPreds = new ArrayList<>(phinode.preds);
     if (lstPreds.size() == 1) {
       // not yet a phi node
       VarVersionEdge edge = lstPreds.get(0);
@@ -454,8 +454,8 @@ public class SSAUConstructorSparseEx {
       }
     }
 
-    List<VarVersionNode> colnodes = new ArrayList<VarVersionNode>();
-    List<VarVersionPair> colpaars = new ArrayList<VarVersionPair>();
+    List<VarVersionNode> colnodes = new ArrayList<>();
+    List<VarVersionPair> colpaars = new ArrayList<>();
 
     for (Integer ver : versCopy) {
 
@@ -571,7 +571,7 @@ public class SSAUConstructorSparseEx {
       String exceptionDest = dgraph.mapFinallyMonitorExceptionPathExits.get(predid);
       boolean isExceptionMonitorExit = (exceptionDest != null && !nodeid.equals(exceptionDest));
 
-      HashSet<String> setLongPathWrapper = new HashSet<String>();
+      HashSet<String> setLongPathWrapper = new HashSet<>();
       for (List<FinallyPathWrapper> lstwrapper : dgraph.mapLongRangeFinallyPaths.values()) {
         for (FinallyPathWrapper finwraplong : lstwrapper) {
           setLongPathWrapper.add(finwraplong.destination + "##" + finwraplong.source);
@@ -635,7 +635,7 @@ public class SSAUConstructorSparseEx {
           // replace phi versions with corresponding phantom ones
           HashMap<VarVersionPair, VarVersionPair> mapPhantom = phantomexitnodes.get(predid);
           if (mapPhantom == null) {
-            mapPhantom = new HashMap<VarVersionPair, VarVersionPair>();
+            mapPhantom = new HashMap<>();
           }
 
           SFormsFastMapDirect mapExitVar = mapNew.getCopy();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 812ed10..4b06411 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -40,7 +40,7 @@ public class CatchAllStatement extends Statement {
 
   private VarExprent monitor;
 
-  private final List<VarExprent> vars = new ArrayList<VarExprent>();
+  private final List<VarExprent> vars = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index 8d56042..db6b79d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -34,9 +34,9 @@ import java.util.List;
 
 public class CatchStatement extends Statement {
 
-  private final List<List<String>> exctstrings = new ArrayList<List<String>>();
+  private final List<List<String>> exctstrings = new ArrayList<>();
 
-  private final List<VarExprent> vars = new ArrayList<VarExprent>();
+  private final List<VarExprent> vars = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
@@ -58,7 +58,7 @@ public class CatchStatement extends Statement {
 
       if (setHandlers.contains(stat)) {
         stats.addWithKey(stat, stat.id);
-        exctstrings.add(new ArrayList<String>(edge.getExceptions()));
+        exctstrings.add(new ArrayList<>(edge.getExceptions()));
 
         vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                 new VarType(CodeConstants.TYPE_OBJECT, 0, edge.getExceptions().get(0)),
@@ -133,7 +133,7 @@ public class CatchStatement extends Statement {
       }
 
       if (hnextcount != 1 && !setHandlers.isEmpty()) {
-        List<Statement> lst = new ArrayList<Statement>();
+        List<Statement> lst = new ArrayList<>();
         lst.add(head);
         lst.addAll(setHandlers);
 
@@ -204,7 +204,7 @@ public class CatchStatement extends Statement {
     CatchStatement cs = new CatchStatement();
 
     for (List<String> exc : this.exctstrings) {
-      cs.exctstrings.add(new ArrayList<String>(exc));
+      cs.exctstrings.add(new ArrayList<>(exc));
       cs.vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                  new VarType(CodeConstants.TYPE_OBJECT, 0, exc.get(0)),
                                  (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
index ef5ea76..3339218 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -34,9 +34,9 @@ public class DoStatement extends Statement {
 
   private int looptype;
 
-  private final List<Exprent> initExprent = new ArrayList<Exprent>();
-  private final List<Exprent> conditionExprent = new ArrayList<Exprent>();
-  private final List<Exprent> incExprent = new ArrayList<Exprent>();
+  private final List<Exprent> initExprent = new ArrayList<>();
+  private final List<Exprent> conditionExprent = new ArrayList<>();
+  private final List<Exprent> incExprent = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
@@ -142,7 +142,7 @@ public class DoStatement extends Statement {
 
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>();
+    List<Object> lst = new ArrayList<>();
 
     switch (looptype) {
       case LOOP_FOR:
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
index ba82182..f74e745 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
@@ -32,7 +32,7 @@ public class DummyExitStatement extends Statement {
   public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
     if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
       if (bytecode == null) {
-        bytecode = new HashSet<Integer>(bytecodeOffsets);
+        bytecode = new HashSet<>(bytecodeOffsets);
       }
       else {
         bytecode.addAll(bytecodeOffsets);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
index 4f22cf7..b2321e5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
@@ -39,7 +39,7 @@ public class GeneralStatement extends Statement {
     first = head;
     stats.addWithKey(head, head.id);
 
-    HashSet<Statement> set = new HashSet<Statement>(statements);
+    HashSet<Statement> set = new HashSet<>(statements);
     set.remove(head);
 
     for (Statement st : set) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index ab48ce1..9cb7ddb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -52,7 +52,7 @@ public class IfStatement extends Statement {
 
   private boolean iffflag;
 
-  private final List<Exprent> headexprent = new ArrayList<Exprent>(); // contains IfExprent
+  private final List<Exprent> headexprent = new ArrayList<>(); // contains IfExprent
 
   // *****************************************************************************
   // constructors
@@ -181,7 +181,7 @@ public class IfStatement extends Statement {
 
       boolean ok = (regsize < 2);
       if (!ok) {
-        List<Statement> lst = new ArrayList<Statement>();
+        List<Statement> lst = new ArrayList<>();
         if (DecHelper.isChoiceStatement(head, lst)) {
           p = lst.remove(0);
 
@@ -295,7 +295,7 @@ public class IfStatement extends Statement {
 
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>(stats);
+    List<Object> lst = new ArrayList<>(stats);
     lst.add(1, headexprent.get(0));
 
     return lst;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index 5efa6cf..a199c28 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -73,14 +73,14 @@ public class Statement implements IMatchable {
   // private fields
   // *****************************************************************************
 
-  private final Map<Integer, List<StatEdge>> mapSuccEdges = new HashMap<Integer, List<StatEdge>>();
-  private final Map<Integer, List<StatEdge>> mapPredEdges = new HashMap<Integer, List<StatEdge>>();
+  private final Map<Integer, List<StatEdge>> mapSuccEdges = new HashMap<>();
+  private final Map<Integer, List<StatEdge>> mapPredEdges = new HashMap<>();
 
-  private final Map<Integer, List<Statement>> mapSuccStates = new HashMap<Integer, List<Statement>>();
-  private final Map<Integer, List<Statement>> mapPredStates = new HashMap<Integer, List<Statement>>();
+  private final Map<Integer, List<Statement>> mapSuccStates = new HashMap<>();
+  private final Map<Integer, List<Statement>> mapPredStates = new HashMap<>();
 
   // statement as graph
-  protected final VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<Statement, Integer>();
+  protected final VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<>();
 
   protected Statement parent;
 
@@ -88,9 +88,9 @@ public class Statement implements IMatchable {
 
   protected List<Exprent> exprents;
 
-  protected final HashSet<StatEdge> labelEdges = new HashSet<StatEdge>();
+  protected final HashSet<StatEdge> labelEdges = new HashSet<>();
 
-  protected final List<Exprent> varDefinitions = new ArrayList<Exprent>();
+  protected final List<Exprent> varDefinitions = new ArrayList<>();
 
   // copied statement, s. deobfuscating of irreducible CFGs
   private boolean copied = false;
@@ -106,7 +106,7 @@ public class Statement implements IMatchable {
 
   protected boolean containsMonitorExit;
 
-  protected HashSet<Statement> continueSet = new HashSet<Statement>();
+  protected HashSet<Statement> continueSet = new HashSet<>();
 
   // *****************************************************************************
   // initializers
@@ -143,7 +143,7 @@ public class Statement implements IMatchable {
 
     List<T> lst = map.get(STATEDGE_DIRECT_ALL);
     if (lst != null) {
-      map.put(STATEDGE_ALL, new ArrayList<T>(lst));
+      map.put(STATEDGE_ALL, new ArrayList<>(lst));
     }
     else {
       map.remove(STATEDGE_ALL);
@@ -186,7 +186,7 @@ public class Statement implements IMatchable {
     }
 
     // exception edges
-    Set<Statement> setHandlers = new HashSet<Statement>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, DIRECTION_FORWARD));
+    Set<Statement> setHandlers = new HashSet<>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, DIRECTION_FORWARD));
     for (Statement node : setNodes) {
       setHandlers.retainAll(node.getNeighbours(StatEdge.TYPE_EXCEPTION, DIRECTION_FORWARD));
     }
@@ -260,13 +260,13 @@ public class Statement implements IMatchable {
 
     List<StatEdge> lst = mapEdges.get(edgetype);
     if (lst == null) {
-      mapEdges.put(edgetype, lst = new ArrayList<StatEdge>());
+      mapEdges.put(edgetype, lst = new ArrayList<>());
     }
     lst.add(edge);
 
     List<Statement> lstStates = mapStates.get(edgetype);
     if (lstStates == null) {
-      mapStates.put(edgetype, lstStates = new ArrayList<Statement>());
+      mapStates.put(edgetype, lstStates = new ArrayList<>());
     }
     lstStates.add(direction == DIRECTION_BACKWARD ? edge.getSource() : edge.getDestination());
   }
@@ -442,7 +442,7 @@ public class Statement implements IMatchable {
   }
 
   public List<Statement> getReversePostOrderList(Statement stat) {
-    List<Statement> res = new ArrayList<Statement>();
+    List<Statement> res = new ArrayList<>();
 
     addToReversePostOrderListIterative(stat, res);
 
@@ -455,14 +455,14 @@ public class Statement implements IMatchable {
 
   public List<Statement> getPostReversePostOrderList(List<Statement> lstexits) {
 
-    List<Statement> res = new ArrayList<Statement>();
+    List<Statement> res = new ArrayList<>();
 
     if (lstexits == null) {
       StrongConnectivityHelper schelper = new StrongConnectivityHelper(this);
       lstexits = StrongConnectivityHelper.getExitReps(schelper.getComponents());
     }
 
-    HashSet<Statement> setVisited = new HashSet<Statement>();
+    HashSet<Statement> setVisited = new HashSet<>();
 
     for (Statement exit : lstexits) {
       addToPostReversePostOrderList(exit, res, setVisited);
@@ -500,7 +500,7 @@ public class Statement implements IMatchable {
 
   // TODO: make obsolete and remove
   public List<Object> getSequentialObjects() {
-    return new ArrayList<Object>(stats);
+    return new ArrayList<>(stats);
   }
 
   public void initExprents() {
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
       first = newstat;
     }
 
-    List<StatEdge> lst = new ArrayList<StatEdge>(oldstat.getLabelEdges());
+    List<StatEdge> lst = new ArrayList<>(oldstat.getLabelEdges());
 
     for (int i = lst.size() - 1; i >= 0; i--) {
       StatEdge edge = lst.get(i);
@@ -573,9 +573,9 @@ public class Statement implements IMatchable {
 
   private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
 
-    LinkedList<Statement> stackNode = new LinkedList<Statement>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
-    HashSet<Statement> setVisited = new HashSet<Statement>();
+    LinkedList<Statement> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
+    HashSet<Statement> setVisited = new HashSet<>();
 
     stackNode.add(root);
     stackIndex.add(0);
@@ -697,10 +697,10 @@ public class Statement implements IMatchable {
     List<StatEdge> res;
     if ((type & (type - 1)) == 0) {
       res = map.get(type);
-      res = res == null ? new ArrayList<StatEdge>() : new ArrayList<StatEdge>(res);
+      res = res == null ? new ArrayList<>() : new ArrayList<>(res);
     }
     else {
-      res = new ArrayList<StatEdge>();
+      res = new ArrayList<>();
       for (int edgetype : StatEdge.TYPES) {
         if ((type & edgetype) != 0) {
           List<StatEdge> lst = map.get(edgetype);
@@ -721,10 +721,10 @@ public class Statement implements IMatchable {
     List<Statement> res;
     if ((type & (type - 1)) == 0) {
       res = map.get(type);
-      res = res == null ? new ArrayList<Statement>() : new ArrayList<Statement>(res);
+      res = res == null ? new ArrayList<>() : new ArrayList<>(res);
     }
     else {
-      res = new ArrayList<Statement>();
+      res = new ArrayList<>();
       for (int edgetype : StatEdge.TYPES) {
         if ((type & edgetype) != 0) {
           List<Statement> lst = map.get(edgetype);
@@ -739,7 +739,7 @@ public class Statement implements IMatchable {
   }
 
   public Set<Statement> getNeighboursSet(int type, int direction) {
-    return new HashSet<Statement>(getNeighbours(type, direction));
+    return new HashSet<>(getNeighbours(type, direction));
   }
 
   public List<StatEdge> getSuccessorEdges(int type) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
index 5916490..d3cc7f2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
@@ -37,15 +37,15 @@ public class SwitchStatement extends Statement {
   // private fields
   // *****************************************************************************
 
-  private List<Statement> caseStatements = new ArrayList<Statement>();
+  private List<Statement> caseStatements = new ArrayList<>();
 
-  private List<List<StatEdge>> caseEdges = new ArrayList<List<StatEdge>>();
+  private List<List<StatEdge>> caseEdges = new ArrayList<>();
 
-  private List<List<ConstExprent>> caseValues = new ArrayList<List<ConstExprent>>();
+  private List<List<ConstExprent>> caseValues = new ArrayList<>();
 
   private StatEdge default_edge;
 
-  private final List<Exprent> headexprent = new ArrayList<Exprent>();
+  private final List<Exprent> headexprent = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
@@ -65,7 +65,7 @@ public class SwitchStatement extends Statement {
     stats.addWithKey(head, head.id);
 
     // find post node
-    Set<Statement> lstNodes = new HashSet<Statement>(head.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_FORWARD));
+    Set<Statement> lstNodes = new HashSet<>(head.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_FORWARD));
 
     // cluster nodes
     if (poststat != null) {
@@ -88,7 +88,7 @@ public class SwitchStatement extends Statement {
 
     if (head.type == Statement.TYPE_BASICBLOCK && head.getLastBasicType() == Statement.LASTBASICTYPE_SWITCH) {
 
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       if (DecHelper.isChoiceStatement(head, lst)) {
         Statement post = lst.remove(0);
 
@@ -160,7 +160,7 @@ public class SwitchStatement extends Statement {
 
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>(stats);
+    List<Object> lst = new ArrayList<>(stats);
     lst.add(1, headexprent.get(0));
 
     return lst;
@@ -200,7 +200,7 @@ public class SwitchStatement extends Statement {
 
   public void sortEdgesAndNodes() {
 
-    HashMap<StatEdge, Integer> mapEdgeIndex = new HashMap<StatEdge, Integer>();
+    HashMap<StatEdge, Integer> mapEdgeIndex = new HashMap<>();
 
     List<StatEdge> lstFirstSuccs = first.getSuccessorEdges(STATEDGE_DIRECT_ALL);
     for (int i = 0; i < lstFirstSuccs.size(); i++) {
@@ -211,15 +211,15 @@ public class SwitchStatement extends Statement {
     BasicBlockStatement bbstat = (BasicBlockStatement)first;
     int[] values = ((SwitchInstruction)bbstat.getBlock().getLastInstruction()).getValues();
 
-    List<Statement> nodes = new ArrayList<Statement>();
-    List<List<Integer>> edges = new ArrayList<List<Integer>>();
+    List<Statement> nodes = new ArrayList<>();
+    List<List<Integer>> edges = new ArrayList<>();
 
     // collect regular edges
     for (int i = 1; i < stats.size(); i++) {
 
       Statement stat = stats.get(i);
 
-      List<Integer> lst = new ArrayList<Integer>();
+      List<Integer> lst = new ArrayList<>();
       for (StatEdge edge : stat.getPredecessorEdges(StatEdge.TYPE_REGULAR)) {
         if (edge.getSource() == first) {
           lst.add(mapEdgeIndex.get(edge));
@@ -236,7 +236,7 @@ public class SwitchStatement extends Statement {
     while (!lstExitEdges.isEmpty()) {
       StatEdge edge = lstExitEdges.get(0);
 
-      List<Integer> lst = new ArrayList<Integer>();
+      List<Integer> lst = new ArrayList<>();
       for (int i = lstExitEdges.size() - 1; i >= 0; i--) {
         StatEdge edgeTemp = lstExitEdges.get(i);
         if (edgeTemp.getDestination() == edge.getDestination() && edgeTemp.getType() == edge.getType()) {
@@ -265,7 +265,7 @@ public class SwitchStatement extends Statement {
       Statement stat = nodes.get(index);
 
       if (stat != null) {
-        HashSet<Statement> setPreds = new HashSet<Statement>(stat.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_BACKWARD));
+        HashSet<Statement> setPreds = new HashSet<>(stat.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_BACKWARD));
         setPreds.remove(first);
 
         if (!setPreds.isEmpty()) {
@@ -293,12 +293,12 @@ public class SwitchStatement extends Statement {
     }
 
     // translate indices back into edges
-    List<List<StatEdge>> lstEdges = new ArrayList<List<StatEdge>>();
-    List<List<ConstExprent>> lstValues = new ArrayList<List<ConstExprent>>();
+    List<List<StatEdge>> lstEdges = new ArrayList<>();
+    List<List<ConstExprent>> lstValues = new ArrayList<>();
 
     for (List<Integer> lst : edges) {
-      List<StatEdge> lste = new ArrayList<StatEdge>();
-      List<ConstExprent> lstv = new ArrayList<ConstExprent>();
+      List<StatEdge> lste = new ArrayList<>();
+      List<ConstExprent> lstv = new ArrayList<>();
 
       List<StatEdge> lstSuccs = first.getSuccessorEdges(STATEDGE_DIRECT_ALL);
       for (Integer in : lst) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
index b71531f..04b03fe 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
@@ -32,7 +32,7 @@ public class SynchronizedStatement extends Statement {
 
   private Statement body;
 
-  private final List<Exprent> headexprent = new ArrayList<Exprent>();
+  private final List<Exprent> headexprent = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
@@ -106,7 +106,7 @@ public class SynchronizedStatement extends Statement {
 
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>(stats);
+    List<Object> lst = new ArrayList<>(stats);
     lst.add(1, headexprent.get(0));
 
     return lst;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
index 12bcc32..883a684 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
@@ -23,9 +23,9 @@ import java.util.List;
 
 public class CheckTypesResult {
 
-  private final List<ExprentTypePair> lstMaxTypeExprents = new ArrayList<ExprentTypePair>();
+  private final List<ExprentTypePair> lstMaxTypeExprents = new ArrayList<>();
 
-  private final List<ExprentTypePair> lstMinTypeExprents = new ArrayList<ExprentTypePair>();
+  private final List<ExprentTypePair> lstMinTypeExprents = new ArrayList<>();
 
   public void addMaxTypeExprent(Exprent exprent, VarType type) {
     lstMaxTypeExprents.add(new ExprentTypePair(exprent, type, null));
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
index 23b1c5e..a0a14cb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -45,9 +45,9 @@ public class VarDefinitionHelper {
 
   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
 
-    mapVarDefStatements = new HashMap<Integer, Statement>();
-    mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
-    implDefVars = new HashSet<Integer>();
+    mapVarDefStatements = new HashMap<>();
+    mapStatementVars = new HashMap<>();
+    implDefVars = new HashSet<>();
 
     this.varproc = varproc;
 
@@ -92,7 +92,7 @@ public class VarDefinitionHelper {
     }
 
     // catch variables are implicitly defined
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
@@ -211,7 +211,7 @@ public class VarDefinitionHelper {
 
   private Statement findFirstBlock(Statement stat, Integer varindex) {
 
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(stat);
 
     while (!stack.isEmpty()) {
@@ -251,15 +251,15 @@ public class VarDefinitionHelper {
 
   private Set<Integer> initStatement(Statement stat) {
 
-    HashMap<Integer, Integer> mapCount = new HashMap<Integer, Integer>();
+    HashMap<Integer, Integer> mapCount = new HashMap<>();
 
     List<VarExprent> condlst;
 
     if (stat.getExprents() == null) {
 
       // recurse on children statements
-      List<Integer> childVars = new ArrayList<Integer>();
-      List<Exprent> currVars = new ArrayList<Exprent>();
+      List<Integer> childVars = new ArrayList<>();
+      List<Exprent> currVars = new ArrayList<>();
 
       for (Object obj : stat.getSequentialObjects()) {
         if (obj instanceof Statement) {
@@ -306,7 +306,7 @@ public class VarDefinitionHelper {
     }
 
 
-    HashSet<Integer> set = new HashSet<Integer>(mapCount.keySet());
+    HashSet<Integer> set = new HashSet<>(mapCount.keySet());
 
     // put all variables defined in this statement into the set
     for (Entry<Integer, Integer> en : mapCount.entrySet()) {
@@ -322,8 +322,8 @@ public class VarDefinitionHelper {
 
   private static List<VarExprent> getAllVars(List<Exprent> lst) {
 
-    List<VarExprent> res = new ArrayList<VarExprent>();
-    List<Exprent> listTemp = new ArrayList<Exprent>();
+    List<VarExprent> res = new ArrayList<>();
+    List<Exprent> listTemp = new ArrayList<>();
 
     for (Exprent expr : lst) {
       listTemp.addAll(expr.getAllExprents(true));
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 2ba0490..5483f78 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -29,10 +29,10 @@ import java.util.Map.Entry;
 public class VarProcessor {
   private final StructMethod method;
   private final MethodDescriptor methodDescriptor;
-  private Map<VarVersionPair, String> mapVarNames = new HashMap<VarVersionPair, String>();
+  private Map<VarVersionPair, String> mapVarNames = new HashMap<>();
   private VarVersionsProcessor varVersions;
-  private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
-  private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
+  private final Map<VarVersionPair, String> thisVars = new HashMap<>();
+  private final Set<VarVersionPair> externalVars = new HashSet<>();
 
   public VarProcessor(StructMethod mt, MethodDescriptor md) {
     method = mt;
@@ -45,7 +45,7 @@ public class VarProcessor {
   }
 
   public void setVarDefinitions(Statement root) {
-    mapVarNames = new HashMap<VarVersionPair, String>();
+    mapVarNames = new HashMap<>();
     new VarDefinitionHelper(root, method, this).setVarDefinitions();
   }
 
@@ -56,10 +56,10 @@ public class VarProcessor {
 
     Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
 
-    List<VarVersionPair> listVars = new ArrayList<VarVersionPair>(mapVarNames.keySet());
+    List<VarVersionPair> listVars = new ArrayList<>(mapVarNames.keySet());
     Collections.sort(listVars, (o1, o2) -> o1.var - o2.var);
 
-    Map<String, Integer> mapNames = new HashMap<String, Integer>();
+    Map<String, Integer> mapNames = new HashMap<>();
 
     for (VarVersionPair pair : listVars) {
       String name = mapVarNames.get(pair);
@@ -84,7 +84,7 @@ public class VarProcessor {
   }
 
   public void refreshVarNames(VarNamesCollector vc) {
-    Map<VarVersionPair, String> tempVarNames = new HashMap<VarVersionPair, String>(mapVarNames);
+    Map<VarVersionPair, String> tempVarNames = new HashMap<>(mapVarNames);
     for (Entry<VarVersionPair, String> ent : tempVarNames.entrySet()) {
       mapVarNames.put(ent.getKey(), vc.getFreeName(ent.getValue()));
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
index ea95ed0..a142eee 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
@@ -40,9 +40,9 @@ public class VarTypeProcessor {
 
   private final StructMethod method;
   private final MethodDescriptor methodDescriptor;
-  private final Map<VarVersionPair, VarType> mapExprentMinTypes = new HashMap<VarVersionPair, VarType>();
-  private final Map<VarVersionPair, VarType> mapExprentMaxTypes = new HashMap<VarVersionPair, VarType>();
-  private final Map<VarVersionPair, Integer> mapFinalVars = new HashMap<VarVersionPair, Integer>();
+  private final Map<VarVersionPair, VarType> mapExprentMinTypes = new HashMap<>();
+  private final Map<VarVersionPair, VarType> mapExprentMaxTypes = new HashMap<>();
+  private final Map<VarVersionPair, Integer> mapFinalVars = new HashMap<>();
 
   public VarTypeProcessor(StructMethod mt, MethodDescriptor md) {
     method = mt;
@@ -78,7 +78,7 @@ public class VarTypeProcessor {
     }
 
     // catch variables
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
index 9b57833..d0010ca 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
@@ -31,9 +31,9 @@ public class VarVersionNode implements IGraphNode {
 
   public final int version;
 
-  public final Set<VarVersionEdge> succs = new HashSet<VarVersionEdge>();
+  public final Set<VarVersionEdge> succs = new HashSet<>();
 
-  public final Set<VarVersionEdge> preds = new HashSet<VarVersionEdge>();
+  public final Set<VarVersionEdge> preds = new HashSet<>();
 
   public int flags;
 
@@ -50,7 +50,7 @@ public class VarVersionNode implements IGraphNode {
   }
 
   public List<IGraphNode> getPredecessors() {
-    List<IGraphNode> lst = new ArrayList<IGraphNode>(preds.size());
+    List<IGraphNode> lst = new ArrayList<>(preds.size());
     for (VarVersionEdge edge : preds) {
       lst.add(edge.source);
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 8cc11fa..5fd619c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -27,7 +27,7 @@ public class VarVersionsGraph {
 
   public int counter = 0;
 
-  public final VBStyleCollection<VarVersionNode, VarVersionPair> nodes = new VBStyleCollection<VarVersionNode, VarVersionPair>();
+  public final VBStyleCollection<VarVersionNode, VarVersionPair> nodes = new VBStyleCollection<>();
 
   private GenericDominatorEngine engine;
 
@@ -48,13 +48,13 @@ public class VarVersionsGraph {
     }
     else {
 
-      HashSet<VarVersionNode> marked = new HashSet<VarVersionNode>();
+      HashSet<VarVersionNode> marked = new HashSet<>();
 
       if (domnodes.contains(node)) {
         return true;
       }
 
-      LinkedList<VarVersionNode> lstNodes = new LinkedList<VarVersionNode>();
+      LinkedList<VarVersionNode> lstNodes = new LinkedList<>();
       lstNodes.add(node);
 
       while (!lstNodes.isEmpty()) {
@@ -85,7 +85,7 @@ public class VarVersionsGraph {
 
   public void initDominators() {
 
-    final HashSet<VarVersionNode> roots = new HashSet<VarVersionNode>();
+    final HashSet<VarVersionNode> roots = new HashSet<>();
 
     for (VarVersionNode node : nodes) {
       if (node.preds.isEmpty()) {
@@ -108,12 +108,12 @@ public class VarVersionsGraph {
 
   private static LinkedList<VarVersionNode> getReversedPostOrder(Collection<VarVersionNode> roots) {
 
-    LinkedList<VarVersionNode> lst = new LinkedList<VarVersionNode>();
-    HashSet<VarVersionNode> setVisited = new HashSet<VarVersionNode>();
+    LinkedList<VarVersionNode> lst = new LinkedList<>();
+    HashSet<VarVersionNode> setVisited = new HashSet<>();
 
     for (VarVersionNode root : roots) {
 
-      LinkedList<VarVersionNode> lstTemp = new LinkedList<VarVersionNode>();
+      LinkedList<VarVersionNode> lstTemp = new LinkedList<>();
       addToReversePostOrderListIterative(root, lstTemp, setVisited);
 
       lst.addAll(lstTemp);
@@ -124,10 +124,10 @@ public class VarVersionsGraph {
 
   private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, HashSet<VarVersionNode> setVisited) {
 
-    HashMap<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<VarVersionNode, List<VarVersionEdge>>();
+    HashMap<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
 
-    LinkedList<VarVersionNode> stackNode = new LinkedList<VarVersionNode>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+    LinkedList<VarVersionNode> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
     stackNode.add(root);
     stackIndex.add(0);
@@ -141,7 +141,7 @@ public class VarVersionsGraph {
 
       List<VarVersionEdge> lstSuccs = mapNodeSuccs.get(node);
       if (lstSuccs == null) {
-        mapNodeSuccs.put(node, lstSuccs = new ArrayList<VarVersionEdge>(node.succs));
+        mapNodeSuccs.put(node, lstSuccs = new ArrayList<>(node.succs));
       }
 
       for (; index < lstSuccs.size(); index++) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
index cadaf83..e68282e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
@@ -35,7 +35,7 @@ import java.util.Map.Entry;
 
 public class VarVersionsProcessor {
   private final StructMethod method;
-  private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
+  private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<>();
   private VarTypeProcessor typeProcessor;
 
   public VarVersionsProcessor(StructMethod mt, MethodDescriptor md) {
@@ -65,9 +65,9 @@ public class VarVersionsProcessor {
 
   private static void mergePhiVersions(SSAConstructorSparseEx ssa, DirectGraph graph) {
     // collect phi versions
-    List<Set<VarVersionPair>> lst = new ArrayList<Set<VarVersionPair>>();
+    List<Set<VarVersionPair>> lst = new ArrayList<>();
     for (Entry<VarVersionPair, FastSparseSet<Integer>> ent : ssa.getPhi().entrySet()) {
-      Set<VarVersionPair> set = new HashSet<VarVersionPair>();
+      Set<VarVersionPair> set = new HashSet<>();
       set.add(ent.getKey());
       for (Integer version : ent.getValue()) {
         set.add(new VarVersionPair(ent.getKey().var, version.intValue()));
@@ -75,7 +75,7 @@ public class VarVersionsProcessor {
 
       for (int i = lst.size() - 1; i >= 0; i--) {
         Set<VarVersionPair> tset = lst.get(i);
-        Set<VarVersionPair> intersection = new HashSet<VarVersionPair>(set);
+        Set<VarVersionPair> intersection = new HashSet<>(set);
         intersection.retainAll(tset);
 
         if (!intersection.isEmpty()) {
@@ -87,7 +87,7 @@ public class VarVersionsProcessor {
       lst.add(set);
     }
 
-    Map<VarVersionPair, Integer> phiVersions = new HashMap<VarVersionPair, Integer>();
+    Map<VarVersionPair, Integer> phiVersions = new HashMap<>();
     for (Set<VarVersionPair> set : lst) {
       int min = Integer.MAX_VALUE;
       for (VarVersionPair paar : set) {
@@ -130,7 +130,7 @@ public class VarVersionsProcessor {
     Map<VarVersionPair, VarType> mapExprentMaxTypes = typeProcessor.getMapExprentMaxTypes();
     Map<VarVersionPair, VarType> mapExprentMinTypes = typeProcessor.getMapExprentMinTypes();
 
-    Set<VarVersionPair> set = new HashSet<VarVersionPair>(mapExprentMinTypes.keySet());
+    Set<VarVersionPair> set = new HashSet<>(mapExprentMinTypes.keySet());
     for (VarVersionPair paar : set) {
       VarType type = mapExprentMinTypes.get(paar);
       VarType maxType = mapExprentMaxTypes.get(paar);
@@ -156,13 +156,13 @@ public class VarVersionsProcessor {
     Map<VarVersionPair, VarType> mapExprentMaxTypes = typeProcessor.getMapExprentMaxTypes();
     Map<VarVersionPair, VarType> mapExprentMinTypes = typeProcessor.getMapExprentMinTypes();
 
-    Map<Integer, Set<Integer>> mapVarVersions = new HashMap<Integer, Set<Integer>>();
+    Map<Integer, Set<Integer>> mapVarVersions = new HashMap<>();
 
     for (VarVersionPair pair : mapExprentMinTypes.keySet()) {
       if (pair.version >= 0) {  // don't merge constants
         Set<Integer> set = mapVarVersions.get(pair.var);
         if (set == null) {
-          set = new HashSet<Integer>();
+          set = new HashSet<>();
           mapVarVersions.put(pair.var, set);
         }
         set.add(pair.version);
@@ -171,12 +171,12 @@ public class VarVersionsProcessor {
 
     boolean is_method_static = mt.hasModifier(CodeConstants.ACC_STATIC);
 
-    Map<VarVersionPair, Integer> mapMergedVersions = new HashMap<VarVersionPair, Integer>();
+    Map<VarVersionPair, Integer> mapMergedVersions = new HashMap<>();
 
     for (Entry<Integer, Set<Integer>> ent : mapVarVersions.entrySet()) {
 
       if (ent.getValue().size() > 1) {
-        List<Integer> lstVersions = new ArrayList<Integer>(ent.getValue());
+        List<Integer> lstVersions = new ArrayList<>(ent.getValue());
         Collections.sort(lstVersions);
 
         for (int i = 0; i < lstVersions.size(); i++) {
@@ -234,11 +234,11 @@ public class VarVersionsProcessor {
 
     CounterContainer counters = DecompilerContext.getCounterContainer();
 
-    final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<VarVersionPair, Integer>();
-    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
+    final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<>();
+    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<>();
 
     // map var-version pairs on new var indexes
-    Set<VarVersionPair> set = new HashSet<VarVersionPair>(mapExprentMinTypes.keySet());
+    Set<VarVersionPair> set = new HashSet<>(mapExprentMinTypes.keySet());
     for (VarVersionPair pair : set) {
 
       if (pair.version >= 0) {
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
index 566508b..ce2a5c1 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
@@ -26,7 +26,7 @@ public class ClassWrapperNode {
 
   private ClassWrapperNode superclass;
 
-  private final List<ClassWrapperNode> subclasses = new ArrayList<ClassWrapperNode>();
+  private final List<ClassWrapperNode> subclasses = new ArrayList<>();
 
   public ClassWrapperNode(StructClass cl) {
     this.classStruct = cl;
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 8a431df..71dc351 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -23,12 +23,12 @@ import java.util.Set;
 
 public class ConverterHelper implements IIdentifierRenamer {
 
-  private static final Set<String> KEYWORDS = new HashSet<String>(Arrays.asList(
+  private static final Set<String> KEYWORDS = new HashSet<>(Arrays.asList(
     "abstract", "do", "if", "package", "synchronized", "boolean", "double", "implements", "private", "this", "break", "else", "import",
     "protected", "throw", "byte", "extends", "instanceof", "public", "throws", "case", "false", "int", "return", "transient", "catch",
     "final", "interface", "short", "true", "char", "finally", "long", "static", "try", "class", "float", "native", "strictfp", "void",
     "const", "for", "new", "super", "volatile", "continue", "goto", "null", "switch", "while", "default", "assert", "enum"));
-  private static final Set<String> RESERVED_WINDOWS_NAMESPACE = new HashSet<String>(Arrays.asList(
+  private static final Set<String> RESERVED_WINDOWS_NAMESPACE = new HashSet<>(Arrays.asList(
     "aux", "prn", "aux", "nul",
     "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9",
     "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9"));
@@ -36,7 +36,7 @@ public class ConverterHelper implements IIdentifierRenamer {
   private int classCounter = 0;
   private int fieldCounter = 0;
   private int methodCounter = 0;
-  private final Set<String> setNonStandardClassNames = new HashSet<String>();
+  private final Set<String> setNonStandardClassNames = new HashSet<>();
 
   @Override
   public boolean toBeRenamed(Type elementType, String className, String element, String descriptor) {
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
index ee268e6..223065a 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
@@ -36,9 +36,9 @@ public class IdentifierConverter implements NewClassNameBuilder {
   private StructContext context;
   private IIdentifierRenamer helper;
   private PoolInterceptor interceptor;
-  private List<ClassWrapperNode> rootClasses = new ArrayList<ClassWrapperNode>();
-  private List<ClassWrapperNode> rootInterfaces = new ArrayList<ClassWrapperNode>();
-  private Map<String, Map<String, String>> interfaceNameMaps = new HashMap<String, Map<String, String>>();
+  private List<ClassWrapperNode> rootClasses = new ArrayList<>();
+  private List<ClassWrapperNode> rootInterfaces = new ArrayList<>();
+  private Map<String, Map<String, String>> interfaceNameMaps = new HashMap<>();
 
   public void rename(StructContext context) {
     try {
@@ -76,11 +76,11 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
   private void renameClasses() {
     List<ClassWrapperNode> lstClasses = getReversePostOrderListIterative(rootClasses);
-    Map<String, Map<String, String>> classNameMaps = new HashMap<String, Map<String, String>>();
+    Map<String, Map<String, String>> classNameMaps = new HashMap<>();
 
     for (ClassWrapperNode node : lstClasses) {
       StructClass cl = node.getClassStruct();
-      Map<String, String> names = new HashMap<String, String>();
+      Map<String, String> names = new HashMap<>();
 
       // merge information on super class
       if (cl.superClass != null) {
@@ -113,7 +113,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
   }
 
   private Map<String, String> processExternalInterface(StructClass cl) {
-    Map<String, String> names = new HashMap<String, String>();
+    Map<String, String> names = new HashMap<>();
 
     for (String ifName : cl.getInterfaceNames()) {
       Map<String, String> mapInt = interfaceNameMaps.get(ifName);
@@ -135,13 +135,13 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
   private void renameInterfaces() {
     List<ClassWrapperNode> lstInterfaces = getReversePostOrderListIterative(rootInterfaces);
-    Map<String, Map<String, String>> interfaceNameMaps = new HashMap<String, Map<String, String>>();
+    Map<String, Map<String, String>> interfaceNameMaps = new HashMap<>();
 
     // rename methods and fields
     for (ClassWrapperNode node : lstInterfaces) {
 
       StructClass cl = node.getClassStruct();
-      Map<String, String> names = new HashMap<String, String>();
+      Map<String, String> names = new HashMap<>();
 
       // merge information on super interfaces
       for (String ifName : cl.getInterfaceNames()) {
@@ -161,7 +161,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
   private void renameAllClasses() {
     // order not important
-    List<ClassWrapperNode> lstAllClasses = new ArrayList<ClassWrapperNode>(getReversePostOrderListIterative(rootInterfaces));
+    List<ClassWrapperNode> lstAllClasses = new ArrayList<>(getReversePostOrderListIterative(rootInterfaces));
     lstAllClasses.addAll(getReversePostOrderListIterative(rootClasses));
 
     // rename all interfaces and classes
@@ -203,7 +203,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
     }
 
     // methods
-    HashSet<String> setMethodNames = new HashSet<String>();
+    HashSet<String> setMethodNames = new HashSet<>();
     for (StructMethod md : cl.getMethods()) {
       setMethodNames.add(md.getName());
     }
@@ -250,7 +250,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
     // fields
     // FIXME: should overloaded fields become the same name?
-    HashSet<String> setFieldNames = new HashSet<String>();
+    HashSet<String> setFieldNames = new HashSet<>();
     for (StructField fd : cl.getFields()) {
       setFieldNames.add(fd.getName());
     }
@@ -286,12 +286,12 @@ public class IdentifierConverter implements NewClassNameBuilder {
   }
 
   private static List<ClassWrapperNode> getReversePostOrderListIterative(List<ClassWrapperNode> roots) {
-    List<ClassWrapperNode> res = new ArrayList<ClassWrapperNode>();
+    List<ClassWrapperNode> res = new ArrayList<>();
 
-    LinkedList<ClassWrapperNode> stackNode = new LinkedList<ClassWrapperNode>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+    LinkedList<ClassWrapperNode> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
-    Set<ClassWrapperNode> setVisited = new HashSet<ClassWrapperNode>();
+    Set<ClassWrapperNode> setVisited = new HashSet<>();
 
     for (ClassWrapperNode root : roots) {
       stackNode.add(root);
@@ -326,19 +326,19 @@ public class IdentifierConverter implements NewClassNameBuilder {
   }
 
   private void buildInheritanceTree() {
-    Map<String, ClassWrapperNode> nodes = new HashMap<String, ClassWrapperNode>();
+    Map<String, ClassWrapperNode> nodes = new HashMap<>();
     Map<String, StructClass> classes = context.getClasses();
 
-    List<ClassWrapperNode> rootClasses = new ArrayList<ClassWrapperNode>();
-    List<ClassWrapperNode> rootInterfaces = new ArrayList<ClassWrapperNode>();
+    List<ClassWrapperNode> rootClasses = new ArrayList<>();
+    List<ClassWrapperNode> rootInterfaces = new ArrayList<>();
 
     for (StructClass cl : classes.values()) {
       if (!cl.isOwn()) {
         continue;
       }
 
-      LinkedList<StructClass> stack = new LinkedList<StructClass>();
-      LinkedList<ClassWrapperNode> stackSubNodes = new LinkedList<ClassWrapperNode>();
+      LinkedList<StructClass> stack = new LinkedList<>();
+      LinkedList<ClassWrapperNode> stackSubNodes = new LinkedList<>();
 
       stack.add(cl);
       stackSubNodes.add(null);
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
index 7d589cc..9b4b6c6 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
@@ -23,9 +23,9 @@ public class PoolInterceptor {
 
   private final IIdentifierRenamer helper;
 
-  private final HashMap<String, String> mapOldToNewNames = new HashMap<String, String>();
+  private final HashMap<String, String> mapOldToNewNames = new HashMap<>();
 
-  private final HashMap<String, String> mapNewToOldNames = new HashMap<String, String>();
+  private final HashMap<String, String> mapNewToOldNames = new HashMap<>();
 
   public PoolInterceptor(IIdentifierRenamer helper) {
     this.helper = helper;
diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
index 69125e1..38c9487 100644
--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
@@ -42,11 +42,11 @@ public class ContextUnit {
   private final IResultSaver resultSaver;
   private final IDecompiledData decompiledData;
 
-  private final List<String> classEntries = new ArrayList<String>();  // class file or jar/zip entry
-  private final List<String> dirEntries = new ArrayList<String>();
-  private final List<String[]> otherEntries = new ArrayList<String[]>();
+  private final List<String> classEntries = new ArrayList<>();  // class file or jar/zip entry
+  private final List<String> dirEntries = new ArrayList<>();
+  private final List<String[]> otherEntries = new ArrayList<>();
 
-  private List<StructClass> classes = new ArrayList<StructClass>();
+  private List<StructClass> classes = new ArrayList<>();
   private Manifest manifest;
 
   public ContextUnit(int type, String archivePath, String filename, boolean own, IResultSaver resultSaver, IDecompiledData decompiledData) {
@@ -72,7 +72,7 @@ public class ContextUnit {
   }
 
   public void reload(LazyLoader loader) throws IOException {
-    List<StructClass> lstClasses = new ArrayList<StructClass>();
+    List<StructClass> lstClasses = new ArrayList<>();
 
     for (StructClass cl : classes) {
       String oldName = cl.qualifiedName;
diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
index 9a355ab..33dc178 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -93,7 +93,7 @@ public class StructClass extends StructMember {
 
     // fields
     length = in.readUnsignedShort();
-    fields = new VBStyleCollection<StructField, String>();
+    fields = new VBStyleCollection<>();
     for (int i = 0; i < length; i++) {
       StructField field = new StructField(in, this);
       fields.addWithKey(field, InterpreterUtil.makeUniqueKey(field.getName(), field.getDescriptor()));
@@ -101,7 +101,7 @@ public class StructClass extends StructMember {
 
     // methods
     length = in.readUnsignedShort();
-    methods = new VBStyleCollection<StructMethod, String>();
+    methods = new VBStyleCollection<>();
     for (int i = 0; i < length; i++) {
       StructMethod method = new StructMethod(in, this);
       methods.addWithKey(method, InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor()));
diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
index d47de60..f11e4a4 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
@@ -35,8 +35,8 @@ public class StructContext {
   private final IResultSaver saver;
   private final IDecompiledData decompiledData;
   private final LazyLoader loader;
-  private final Map<String, ContextUnit> units = new HashMap<String, ContextUnit>();
-  private final Map<String, StructClass> classes = new HashMap<String, StructClass>();
+  private final Map<String, ContextUnit> units = new HashMap<>();
+  private final Map<String, StructClass> classes = new HashMap<>();
 
   public StructContext(IResultSaver saver, IDecompiledData decompiledData, LazyLoader loader) {
     this.saver = saver;
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index bc8b931..3bc93a1 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -47,7 +47,7 @@ public class StructMember {
   }
 
   protected VBStyleCollection<StructGeneralAttribute, String> readAttributes(DataInputFullStream in, ConstantPool pool) throws IOException {
-    VBStyleCollection<StructGeneralAttribute, String> attributes = new VBStyleCollection<StructGeneralAttribute, String>();
+    VBStyleCollection<StructGeneralAttribute, String> attributes = new VBStyleCollection<>();
 
     int length = in.readUnsignedShort();
     for (int i = 0; i < length; i++) {
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index 48362f3..d398c5e 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -119,7 +119,7 @@ public class StructMethod extends StructMember {
 
   @SuppressWarnings("AssignmentToForLoopParameter")
   private InstructionSequence parseBytecode(DataInputFullStream in, int length, ConstantPool pool) throws IOException {
-    VBStyleCollection<Instruction, Integer> instructions = new VBStyleCollection<Instruction, Integer>();
+    VBStyleCollection<Instruction, Integer> instructions = new VBStyleCollection<>();
 
     int bytecode_version = classStruct.getBytecodeVersion();
 
@@ -137,7 +137,7 @@ public class StructMethod extends StructMember {
         opcode = in.readUnsignedByte();
       }
 
-      List<Integer> operands = new ArrayList<Integer>();
+      List<Integer> operands = new ArrayList<>();
 
       if (opcode >= opc_iconst_m1 && opcode <= opc_iconst_5) {
         operands.add(new Integer(opr_iconst[opcode - opc_iconst_m1]));
@@ -331,7 +331,7 @@ public class StructMethod extends StructMember {
     }
 
     // initialize exception table
-    List<ExceptionHandler> lstHandlers = new ArrayList<ExceptionHandler>();
+    List<ExceptionHandler> lstHandlers = new ArrayList<>();
 
     int exception_count = in.readUnsignedShort();
     for (int i = 0; i < exception_count; i++) {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
index 1380427..55c138c 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
@@ -39,7 +39,7 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
   public static List<AnnotationExprent> parseAnnotations(ConstantPool pool, DataInputStream data) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
-      List<AnnotationExprent> annotations = new ArrayList<AnnotationExprent>(len);
+      List<AnnotationExprent> annotations = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         annotations.add(parseAnnotation(data, pool));
       }
@@ -57,8 +57,8 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
     List<Exprent> values;
     int len = data.readUnsignedShort();
     if (len > 0) {
-      names = new ArrayList<String>(len);
-      values = new ArrayList<Exprent>(len);
+      names = new ArrayList<>(len);
+      values = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         names.add(pool.getPrimitiveConstant(data.readUnsignedShort()).getString());
         values.add(parseAnnotationElement(data, pool));
@@ -127,7 +127,7 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
         List<Exprent> elements = Collections.emptyList();
         int len = data.readUnsignedShort();
         if (len > 0) {
-          elements = new ArrayList<Exprent>(len);
+          elements = new ArrayList<>(len);
           for (int i = 0; i < len; i++) {
             elements.add(parseAnnotationElement(data, pool));
           }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
index a33c7bb..cee629c 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
@@ -34,7 +34,7 @@ public class StructAnnotationParameterAttribute extends StructGeneralAttribute {
 
     int len = data.readUnsignedByte();
     if (len > 0) {
-      paramAnnotations = new ArrayList<List<AnnotationExprent>>(len);
+      paramAnnotations = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         List<AnnotationExprent> annotations = StructAnnotationAttribute.parseAnnotations(pool, data);
         paramAnnotations.add(annotations);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
index 597bc7a..f9b5561 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
@@ -26,8 +26,8 @@ import java.util.List;
 
 public class StructBootstrapMethodsAttribute extends StructGeneralAttribute {
 
-  private final List<LinkConstant> methodRefs = new ArrayList<LinkConstant>();
-  private final List<List<PooledConstant>> methodArguments = new ArrayList<List<PooledConstant>>();
+  private final List<LinkConstant> methodRefs = new ArrayList<>();
+  private final List<List<PooledConstant>> methodArguments = new ArrayList<>();
 
   @Override
   public void initContent(ConstantPool pool) throws IOException {
@@ -39,7 +39,7 @@ public class StructBootstrapMethodsAttribute extends StructGeneralAttribute {
       int bootstrap_method_ref = data.readUnsignedShort();
       int num_bootstrap_arguments = data.readUnsignedShort();
 
-      List<PooledConstant> list_arguments = new ArrayList<PooledConstant>();
+      List<PooledConstant> list_arguments = new ArrayList<>();
 
       for (int j = 0; j < num_bootstrap_arguments; ++j) {
         int bootstrap_argument_ref = data.readUnsignedShort();
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
index 5eda047..946fa3c 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
@@ -32,7 +32,7 @@ public class StructExceptionsAttribute extends StructGeneralAttribute {
     DataInputStream data = stream();
     int len = data.readUnsignedShort();
     if (len > 0) {
-      throwsExceptions = new ArrayList<Integer>(len);
+      throwsExceptions = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         throwsExceptions.add(data.readUnsignedShort());
       }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
index 3c9f760..f576ecf 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
@@ -52,7 +52,7 @@ public class StructInnerClassesAttribute extends StructGeneralAttribute {
 
     int len = data.readUnsignedShort();
     if (len > 0) {
-      entries = new ArrayList<Entry>(len);
+      entries = new ArrayList<>(len);
 
       for (int i = 0; i < len; i++) {
         int innerNameIdx = data.readUnsignedShort();
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
index fceae35..b57d0cf 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
@@ -43,7 +43,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
 
     int len = data.readUnsignedShort();
     if (len > 0) {
-      mapVarNames = new HashMap<Integer, String>(len);
+      mapVarNames = new HashMap<>(len);
       for (int i = 0; i < len; i++) {
         data.discard(4);
         int nameIndex = data.readUnsignedShort();
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index a204910..8f07b4c 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -40,7 +40,7 @@ public class ConstantPool implements NewClassNameBuilder {
 
   public ConstantPool(DataInputStream in) throws IOException {
     int size = in.readUnsignedShort();
-    pool = new ArrayList<PooledConstant>(size);
+    pool = new ArrayList<>(size);
     BitSet[] nextPass = {new BitSet(size), new BitSet(size), new BitSet(size)};
 
     // first dummy constant
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
index 506a51f..546c5a5 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
@@ -24,9 +24,9 @@ import java.util.List;
 
 public class DataPoint {
 
-  private List<VarType> localVariables = new ArrayList<VarType>();
+  private List<VarType> localVariables = new ArrayList<>();
 
-  private ListStack<VarType> stack = new ListStack<VarType>();
+  private ListStack<VarType> stack = new ListStack<>();
 
 
   public void setVariable(int index, VarType value) {
@@ -53,7 +53,7 @@ public class DataPoint {
 
   public DataPoint copy() {
     DataPoint point = new DataPoint();
-    point.setLocalVariables(new ArrayList<VarType>(localVariables));
+    point.setLocalVariables(new ArrayList<>(localVariables));
     point.setStack(stack.clone());
     return point;
   }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
index 2465382..3b5abb4 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
@@ -41,7 +41,7 @@ public class MethodDescriptor {
 
     if (parenth > 1) {
       String parameters = descriptor.substring(1, parenth);
-      List<String> lst = new ArrayList<String>();
+      List<String> lst = new ArrayList<>();
 
       int indexFrom = -1, ind, len = parameters.length(), index = 0;
       while (index < len) {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
index 2ff2954..077814c 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
@@ -22,9 +22,9 @@ public class GenericClassDescriptor {
 
   public GenericType superclass;
 
-  public final List<GenericType> superinterfaces = new ArrayList<GenericType>();
+  public final List<GenericType> superinterfaces = new ArrayList<>();
 
-  public final List<String> fparameters = new ArrayList<String>();
+  public final List<String> fparameters = new ArrayList<>();
 
-  public final List<List<GenericType>> fbounds = new ArrayList<List<GenericType>>();
+  public final List<List<GenericType>> fbounds = new ArrayList<>();
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 509783a..a5760a3 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -142,7 +142,7 @@ public class GenericMain {
       String param = value.substring(0, to);
       value = value.substring(to + 1);
 
-      List<GenericType> lstBounds = new ArrayList<GenericType>();
+      List<GenericType> lstBounds = new ArrayList<>();
 
       while (true) {
         if (value.charAt(0) == ':') {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
index 7ef9399..2d38084 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
@@ -20,13 +20,13 @@ import java.util.List;
 
 public class GenericMethodDescriptor {
 
-  public final List<String> fparameters = new ArrayList<String>();
+  public final List<String> fparameters = new ArrayList<>();
 
-  public final List<List<GenericType>> fbounds = new ArrayList<List<GenericType>>();
+  public final List<List<GenericType>> fbounds = new ArrayList<>();
 
-  public final List<GenericType> params = new ArrayList<GenericType>();
+  public final List<GenericType> params = new ArrayList<>();
 
   public GenericType ret;
 
-  public final List<GenericType> exceptions = new ArrayList<GenericType>();
+  public final List<GenericType> exceptions = new ArrayList<>();
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
index d3b3896..ee71f5b 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -32,9 +32,9 @@ public class GenericType {
   public final int arrayDim;
   public final String value;
 
-  private final List<GenericType> enclosingClasses = new ArrayList<GenericType>();
-  private final List<GenericType> arguments = new ArrayList<GenericType>();
-  private final List<Integer> wildcards = new ArrayList<Integer>();
+  private final List<GenericType> enclosingClasses = new ArrayList<>();
+  private final List<GenericType> arguments = new ArrayList<>();
+  private final List<Integer> wildcards = new ArrayList<>();
 
   public GenericType(int type, int arrayDim, String value) {
     this.type = type;
diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
index 40944c1..e0bf3cb 100644
--- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
@@ -27,7 +27,7 @@ import java.util.Map;
 
 public class LazyLoader {
 
-  private final Map<String, Link> mapClassLinks = new HashMap<String, Link>();
+  private final Map<String, Link> mapClassLinks = new HashMap<>();
   private final IBytecodeProvider provider;
 
   public LazyLoader(IBytecodeProvider provider) {
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
index bdef810..a222d67 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
@@ -36,16 +36,16 @@ public class MatchEngine {
 
   private MatchNode rootNode = null;
   
-  private final Map<String, Object> variables = new HashMap<String, Object>();
+  private final Map<String, Object> variables = new HashMap<>();
   
-  private static final Map<String, MatchProperties> stat_properties = new HashMap<String, MatchProperties>();
-  private static final Map<String, MatchProperties> expr_properties = new HashMap<String, MatchProperties>();
-  private static final Map<String, Integer> stat_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> expr_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> expr_func_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> expr_exit_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> stat_if_type = new HashMap<String, Integer>();
-  private static final Map<String, VarType> expr_const_type = new HashMap<String, VarType>();
+  private static final Map<String, MatchProperties> stat_properties = new HashMap<>();
+  private static final Map<String, MatchProperties> expr_properties = new HashMap<>();
+  private static final Map<String, Integer> stat_type = new HashMap<>();
+  private static final Map<String, Integer> expr_type = new HashMap<>();
+  private static final Map<String, Integer> expr_func_type = new HashMap<>();
+  private static final Map<String, Integer> expr_exit_type = new HashMap<>();
+  private static final Map<String, Integer> stat_if_type = new HashMap<>();
+  private static final Map<String, VarType> expr_const_type = new HashMap<>();
   
   static {
     stat_properties.put("type", MatchProperties.STATEMENT_TYPE);
@@ -109,11 +109,11 @@ public class MatchEngine {
     String[] lines = description.split("\n");
 
     int depth = 0; 
-    LinkedList<MatchNode> stack = new LinkedList<MatchNode>(); 
+    LinkedList<MatchNode> stack = new LinkedList<>();
     
     for(String line : lines) {
       
-      List<String> properties = new ArrayList<String>(Arrays.asList(line.split("\\s+"))); // split on any number of whitespaces
+      List<String> properties = new ArrayList<>(Arrays.asList(line.split("\\s+"))); // split on any number of whitespaces
       if(properties.get(0).isEmpty()) {
         properties.remove(0);
       }
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
index f922a3c..8d52aa9 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
@@ -48,9 +48,9 @@ public class MatchNode {
   
   private final int type;
   
-  private final Map<MatchProperties, RuleValue> rules = new HashMap<MatchProperties, RuleValue>();
+  private final Map<MatchProperties, RuleValue> rules = new HashMap<>();
   
-  private final List<MatchNode> children = new ArrayList<MatchNode>();
+  private final List<MatchNode> children = new ArrayList<>();
   
   
   public MatchNode(int type) {
diff --git a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
index 09ce36b..cd568a8 100644
--- a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
@@ -19,7 +19,7 @@ import java.util.*;
 
 public class FastFixedSetFactory<E> {
 
-  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<int[], E>();
+  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<>();
 
   private final int dataLength;
 
@@ -46,7 +46,7 @@ public class FastFixedSetFactory<E> {
   }
 
   public FastFixedSet<E> spawnEmptySet() {
-    return new FastFixedSet<E>(this);
+    return new FastFixedSet<>(this);
   }
 
   private int getDataLength() {
@@ -74,7 +74,7 @@ public class FastFixedSetFactory<E> {
 
     public FastFixedSet<E> getCopy() {
 
-      FastFixedSet<E> copy = new FastFixedSet<E>(factory);
+      FastFixedSet<E> copy = new FastFixedSet<>(factory);
 
       int arrlength = data.length;
       int[] cpdata = new int[arrlength];
@@ -201,15 +201,15 @@ public class FastFixedSetFactory<E> {
     }
 
     public Iterator<E> iterator() {
-      return new FastFixedSetIterator<E>(this);
+      return new FastFixedSetIterator<>(this);
     }
 
     public Set<E> toPlainSet() {
-      return toPlainCollection(new HashSet<E>());
+      return toPlainCollection(new HashSet<>());
     }
 
     public List<E> toPlainList() {
-      return toPlainCollection(new ArrayList<E>());
+      return toPlainCollection(new ArrayList<>());
     }
 
 
diff --git a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
index ab80150..94ddfce 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
@@ -22,7 +22,7 @@ import java.util.Set;
 
 public class FastSetFactory<E> {
 
-  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<int[], E>();
+  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<>();
 
   private int lastBlock;
 
@@ -71,7 +71,7 @@ public class FastSetFactory<E> {
   }
 
   public FastSet<E> spawnEmptySet() {
-    return new FastSet<E>(this);
+    return new FastSet<>(this);
   }
 
   public int getLastBlock() {
@@ -103,7 +103,7 @@ public class FastSetFactory<E> {
 
     public FastSet<E> getCopy() {
 
-      FastSet<E> copy = new FastSet<E>(factory);
+      FastSet<E> copy = new FastSet<>(factory);
 
       int arrlength = data.length;
       int[] cpdata = new int[arrlength];
@@ -363,11 +363,11 @@ public class FastSetFactory<E> {
     }
 
     public Iterator<E> iterator() {
-      return new FastSetIterator<E>(this);
+      return new FastSetIterator<>(this);
     }
 
     public Set<E> toPlainSet() {
-      HashSet<E> set = new HashSet<E>();
+      HashSet<E> set = new HashSet<>();
 
       int[] intdata = data;
 
diff --git a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
index a4ad9ac..563a404 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
@@ -22,7 +22,7 @@ import java.util.Set;
 
 public class FastSparseSetFactory<E> {
 
-  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<int[], E>();
+  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<>();
 
   private int lastBlock;
 
@@ -71,7 +71,7 @@ public class FastSparseSetFactory<E> {
   }
 
   public FastSparseSet<E> spawnEmptySet() {
-    return new FastSparseSet<E>(this);
+    return new FastSparseSet<>(this);
   }
 
   public int getLastBlock() {
@@ -123,7 +123,7 @@ public class FastSparseSetFactory<E> {
       System.arraycopy(data, 0, cpdata, 0, arrlength);
       System.arraycopy(next, 0, cpnext, 0, arrlength);
 
-      return new FastSparseSet<E>(factory, cpdata, cpnext);
+      return new FastSparseSet<>(factory, cpdata, cpnext);
     }
 
     private int[] ensureCapacity(int index) {
@@ -410,11 +410,11 @@ public class FastSparseSetFactory<E> {
     }
 
     public Iterator<E> iterator() {
-      return new FastSparseSetIterator<E>(this);
+      return new FastSparseSetIterator<>(this);
     }
 
     public Set<E> toPlainSet() {
-      HashSet<E> set = new HashSet<E>();
+      HashSet<E> set = new HashSet<>();
 
       int[] intdata = data;
 
diff --git a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
index 5576aa1..a70f0b3 100644
--- a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
@@ -88,7 +88,7 @@ public class InterpreterUtil {
       return false;
     }
 
-    HashSet<Object> set = new HashSet<Object>(c1);
+    HashSet<Object> set = new HashSet<>(c1);
     set.removeAll(c2);
     return (set.size() == 0);
   }
diff --git a/src/org/jetbrains/java/decompiler/util/ListStack.java b/src/org/jetbrains/java/decompiler/util/ListStack.java
index 19c2416..b4aa978 100644
--- a/src/org/jetbrains/java/decompiler/util/ListStack.java
+++ b/src/org/jetbrains/java/decompiler/util/ListStack.java
@@ -30,7 +30,7 @@ public class ListStack<T> extends ArrayList<T> {
   }
 
   public ListStack<T> clone() {
-    ListStack<T> newstack = new ListStack<T>(this);
+    ListStack<T> newstack = new ListStack<>(this);
     newstack.pointer = this.pointer;
     return newstack;
   }
diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
index fd9d5c4..0537e4e 100644
--- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
+++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
@@ -353,7 +353,7 @@ public class SFormsFastMapDirect {
   }
 
   public List<Entry<Integer, FastSparseSet<Integer>>> entryList() {
-    List<Entry<Integer, FastSparseSet<Integer>>> list = new ArrayList<Entry<Integer, FastSparseSet<Integer>>>();
+    List<Entry<Integer, FastSparseSet<Integer>>> list = new ArrayList<>();
 
     for (int i = 2; i >= 0; i--) {
       int ikey = 0;
diff --git a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
index cdc1762..000581d 100644
--- a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
+++ b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
@@ -22,9 +22,9 @@ import java.util.HashMap;
 
 public class VBStyleCollection<E, K> extends ArrayList<E> {
 
-  private HashMap<K, Integer> map = new HashMap<K, Integer>();
+  private HashMap<K, Integer> map = new HashMap<>();
 
-  private ArrayList<K> lstKeys = new ArrayList<K>();
+  private ArrayList<K> lstKeys = new ArrayList<>();
 
   public VBStyleCollection() {
     super();
@@ -32,8 +32,8 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
 
   public VBStyleCollection(int initialCapacity) {
     super(initialCapacity);
-    lstKeys = new ArrayList<K>(initialCapacity);
-    map = new HashMap<K, Integer>(initialCapacity);
+    lstKeys = new ArrayList<>(initialCapacity);
+    map = new HashMap<>(initialCapacity);
   }
 
   public VBStyleCollection(Collection<E> c) {
@@ -150,10 +150,10 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
   }
 
   public VBStyleCollection<E, K> clone() {
-    VBStyleCollection<E, K> c = new VBStyleCollection<E, K>();
-    c.addAll(new ArrayList<E>(this));
-    c.setMap(new HashMap<K, Integer>(map));
-    c.setLstKeys(new ArrayList<K>(lstKeys));
+    VBStyleCollection<E, K> c = new VBStyleCollection<>();
+    c.addAll(new ArrayList<>(this));
+    c.setMap(new HashMap<>(map));
+    c.setLstKeys(new ArrayList<>(lstKeys));
     return c;
   }
 
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index 1621142..df27781 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -52,7 +52,7 @@ public class DecompilerTestFixture {
     targetDir = new File(tempDir, "decompiled");
     assertThat(targetDir.mkdirs()).isTrue();
 
-    Map<String, Object> options = new HashMap<String, Object>();
+    Map<String, Object> options = new HashMap<>();
     options.put(IFernflowerPreferences.LOG_LEVEL, "warn");
     options.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
     options.put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index f715f4f..d571281 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -118,7 +118,7 @@ public class SingleClassesTest {
   }
 
   private static List<File> collectClasses(File classFile) {
-    List<File> files = new ArrayList<File>();
+    List<File> files = new ArrayList<>();
     files.add(classFile);
 
     File parent = classFile.getParentFile();

From bc728c9daf2ed8f357a09bc791ffcc5d4edf3aa8 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Fri, 9 Sep 2016 12:47:19 +0700
Subject: [PATCH 070/252] Stream.sum() used (via StreamApiMigrationInspection);
 cleanup

---
 .../modules/decompiler/EliminateLoopsHelper.java          | 7 ++-----
 .../deobfuscator/IrreducibleCFGDeobfuscator.java          | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
index 3bad6c6..bf94124 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,10 +135,7 @@ public class EliminateLoopsHelper {
           statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
         }
 
-        int postcount = 0;
-        for (Boolean val : statLabeled.values()) {
-          postcount += val ? 1 : 0;
-        }
+        int postcount = statLabeled.values().stream().mapToInt(val -> val ? 1 : 0).sum();
 
         if (precount <= postcount) {
           return false;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
index 12840f2..9ab65e0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -172,15 +172,13 @@ public class IrreducibleCFGDeobfuscator {
 
   private static int getStatementSize(Statement statement) {
 
-    int res = 0;
+    int res;
 
     if (statement.type == Statement.TYPE_BASICBLOCK) {
       res = ((BasicBlockStatement)statement).getBlock().getSeq().length();
     }
     else {
-      for (Statement stat : statement.getStats()) {
-        res += getStatementSize(stat);
-      }
+      res = statement.getStats().stream().mapToInt(IrreducibleCFGDeobfuscator::getStatementSize).sum();
     }
 
     return res;

From 0912e3788ce0a47a0d743f8fe95da3a7a2b87984 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Fri, 9 Sep 2016 14:51:12 +0700
Subject: [PATCH 071/252] IDEA-CR-13652 filter(Boolean::booleanValue).count()
 used

---
 .../decompiler/modules/decompiler/EliminateLoopsHelper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
index bf94124..0b145a6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
@@ -135,7 +135,7 @@ public class EliminateLoopsHelper {
           statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
         }
 
-        int postcount = statLabeled.values().stream().mapToInt(val -> val ? 1 : 0).sum();
+        long postcount = statLabeled.values().stream().filter(Boolean::booleanValue).count();
 
         if (precount <= postcount) {
           return false;

From 77d6c2906f29492a568eedf5e553767d65350ccc Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 13 Sep 2016 17:04:15 +0300
Subject: [PATCH 072/252] project configuration: use 'test' scope for assertj
 library used in tests only

---
 java-decompiler-engine.iml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-decompiler-engine.iml b/java-decompiler-engine.iml
index dc3ddfe..8daf525 100644
--- a/java-decompiler-engine.iml
+++ b/java-decompiler-engine.iml
@@ -9,6 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" name="assertJ" level="project" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
   </component>
 </module>
\ No newline at end of file

From ee83b25d1de324cd84c8fc750cb24a907e6f37c9 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 14 Oct 2016 14:40:00 +0300
Subject: [PATCH 073/252] IDEA-162579 "Unrecognized invocation of <init>" when
 decompiling kotlin bytecode

---
 .../decompiler/exps/InvocationExprent.java    |   7 +-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestKotlinConstructorKt.class | Bin 0 -> 2124 bytes
 testData/results/TestKotlinConstructorKt.dec  |  75 ++++++++++++++++++
 testData/src/pkg/TestKotlinConstructor.kt     |   8 ++
 5 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 testData/classes/pkg/TestKotlinConstructorKt.class
 create mode 100644 testData/results/TestKotlinConstructorKt.dec
 create mode 100644 testData/src/pkg/TestKotlinConstructor.kt

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 94c1b5d..5b2ffbd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -306,7 +306,12 @@ public class InvocationExprent extends Exprent {
           buf.append("this(");
         }
         else {
-          throw new RuntimeException("Unrecognized invocation of " + CodeConstants.INIT_NAME);
+          if (instance != null) {
+            buf.append(instance.toJava(indent, tracer)).append(".<init>(");
+          }
+          else {
+            throw new RuntimeException("Unrecognized invocation of " + CodeConstants.INIT_NAME);
+          }
         }
     }
 
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index d571281..48e8b7d 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -89,6 +89,7 @@ public class SingleClassesTest {
   @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
   @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
   @Test public void testIllegalVarName() { doTest("pkg/TestIllegalVarName"); }
+  @Test public void testKotlinConstructor() { doTest("pkg/TestKotlinConstructorKt"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestKotlinConstructorKt.class b/testData/classes/pkg/TestKotlinConstructorKt.class
new file mode 100644
index 0000000000000000000000000000000000000000..28766ddcedf80efbaa7dfb3654228025fa6a41a2
GIT binary patch
literal 2124
zcmbVNT~`}b6x}xoOqc`;lv09NV~H5T=cJ--f*|tIMgr6ZQA!nuWS~>R3~Oe>qCWL+
z_zU#WH;OEk<%?_iqr`nD2}zN@xYlHH?m6e4v+q9V-1+;TUw;RX#`glZ*A3TOw!N}x
z&D)miIhCSkJIkH|A<+3kKhh`4y0tg4w)4U$QX3Qq?%K9MGMV?S70)bB%-iKM&8BT-
zhnv)S)Ah0f-Hk9g&v5jevY|i`xY-CW=Q#RH>8_wnAinPdnkZg|b(>PS5?zGQ8|H%f
zgR$l;7`u9<><RSMu=&XADYLoZTomo-P!Yuqf!1l$GQAmrP%<~X5k(ieRj9Zr(9^)x
zIGBQ40%23)CqV+e$>x*#NvO|8aT|RRgb}Ns+b5`QSMZL2@?3XUjbj20CWoI!@h<K}
zFo5?6#q!lX_1I0+GxGbmEByxFC``d~OlwcU2aLO-A0GOP56MA|!}XVk#=P!&i^oOd
zP*zC6ut3_Xl*{p=ZdtY$-!Uk;Ufi?emTissCXd@{Wf-rf2xCOxRx`6zeYQ&8n2Hp}
zRU|RabLpkh73XRLW#xG_q$B9XJ%Nq})79cnu`Zr1Wr3mQT$fdBX5H_vC_ce`S<?ps
z0h9Z>s~zZbSA!^^Cd`DM&=Lpwp@7Iy!BQS1%p*Q;Zm9tkxRG#-qG28xPTj4iDe@&C
zfvyr~$h36HZr!!FX$%@o#9@#?b|s8;4pFo@1>37`V<(h-4!ZKSGOie&UeZ0C5dsHC
zL5?ryGqB@J;EDF7DnM096PP`J)vKPrQUjfFHP9ERig&o|px8gq$yc~L)E$@%Op0{0
zGgw=-Ooko>{`|SMRfb6mra)W1)>F)@9N48w*<k#>YcGxQeUcxVw@Zd3)Gq4f4c#&2
zw6Dt-3C)|9v06FUF`SyFz2ND^eWs|b+Y06$d8|0}et7)_Gu>2!T6JgsbLmW9!k&?o
z7wn2tG?q*WqNlo8Fm@_?i^rZ}xvZK%>`BG)%mZV?bWMVtlY`+G)MdK{5F)#hkAAeE
zmFus$IHVM%)=ixwoX5z@8Pv^@PW3f9PtbFY-c^jAqF*2riiJ)Q7x)pgQc6(OG8St&
z$55s<qn;tT8Ef7A3+-n}ZFY~IVB!y&PB58?#MD^i6dy6+PZz(9o#SJsdX3C4OdG^E
zd_O}QW(g~cX~L1xr<j3)DNJ(p8R7P04RiRMprtgA1@4s6BK^YLvx_BKId_yEQr9Mr
zgh%uPHu+2OQe<oKCrJp<Pv!myGenso2!rx--m5n4PwBCV;05lYMM1BEu>VjP04@kA
zaz(2kq+p1<s7El2Sw2);py!$Z*zy59W72PZX#?M}4r7ItxyS0;T2ifk+|*PdUYC~C
zk+>Fr>xOF$%N{qS<J*l{cG>T0Z8{rYqAMS&?d|3r43f&L+MqW2Afu_8c7JLxozW&$
zEj>kP^j=2O)YM`Fs^6q)>VM*8s`Q{H<MZz_IJQY$j`hy5H@?_HFo)&pgM59plEVsC
db8M2wTM#b3#FH&3E?Qg^T&%M@e1Y;;{{k&#7AgP$

literal 0
HcmV?d00001

diff --git a/testData/results/TestKotlinConstructorKt.dec b/testData/results/TestKotlinConstructorKt.dec
new file mode 100644
index 0000000..f032804
--- /dev/null
+++ b/testData/results/TestKotlinConstructorKt.dec
@@ -0,0 +1,75 @@
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import kotlin.Metadata;
+import kotlin.TypeCastException;
+import kotlin.collections.CollectionsKt;
+
+@Metadata(
+   mv = {1, 1, 1},
+   bv = {1, 0, 0},
+   k = 2,
+   d1 = {"\u0000\u0016\n\u0000\n\u0002\u0010 \n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u001e\n\u0002\u0010\u000e\n\u0000\u001a\u001c\u0010\u0000\u001a\b\u0012\u0004\u0012\u00020\u00020\u00012\f\u0010\u0003\u001a\b\u0012\u0004\u0012\u00020\u00050\u0004H\u0002¨\u0006\u0006"},
+   d2 = {"foo", "", "LMapping;", "list", "", "", "module1"}
+)
+public final class TestKotlinConstructorKt {
+   private static final List<Mapping> foo(Collection<String> list) {
+      Iterable $receiver$iv = (Iterable)list;// 2
+      Collection destination$iv$iv = (Collection)(new ArrayList(CollectionsKt.collectionSizeOrDefault($receiver$iv, 10)));// 10
+      Iterator var4 = $receiver$iv.iterator();// 11
+
+      while(var4.hasNext()) {
+         Object item$iv$iv = var4.next();
+         String it = (String)item$iv$iv;// 12
+         Mapping var10000 = new Mapping;
+         if(it == null) {// 3
+            throw new TypeCastException("null cannot be cast to non-null type kotlin.String");
+         }
+
+         var10000.<init>((String)it);
+         Mapping var11 = var10000;
+         destination$iv$iv.add(var11);
+      }
+
+      return CollectionsKt.toList((Iterable)((List)destination$iv$iv));// 4 13
+   }
+}
+
+class 'TestKotlinConstructorKt' {
+   method 'foo (Ljava/util/Collection;)Ljava/util/List;' {
+      1      17
+      4      17
+      d      18
+      f      18
+      15      18
+      18      18
+      1b      19
+      20      19
+      24      21
+      2e      22
+      33      22
+      38      23
+      3b      23
+      46      25
+      4d      26
+      52      26
+      53      29
+      56      29
+      59      30
+      5f      31
+      69      34
+      6c      34
+      6f      34
+      72      34
+   }
+}
+
+Lines mapping:
+2 <-> 18
+3 <-> 26
+4 <-> 35
+10 <-> 19
+11 <-> 20
+12 <-> 24
+13 <-> 35
diff --git a/testData/src/pkg/TestKotlinConstructor.kt b/testData/src/pkg/TestKotlinConstructor.kt
new file mode 100644
index 0000000..cb9a363
--- /dev/null
+++ b/testData/src/pkg/TestKotlinConstructor.kt
@@ -0,0 +1,8 @@
+private fun foo(list: Collection<String>): List<Mapping> {
+    return list.map {
+        Mapping(it as String)
+    }.toList()
+}
+
+class Mapping(c: String) {
+}

From 7bdec4ffc724ef6730143be200df32ec189ba8a5 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 14 Oct 2016 18:29:00 +0300
Subject: [PATCH 074/252] decompiler: a test for the pull request #394

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestAsserts.class        | Bin 0 -> 557 bytes
 testData/results/TestAsserts.dec              |  34 ++++++++++++++++++
 testData/src/pkg/TestAsserts.java             |  26 ++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 testData/classes/pkg/TestAsserts.class
 create mode 100644 testData/results/TestAsserts.dec
 create mode 100644 testData/src/pkg/TestAsserts.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 48e8b7d..ac0e891 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -90,6 +90,7 @@ public class SingleClassesTest {
   @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
   @Test public void testIllegalVarName() { doTest("pkg/TestIllegalVarName"); }
   @Test public void testKotlinConstructor() { doTest("pkg/TestKotlinConstructorKt"); }
+  @Test public void testAsserts() { doTest("pkg/TestAsserts"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestAsserts.class b/testData/classes/pkg/TestAsserts.class
new file mode 100644
index 0000000000000000000000000000000000000000..1c42d7ea7b76a8ad9cbc3fd852ddafcd8f0572ff
GIT binary patch
literal 557
zcmYjOO-sW-5Ph3$n;4_5t*JFyLGYl0=Hg8e#SaktI4FX>rR^%QH7QBzkMSl7Uc9KF
zprChulZdn1YQ4<PzIpTJ&F<&->pOrYOj$56I)Dru10@SOMh%QvC}Z4!%TS#0lSIU6
z5QWKRkodKhXfUuULv|$ygLIWapPf5q;2TjxFywZFQ0#XuY9c<8WGbIVks|Fd3>~I^
zy}9SNdo^>V-s-7Xhfyc4i|s)6<c~y>uB*Yx;<<n6+psWb!^8kXSpr_m56`?Vg}iOW
zaTL?^cJs{p*K1(H#w04F*l#+hor`)(<UX{~qAeLp4Uq(~X#B~N-LyjmTCs|0dL)A$
zjpfVI2xU5$^hMF8TZK+WXJ-Bd>_HMSL@}$tA~g&nN4cc>&=l(N<ws~&$h-UogKyAJ
zUcf&T<hcA6rfXjJaehy&ni4I5Q|{2ML~#rY^kI2IOz2;5Sk9nq<j>iX8U~CMGSA3f
c!Qgk``V%zivMc!OQi^1t*=ur_f+`n(05yVU4FCWD

literal 0
HcmV?d00001

diff --git a/testData/results/TestAsserts.dec b/testData/results/TestAsserts.dec
new file mode 100644
index 0000000..f260d9e
--- /dev/null
+++ b/testData/results/TestAsserts.dec
@@ -0,0 +1,34 @@
+package pkg;
+
+public class TestAsserts {
+   public static int foo() {
+      byte var0 = 1;// 21
+
+      assert var0 > 1;// 22
+
+      assert var0 > 1 && var0 < 5;// 23
+
+      return 1;// 24
+   }
+}
+
+class 'pkg/TestAsserts' {
+   method 'foo ()I' {
+      0      4
+      1      4
+      9      6
+      a      6
+      1c      8
+      1d      8
+      21      8
+      22      8
+      2d      10
+      2e      10
+   }
+}
+
+Lines mapping:
+21 <-> 5
+22 <-> 7
+23 <-> 9
+24 <-> 11
diff --git a/testData/src/pkg/TestAsserts.java b/testData/src/pkg/TestAsserts.java
new file mode 100644
index 0000000..29c7480
--- /dev/null
+++ b/testData/src/pkg/TestAsserts.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+
+public class TestAsserts {
+  public static int foo() {
+    int i=1;
+    assert i > 1;
+    assert i> 1 && i < 5;
+    return 1;
+  }
+}

From a7654eb8c9c1c7541218242c898c8ebd39d4aa6d Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 9 Dec 2016 12:39:18 +0100
Subject: [PATCH 075/252] assertj-core-3.6.1

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 04cbf1a..0b00f6c 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,7 @@
   <path id="junit">
     <file name="${basedir}/../../../lib/junit-4.12.jar"/>
     <file name="${basedir}/../../../lib/hamcrest-core-1.3.jar"/>
-    <file name="${basedir}/../../../lib/dev/assertj-core-3.4.1.jar"/>
+    <file name="${basedir}/../../../lib/dev/assertj-core-3.6.1.jar"/>
   </path>
 
   <target name="clean" depends="init">

From fe5260df8a577524d29aeddb53dd7879d053e1e2 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 9 Jan 2017 17:53:02 +0300
Subject: [PATCH 076/252] IDEA-166101 Imports Added for Classes in Same Package

---
 .../main/collectors/ImportCollector.java      | 37 +++++++------------
 testData/results/InvalidMethodSignature.dec   | 35 +++++++++---------
 2 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index cb13140..3bc5383 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.struct.StructContext;
 
 import java.util.*;
-import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 public class ImportCollector {
   private static final String JAVA_LANG_PACKAGE = "java.lang";
@@ -124,26 +124,17 @@ public class ImportCollector {
   }
 
   private List<String> packImports() {
-    List<Entry<String, String>> lst = new ArrayList<>(mapSimpleNames.entrySet());
-
-    Collections.sort(lst, (par0, par1) -> {
-      int res = par0.getValue().compareTo(par1.getValue());
-      if (res == 0) {
-        res = par0.getKey().compareTo(par1.getKey());
-      }
-      return res;
-    });
-
-    List<String> res = new ArrayList<>();
-    for (Entry<String, String> ent : lst) {
-      // exclude a current class or one of the nested ones, java.lang and empty packages
-      if (!setNotImportedNames.contains(ent.getKey()) &&
-          !JAVA_LANG_PACKAGE.equals(ent.getValue()) &&
-          !ent.getValue().isEmpty()) {
-        res.add(ent.getValue() + "." + ent.getKey());
-      }
-    }
-
-    return res;
+    return mapSimpleNames.entrySet().stream()
+      .filter(ent ->
+                // exclude the current class or one of the nested ones
+                // empty, java.lang and the current packages
+                !setNotImportedNames.contains(ent.getKey()) &&
+                !ent.getValue().isEmpty() &&
+                !JAVA_LANG_PACKAGE.equals(ent.getValue()) &&
+                !ent.getValue().equals(currentPackagePoint)
+      )
+      .sorted(Map.Entry.<String, String>comparingByValue().thenComparing(Map.Entry.comparingByKey()))
+      .map(ent -> ent.getValue() + "." + ent.getKey())
+      .collect(Collectors.toList());
   }
 }
\ No newline at end of file
diff --git a/testData/results/InvalidMethodSignature.dec b/testData/results/InvalidMethodSignature.dec
index 7b4f8c5..e2a15b3 100644
--- a/testData/results/InvalidMethodSignature.dec
+++ b/testData/results/InvalidMethodSignature.dec
@@ -4,7 +4,6 @@ import a.a.a.a.a.k;
 import a.a.a.a.c.c;
 import a.a.a.a.c.j;
 import a.a.a.a.e.bg;
-import a.a.a.a.e.f.b;
 import java.io.File;
 
 class i implements bg {
@@ -27,30 +26,30 @@ class i implements bg {
 
 class 'a/a/a/a/e/f/i' {
    method '<init> (La/a/a/a/e/f/b;La/a/a/a/c/j;)V' {
-      2      14
-      7      15
-      e      16
+      2      13
+      7      14
+      e      15
    }
 
    method 'a (La/a/a/a/c/c;La/a/a/a/a/k;Z)V' {
-      1      19
-      4      19
-      a      19
-      f      19
-      12      20
-      15      20
-      1a      20
-      20      21
+      1      18
+      4      18
+      a      18
+      f      18
+      12      19
+      15      19
+      1a      19
+      20      20
    }
 
    method 'a (La/a/a/a/c/b;)V' {
-      0      24
+      0      23
    }
 }
 
 Lines mapping:
-0 <-> 25
-1 <-> 15
-2 <-> 20
-3 <-> 21
-4 <-> 22
+0 <-> 24
+1 <-> 14
+2 <-> 19
+3 <-> 20
+4 <-> 21

From 32693c314a77222b46bec900059257af741e8159 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 10 Jan 2017 12:03:26 +0300
Subject: [PATCH 077/252] IDEA-149813 Decompiler has lost generic parameter

---
 .../java/decompiler/main/ClassWriter.java     |  23 ++++----
 .../modules/decompiler/exps/NewExprent.java   |  23 +++++++-
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 .../pkg/TestAnonymousSignature$1.class        | Bin 0 -> 485 bytes
 .../pkg/TestAnonymousSignature$2.class        | Bin 0 -> 680 bytes
 .../classes/pkg/TestAnonymousSignature.class  | Bin 0 -> 575 bytes
 testData/results/TestAnonymousSignature.dec   |  50 ++++++++++++++++++
 testData/src/pkg/TestAnonymousSignature.java  |  40 ++++++++++++++
 8 files changed, 126 insertions(+), 13 deletions(-)
 create mode 100644 testData/classes/pkg/TestAnonymousSignature$1.class
 create mode 100644 testData/classes/pkg/TestAnonymousSignature$2.class
 create mode 100644 testData/classes/pkg/TestAnonymousSignature.class
 create mode 100644 testData/results/TestAnonymousSignature.dec
 create mode 100644 testData/src/pkg/TestAnonymousSignature.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 2386798..d80090d 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -331,16 +331,9 @@ public class ClassWriter {
       buffer.append("class ");
     }
 
-    GenericClassDescriptor descriptor = null;
-    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)cl.getAttributes().getWithKey("Signature");
-      if (attr != null) {
-        descriptor = GenericMain.parseClassSignature(attr.getSignature());
-      }
-    }
-
     buffer.append(node.simpleName);
 
+    GenericClassDescriptor descriptor = getGenericClassDescriptor(cl);
     if (descriptor != null && !descriptor.fparameters.isEmpty()) {
       appendTypeParameters(buffer, descriptor.fparameters, descriptor.fbounds);
     }
@@ -1051,7 +1044,17 @@ public class ClassWriter {
     }
   }
 
-  private static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<List<GenericType>> bounds) {
+  public static GenericClassDescriptor getGenericClassDescriptor(StructClass cl) {
+    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)cl.getAttributes().getWithKey("Signature");
+      if (attr != null) {
+        return GenericMain.parseClassSignature(attr.getSignature());
+      }
+    }
+    return null;
+  }
+
+  public static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<List<GenericType>> bounds) {
     buffer.append('<');
 
     for (int i = 0; i < parameters.size(); i++) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index b6a67d2..f72e764 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,15 @@ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
 
@@ -181,7 +184,23 @@ public class NewExprent extends Exprent {
             typename = typename.substring(typename.lastIndexOf('.') + 1);
           }
         }
-        buf.append(typename);
+
+        GenericClassDescriptor descriptor = ClassWriter.getGenericClassDescriptor(child.classStruct);
+        if (descriptor != null) {
+          if (descriptor.superinterfaces.isEmpty()) {
+            buf.append(GenericMain.getGenericCastTypeName(descriptor.superclass));
+          }
+          else {
+            if (descriptor.superinterfaces.size() > 1) {
+              DecompilerContext.getLogger().writeMessage("Inconsistent anonymous class signature: " + child.classStruct.qualifiedName,
+                                                         IFernflowerLogger.Severity.WARN);
+            }
+            buf.append(GenericMain.getGenericCastTypeName(descriptor.superinterfaces.get(0)));
+          }
+        }
+        else {
+          buf.append(typename);
+        }
       }
 
       buf.append('(');
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index ac0e891..e7ede30 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ public class SingleClassesTest {
   @Test public void testInnerLocal() { doTest("pkg/TestInnerLocal"); }
   @Test public void testInnerLocalPkg() { doTest("pkg/TestInnerLocalPkg"); }
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
+  @Test public void testAnonymousSignature() { doTest("pkg/TestAnonymousSignature"); }
   @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
   @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
   @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
diff --git a/testData/classes/pkg/TestAnonymousSignature$1.class b/testData/classes/pkg/TestAnonymousSignature$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..e60ba5d7aa0a4025a3d899131b7d7ffe2f73f855
GIT binary patch
literal 485
zcmZ`#u}%U(6r2aA2Y8B#q9Aq_VBu+E2O%Lu6B4w6&{!?7IaiN8b9-lk-(+KDV&Mn)
zQO38LSRih)GcU96P3G;#=i57gb5sj(ux+8_V#h_9u-Z~uC2c~s-WU;_ZZwsIVqa-_
zozBKG9*S|uieuCh6L<9p`GE?wNYa><M*mJc3O`L$=y&2+%=^kDtsgNII`9WctaQ+9
zHwlG7l*SWzsjTC{P@1HpBR!u*srhw0v38u`LQlfT@Z^<DZlkG-JrDb+cv!)zhdc^|
z+QWU|FLyaQBX~WnW!w#gG13r9OL7vb|9kM#Godu0T)+9dPh*5rWce%Y$?)Y|Ah=u|
zGLuz~UqLTi5OR$68K^LFdd9`p%=1EPjosH+%fQ3>H*cWG>|hgH*yYOFWSN277Z0Lo
ALI3~&

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousSignature$2.class b/testData/classes/pkg/TestAnonymousSignature$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..6865a4933a279f16db5d2c259325611cfcba40e6
GIT binary patch
literal 680
zcmZ`$O-n*S6g`t4PwkmjX5~jA7^y`@v{M9;0>NsbxM?*$2YdFMC+{QZKecI7&>~v*
zqoVsv!jD?aJ$EkWp1Ei4=hxdifOG6e5Wtp#WCVU}E7(zxQjlf{R&}X6H3nay*k$lH
z%)VfVwR9=2-BC|i9o{pjqG;x5%q_|e3#}o4;AMl$LAmW%x*SxNE5+sl^QJcxnlsCs
zRy=07tq&x3Tu;9`BR1FMI=WGAOvd1jY0dJcW7H}Pk+$htnz+=xsnZ={J9TNw$C2sU
zzmJ@F2FT@w)C|)m16RViGy4iMDzey9p&-N%U$m)W6)Hn!d_O4vEu24NP@7T;t6^~4
z7WSOVj~j->M0mjtL+XEBTFi*+k|9~Ro%x=r?P3?FwAKJ<owRKq9Wp?-FlAXnMi?l)
zf<040UqmrDDds4WCyE|5Md&rJ_?{Mc`FNdp(JAkMSROB0I{LuMF`XAIwd81`HBSsN
W#3#6p4MIOQk-#ox5t8#00-<jX^_^`1

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousSignature.class b/testData/classes/pkg/TestAnonymousSignature.class
new file mode 100644
index 0000000000000000000000000000000000000000..7fc0a4555d17742aa4a1c693e84e9bbd29740bc9
GIT binary patch
literal 575
zcmaJ;T}uK%6g}g|Zf={Jo0ead5oA5I6ulWi2tgnfC_(hJ+OVwc&dPoS{;YaPDCh_D
zqoO<dU_vzybMCow?wvVzKEK{R0Gwb)Lk30$YbdHHX-LA*u#OECWeo}p6%`d#2K`b9
z9<*I640*_)oI1jZ&KQ!-{ac1q+kfB;xsD_FRqXY7(6jn3Wm2By2!>MgzB9C*EYr1w
zZFZx;5q3)!YF$4L2K>U2;%bkF(Yf%&*z@DC>)67I;(#B@N*&A4Rn&CUvB^*yJ=*5)
z^4%j9TROJU_+NI+Q2DzHLw^3?>;8}rqJ>m<97fzD|9(sd#hE+DH*d&VL<YI#wHS<P
zkHs{DI+7xn=2C3_7|ZMy8Ved&qF<3K0Va*pzCx@{$OzL16R>9r7_zi0(`1QCa>!FG
zr7ikNDXqRB@s8x(1gTe~r$iy55}7y1k{BpcVFMNH(XFe*6DU9<EKsBnf?g$cgx^AB
BfL;Iq

literal 0
HcmV?d00001

diff --git a/testData/results/TestAnonymousSignature.dec b/testData/results/TestAnonymousSignature.dec
new file mode 100644
index 0000000..95ad203
--- /dev/null
+++ b/testData/results/TestAnonymousSignature.dec
@@ -0,0 +1,50 @@
+package pkg;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+
+public class TestAnonymousSignature {
+   public static void main(String[] var0) {
+      System.out.println(new ArrayList<String>() {// 25
+         public int size() {
+            return super.size();// 28
+         }
+      });
+      System.out.println(new Comparator<String>() {// 33
+         public int compare(String var1, String var2) {
+            return 0;// 36
+         }
+      });
+   }// 39
+}
+
+class 'pkg/TestAnonymousSignature$1' {
+   method 'size ()I' {
+      1      9
+      4      9
+   }
+}
+
+class 'pkg/TestAnonymousSignature$2' {
+   method 'compare (Ljava/lang/String;Ljava/lang/String;)I' {
+      0      14
+      1      14
+   }
+}
+
+class 'pkg/TestAnonymousSignature' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      7
+      a      7
+      d      12
+      17      12
+      1a      17
+   }
+}
+
+Lines mapping:
+25 <-> 8
+28 <-> 10
+33 <-> 13
+36 <-> 15
+39 <-> 18
diff --git a/testData/src/pkg/TestAnonymousSignature.java b/testData/src/pkg/TestAnonymousSignature.java
new file mode 100644
index 0000000..7837c75
--- /dev/null
+++ b/testData/src/pkg/TestAnonymousSignature.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package pkg;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+
+public class TestAnonymousSignature {
+  public static void main(String[] args) {
+    // anonymous from class
+    System.out.println(new ArrayList<String>() {
+      @Override
+      public int size() {
+        return super.size();
+      }
+    });
+
+    // anonymous from class
+    System.out.println(new Comparator<String>() {
+      @Override
+      public int compare(String o1, String o2) {
+        return 0;
+      }
+    });
+  }
+}
\ No newline at end of file

From 1d331ddd6ddb8fd6638b69237e10a7927b4e5be2 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 10 Jan 2017 14:30:58 +0300
Subject: [PATCH 078/252] cleanup - use Comparator

---
 .../java/decompiler/modules/decompiler/DomHelper.java         | 4 ++--
 .../java/decompiler/modules/decompiler/vars/VarProcessor.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
index ea8e537..144db3b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -191,7 +191,7 @@ public class DomHelper {
         lstPosts.add(stt.id);
       }
 
-      Collections.sort(lstPosts, (o1, o2) -> mapSortOrder.get(o1).compareTo(mapSortOrder.get(o2)));
+      Collections.sort(lstPosts, Comparator.comparing(mapSortOrder::get));
 
       if (lstPosts.size() > 1 && lstPosts.get(0).intValue() == st.id) {
         lstPosts.add(lstPosts.remove(0));
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 5483f78..b15fed5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ public class VarProcessor {
     Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
 
     List<VarVersionPair> listVars = new ArrayList<>(mapVarNames.keySet());
-    Collections.sort(listVars, (o1, o2) -> o1.var - o2.var);
+    Collections.sort(listVars, Comparator.comparingInt(o -> o.var));
 
     Map<String, Integer> mapNames = new HashMap<>();
 

From cb133af01e456e4795c9efa5ee0327d5f21f29b0 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 10 Jan 2017 17:09:09 +0300
Subject: [PATCH 079/252] IDEA-166363 Support LocalVariableTypeTable attribute

---
 .../modules/decompiler/exps/VarExprent.java   |  33 ++++++++-
 .../modules/decompiler/vars/VarProcessor.java |   8 +++
 .../java/decompiler/struct/StructMember.java  |   8 ++-
 .../struct/attr/StructGeneralAttribute.java   |   6 +-
 ...StructLocalVariableTypeTableAttribute.java |  65 ++++++++++++++++++
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestLocalsSignature.class     | Bin 0 -> 647 bytes
 testData/results/TestLocalsSignature.dec      |  25 +++++++
 testData/src/pkg/TestLocalsSignature.java     |  27 ++++++++
 9 files changed, 168 insertions(+), 5 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
 create mode 100644 testData/classes/pkg/TestLocalsSignature.class
 create mode 100644 testData/results/TestLocalsSignature.dec
 create mode 100644 testData/src/pkg/TestLocalsSignature.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index fdd8bb9..a4e25c9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,19 @@ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
@@ -101,7 +106,29 @@ public class VarExprent extends Exprent {
         if (processor != null && processor.getVarFinal(new VarVersionPair(index, version)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
           buffer.append("final ");
         }
-        buffer.append(ExprProcessor.getCastTypeName(getVarType())).append(" ");
+        boolean generic = false;
+        if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+          MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+          StructLocalVariableTypeTableAttribute attr = (StructLocalVariableTypeTableAttribute)method.methodStruct.getAttributes()
+            .getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+          if (attr != null && processor != null) {
+            Integer index = processor.getVarOriginalIndex(new VarVersionPair(this.index, version));
+            if (index != null) {
+              String signature = attr.getMapVarSignatures().get(index);
+              if (signature != null) {
+                GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(signature);
+                if (descriptor != null) {
+                  buffer.append(GenericMain.getGenericCastTypeName(descriptor.type));
+                  generic = true;
+                }
+              }
+            }
+          }
+        }
+        if (!generic) {
+          buffer.append(ExprProcessor.getCastTypeName(getVarType()));
+        }
+        buffer.append(" ");
       }
       buffer.append(name == null ? ("var" + index + (version == 0 ? "" : "_" + version)) : name);
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index b15fed5..fa79849 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -83,6 +83,14 @@ public class VarProcessor {
     }
   }
 
+  public Integer getVarOriginalIndex(VarVersionPair pair) {
+    if (varVersions == null) {
+      return null;
+    }
+
+    return varVersions.getMapOriginalVarIndices().get(pair.var);
+  }
+
   public void refreshVarNames(VarNamesCollector vc) {
     Map<VarVersionPair, String> tempVarNames = new HashMap<>(mapVarNames);
     for (Entry<VarVersionPair, String> ent : tempVarNames.entrySet()) {
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index 3bc93a1..6f6d09e 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.struct;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
@@ -62,6 +63,11 @@ public class StructMember {
           StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(name);
           table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
         }
+        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name) && attributes.containsKey(name)) {
+          // merge all variable tables
+          StructLocalVariableTypeTableAttribute table = (StructLocalVariableTypeTableAttribute)attributes.getWithKey(name);
+          table.add((StructLocalVariableTypeTableAttribute)attribute);
+        }
         else {
           attributes.addWithKey(attribute, attribute.getName());
         }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index 73cc535..98a4bae 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ public class StructGeneralAttribute {
   public static final String ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = "RuntimeVisibleTypeAnnotations";
   public static final String ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = "RuntimeInvisibleTypeAnnotations";
   public static final String ATTRIBUTE_LOCAL_VARIABLE_TABLE = "LocalVariableTable";
+  public static final String ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE = "LocalVariableTypeTable";
   public static final String ATTRIBUTE_CONSTANT_VALUE = "ConstantValue";
   public static final String ATTRIBUTE_BOOTSTRAP_METHODS = "BootstrapMethods";
   public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
@@ -84,6 +85,9 @@ public class StructGeneralAttribute {
     else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name)) {
       attr = new StructLocalVariableTableAttribute();
     }
+    else if (ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) {
+      attr = new StructLocalVariableTypeTableAttribute();
+    }
     else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
       attr = new StructBootstrapMethodsAttribute();
     }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
new file mode 100644
index 0000000..6fb2f4b
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.java.decompiler.struct.attr;
+
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/*
+  u2 local_variable_type_table_length;
+    {   u2 start_pc;
+        u2 length;
+        u2 name_index;
+        u2 signature_index;
+        u2 index;
+    } local_variable_type_table[local_variable_type_table_length];
+*/
+public class StructLocalVariableTypeTableAttribute extends StructGeneralAttribute {
+
+  private Map<Integer, String> mapVarSignatures = Collections.emptyMap();
+
+  @Override
+  public void initContent(ConstantPool pool) throws IOException {
+    DataInputFullStream data = stream();
+
+    int len = data.readUnsignedShort();
+    if (len > 0) {
+      mapVarSignatures = new HashMap<>(len);
+      for (int i = 0; i < len; i++) {
+        data.discard(6);
+        int signatureIndex = data.readUnsignedShort();
+        int varIndex = data.readUnsignedShort();
+        mapVarSignatures.put(varIndex, pool.getPrimitiveConstant(signatureIndex).getString());
+      }
+    }
+    else {
+      mapVarSignatures = Collections.emptyMap();
+    }
+  }
+
+  public void add(StructLocalVariableTypeTableAttribute attr) {
+    mapVarSignatures.putAll(attr.getMapVarSignatures());
+  }
+
+  public Map<Integer, String> getMapVarSignatures() {
+    return mapVarSignatures;
+  }
+}
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index e7ede30..993b9c4 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -77,6 +77,7 @@ public class SingleClassesTest {
   @Test public void testInnerLocalPkg() { doTest("pkg/TestInnerLocalPkg"); }
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
   @Test public void testAnonymousSignature() { doTest("pkg/TestAnonymousSignature"); }
+  @Test public void testLocalsSignature() { doTest("pkg/TestLocalsSignature"); }
   @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
   @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
   @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
diff --git a/testData/classes/pkg/TestLocalsSignature.class b/testData/classes/pkg/TestLocalsSignature.class
new file mode 100644
index 0000000000000000000000000000000000000000..8f6b2fb7b5667f4e4b8c5e5104ea4823b0cd412b
GIT binary patch
literal 647
zcmZ{h%TB^T6o&sPmvR#jqypYA3(&-F+(Af;iK|8z5RAHUfTj*YA*C32ELTKLd;lNH
zc&5eRwTn4(Zr}OO^zHrm6~Hm}Vo*^~QH()BA%e9y*0G^tQ^giTxGHSn)))e%a+4u=
zI_Q`TDMQ%i`MBRQod$39D3UP-ZQg5gM@WAj47zt>#85DX_m<u;N3K^iste2J?$|La
z1nhHRGiaq7qst$--s85V*Ih^0R>d309g7gzKhg}0GHJhW?24Xlh>=T7?Yoxg@KewJ
zkJ{?*nKkN<)dypzZJr6aSpE;)M^b765kyIuC)*o;;y8RNHPCBKCKDCg3G85(VfCN=
zN&RB!i&occQ)_YooU?eR!;mX|5$o4h%GbmX)9;g?0wxvF86!_8%gBZfW?+wAI!<TU
z3u;KvJ>eH%2}$yzNFhxT*?dbdg>2>p%GC@3<1iC^LP)`-Bn2QzNwPqmMi#J)qDR#H
cF7h*!ix4Y|6=LSdlhgc&MmKsBiYdr{0PdoU^8f$<

literal 0
HcmV?d00001

diff --git a/testData/results/TestLocalsSignature.dec b/testData/results/TestLocalsSignature.dec
new file mode 100644
index 0000000..2948bfd
--- /dev/null
+++ b/testData/results/TestLocalsSignature.dec
@@ -0,0 +1,25 @@
+package pkg;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestLocalsSignature {
+   public static void main(String[] args) {
+      List<String> s = new ArrayList();// 24
+      s.add("xxx");// 25
+   }// 26
+}
+
+class 'pkg/TestLocalsSignature' {
+   method 'main ([Ljava/lang/String;)V' {
+      7      7
+      9      8
+      b      8
+      11      9
+   }
+}
+
+Lines mapping:
+24 <-> 8
+25 <-> 9
+26 <-> 10
diff --git a/testData/src/pkg/TestLocalsSignature.java b/testData/src/pkg/TestLocalsSignature.java
new file mode 100644
index 0000000..9a52d54
--- /dev/null
+++ b/testData/src/pkg/TestLocalsSignature.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package pkg;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestLocalsSignature {
+  public static void main(String[] args) {
+    List<String> s = new ArrayList<String>();
+    s.add("xxx");
+  }
+}
\ No newline at end of file

From 0255eb3ba5b32358b7f6dd92e6036b6857314374 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 10 Jan 2017 18:49:05 +0300
Subject: [PATCH 080/252] IDEA-149813 Decompiler has lost generic parameter -
 fixed incorrect warning for lambdas

---
 .../java/decompiler/modules/decompiler/exps/NewExprent.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index f72e764..2db188f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -191,7 +191,7 @@ public class NewExprent extends Exprent {
             buf.append(GenericMain.getGenericCastTypeName(descriptor.superclass));
           }
           else {
-            if (descriptor.superinterfaces.size() > 1) {
+            if (descriptor.superinterfaces.size() > 1 && !lambda) {
               DecompilerContext.getLogger().writeMessage("Inconsistent anonymous class signature: " + child.classStruct.qualifiedName,
                                                          IFernflowerLogger.Severity.WARN);
             }

From 6a09fe2524a2226cfec5706e8f62971b6a8f7f3f Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 11 Jan 2017 13:15:21 +0300
Subject: [PATCH 081/252] avoid stream to array copying

---
 .../java/decompiler/struct/StructMember.java          |  4 +---
 .../struct/attr/StructAnnDefaultAttribute.java        |  7 ++++---
 .../struct/attr/StructAnnotationAttribute.java        |  7 ++++---
 .../attr/StructAnnotationParameterAttribute.java      |  8 +++-----
 .../struct/attr/StructBootstrapMethodsAttribute.java  |  7 +++----
 .../struct/attr/StructConstantValueAttribute.java     |  7 ++++---
 .../struct/attr/StructEnclosingMethodAttribute.java   |  6 +++---
 .../struct/attr/StructExceptionsAttribute.java        |  7 +++----
 .../struct/attr/StructGeneralAttribute.java           | 11 +----------
 .../struct/attr/StructGenericSignatureAttribute.java  |  7 ++++---
 .../struct/attr/StructInnerClassesAttribute.java      |  8 +++-----
 .../struct/attr/StructLineNumberTableAttribute.java   |  6 ++----
 .../attr/StructLocalVariableTableAttribute.java       |  6 ++----
 .../attr/StructLocalVariableTypeTableAttribute.java   |  4 +---
 .../struct/attr/StructSourceFileAttribute.java        |  7 ++++---
 .../struct/attr/StructTypeAnnotationAttribute.java    |  7 +++----
 16 files changed, 45 insertions(+), 64 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index 6f6d09e..1b6866e 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -84,9 +84,7 @@ public class StructMember {
       in.discard(length);
     }
     else {
-      byte[] data = in.read(length);
-      attribute.setInfo(data);
-      attribute.initContent(pool);
+      attribute.initContent(in, pool);
     }
     return attribute;
   }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
index fbad47e..93a660f 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
 
@@ -25,8 +26,8 @@ public class StructAnnDefaultAttribute extends StructGeneralAttribute {
   private Exprent defaultValue;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    defaultValue = StructAnnotationAttribute.parseAnnotationElement(stream(), pool);
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    defaultValue = StructAnnotationAttribute.parseAnnotationElement(data, pool);
   }
 
   public Exprent getDefaultValue() {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
index 55c138c..500e63c 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
 import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -32,8 +33,8 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
   private List<AnnotationExprent> annotations;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    annotations = parseAnnotations(pool, stream());
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    annotations = parseAnnotations(pool, data);
   }
 
   public static List<AnnotationExprent> parseAnnotations(ConstantPool pool, DataInputStream data) throws IOException {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
index cee629c..4c2f804 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,9 +29,7 @@ public class StructAnnotationParameterAttribute extends StructGeneralAttribute {
   private List<List<AnnotationExprent>> paramAnnotations;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedByte();
     if (len > 0) {
       paramAnnotations = new ArrayList<>(len);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
index f9b5561..e3e203f 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.struct.attr;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
 import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -30,9 +31,7 @@ public class StructBootstrapMethodsAttribute extends StructGeneralAttribute {
   private final List<List<PooledConstant>> methodArguments = new ArrayList<>();
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int method_number = data.readUnsignedShort();
 
     for (int i = 0; i < method_number; ++i) {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
index 07a5073..9dc636e 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
 
@@ -24,8 +25,8 @@ public class StructConstantValueAttribute extends StructGeneralAttribute {
   private int index;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    index = stream().readUnsignedShort();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    index = data.readUnsignedShort();
   }
 
   public int getIndex() {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
index c9b9ebb..f869f96 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -28,8 +29,7 @@ public class StructEnclosingMethodAttribute extends StructGeneralAttribute {
   private String methodDescriptor;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int classIndex = data.readUnsignedShort();
     int methodIndex = data.readUnsignedShort();
 
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
index 946fa3c..0ac54c8 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,8 +28,7 @@ public class StructExceptionsAttribute extends StructGeneralAttribute {
   private List<Integer> throwsExceptions;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
       throwsExceptions = new ArrayList<>(len);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index 98a4bae..1e8894a 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -50,7 +50,6 @@ public class StructGeneralAttribute {
   public static final String ATTRIBUTE_SOURCE_FILE = "SourceFile";
 
   private String name;
-  private byte[] info;
 
   public static StructGeneralAttribute createAttribute(String name) {
     StructGeneralAttribute attr;
@@ -109,15 +108,7 @@ public class StructGeneralAttribute {
     return attr;
   }
 
-  protected DataInputFullStream stream() {
-    return new DataInputFullStream(info);
-  }
-
-  public void initContent(ConstantPool pool) throws IOException { }
-
-  public void setInfo(byte[] info) {
-    this.info = info;
-  }
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException { }
 
   public String getName() {
     return name;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
index 62c892f..a6a1c2b 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
 
@@ -24,8 +25,8 @@ public class StructGenericSignatureAttribute extends StructGeneralAttribute {
   private String signature;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    int index = stream().readUnsignedShort();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    int index = data.readUnsignedShort();
     signature = pool.getPrimitiveConstant(index).getString();
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
index f576ecf..d55adec 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,9 +47,7 @@ public class StructInnerClassesAttribute extends StructGeneralAttribute {
   private List<Entry> entries;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
       entries = new ArrayList<>(len);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
index 3cd757b..f21cf97 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,7 @@ public class StructLineNumberTableAttribute extends StructGeneralAttribute {
   private int[] myLineInfo = InterpreterUtil.EMPTY_INT_ARRAY;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputFullStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort() * 2;
     if (len > 0) {
       myLineInfo = new int[len];
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
index b57d0cf..9564814 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
   private Map<Integer, String> mapVarNames = Collections.emptyMap();
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputFullStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
       mapVarNames = new HashMap<>(len);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
index 6fb2f4b..96bf630 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
@@ -37,9 +37,7 @@ public class StructLocalVariableTypeTableAttribute extends StructGeneralAttribut
   private Map<Integer, String> mapVarSignatures = Collections.emptyMap();
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputFullStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
       mapVarSignatures = new HashMap<>(len);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
index 596d30f..85a7dff 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
 
@@ -24,8 +25,8 @@ public class StructSourceFileAttribute extends StructGeneralAttribute {
   private String fileName;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    int index = stream().readUnsignedShort();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    int index = data.readUnsignedShort();
     fileName = pool.getPrimitiveConstant(index).getString();
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
index 1cb9485..e7d7ac0 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.struct.attr;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.TypeAnnotation;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -29,9 +30,7 @@ public class StructTypeAnnotationAttribute extends StructGeneralAttribute {
   private List<TypeAnnotation> annotations = Collections.emptyList();
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
       annotations = new ArrayList<>(len);

From 5e45e5ac4071d5b63f591992138d0d309dba66b2 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 12 Jan 2017 15:03:43 +0300
Subject: [PATCH 082/252] IDEA-130708 Incorrect locals names

---
 .../decompiler/main/rels/ClassWrapper.java    |   5 +-
 .../modules/decompiler/ExprProcessor.java     |  25 ++++-
 .../modules/decompiler/exps/FieldExprent.java |   4 +-
 .../modules/decompiler/exps/VarExprent.java   |  94 ++++++++++++++----
 .../modules/decompiler/vars/VarProcessor.java |   3 +-
 .../decompiler/vars/VarVersionsProcessor.java |  24 +++--
 .../java/decompiler/struct/StructMember.java  |   2 +-
 .../StructLocalVariableTableAttribute.java    |  65 +++++++++---
 ...StructLocalVariableTypeTableAttribute.java |  28 ++----
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/bulk/pkg/res/Loader.java             |   6 +-
 testData/classes/pkg/TestLocalsNames.class    | Bin 0 -> 1707 bytes
 .../TestAmbiguousCallWithDebugInfo.dec        |   2 +-
 testData/results/TestLocalsNames.dec          |  77 ++++++++++++++
 testData/src/pkg/TestLocalsNames.java         |  35 +++++++
 15 files changed, 296 insertions(+), 75 deletions(-)
 create mode 100644 testData/classes/pkg/TestLocalsNames.class
 create mode 100644 testData/results/TestLocalsNames.dec
 create mode 100644 testData/src/pkg/TestLocalsNames.java

diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 39adbc9..f5cd82c 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -163,7 +163,8 @@ public class ClassWrapper {
       if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
         StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
         if (attr != null) {
-          varProc.setDebugVarNames(attr.getMapVarNames());
+          // only param names here
+          varProc.setDebugVarNames(attr.getMapParamNames());
         }
       }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 5931826..cffc5ac 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -341,7 +341,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_fload:
         case opc_dload:
         case opc_aload:
-          pushEx(stack, exprlist, new VarExprent(instr.getOperand(0), varTypes[instr.opcode - opc_iload], varProcessor));
+          pushEx(stack, exprlist, new VarExprent(instr.getOperand(0), varTypes[instr.opcode - opc_iload], varProcessor, bytecode_offset));
           break;
         case opc_iaload:
         case opc_laload:
@@ -371,8 +371,8 @@ public class ExprProcessor implements CodeConstants {
         case opc_astore:
           Exprent top = stack.pop();
           int varindex = instr.getOperand(0);
-          AssignmentExprent assign =
-            new AssignmentExprent(new VarExprent(varindex, varTypes[instr.opcode - opc_istore], varProcessor), top, bytecode_offsets);
+          AssignmentExprent assign = new AssignmentExprent(
+            new VarExprent(varindex, varTypes[instr.opcode - opc_istore], varProcessor, nextMeaningfulOffset(block, i)), top, bytecode_offsets);
           exprlist.add(assign);
           break;
         case opc_iastore:
@@ -624,6 +624,23 @@ public class ExprProcessor implements CodeConstants {
     }
   }
 
+  private static int nextMeaningfulOffset(BasicBlock block, int index) {
+    InstructionSequence seq = block.getSeq();
+    while (++index < seq.length()) {
+      switch (seq.getInstr(index).opcode) {
+        case opc_nop:
+        case opc_istore:
+        case opc_lstore:
+        case opc_fstore:
+        case opc_dstore:
+        case opc_astore:
+          continue;
+      }
+      return block.getOldOffset(index);
+    }
+    return -1;
+  }
+
   private void pushEx(ExprentStack stack, List<Exprent> exprlist, Exprent exprent) {
     pushEx(stack, exprlist, exprent, null);
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index f1c65d1..472823f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ public class FieldExprent extends Exprent {
     if (method != null) {
       StructLocalVariableTableAttribute attr = method.methodStruct.getLocalVariableAttr();
       if (attr != null) {
-        return attr.getMapVarNames().containsValue(name);
+        return attr.containsName(name);
       }
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index a4e25c9..8fc43ff 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -28,6 +28,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
@@ -36,6 +37,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,15 +51,21 @@ public class VarExprent extends Exprent {
   private VarType varType;
   private boolean definition = false;
   private VarProcessor processor;
+  private final int visibleOffset;
   private int version = 0;
   private boolean classDef = false;
   private boolean stack = false;
 
   public VarExprent(int index, VarType varType, VarProcessor processor) {
+    this(index, varType, processor, -1);
+  }
+
+  public VarExprent(int index, VarType varType, VarProcessor processor, int visibleOffset) {
     super(EXPRENT_VAR);
     this.index = index;
     this.varType = varType;
     this.processor = processor;
+    this.visibleOffset = visibleOffset;
   }
 
   @Override
@@ -77,7 +85,7 @@ public class VarExprent extends Exprent {
 
   @Override
   public Exprent copy() {
-    VarExprent var = new VarExprent(index, getVarType(), processor);
+    VarExprent var = new VarExprent(index, getVarType(), processor, visibleOffset);
     var.setDefinition(definition);
     var.setVersion(version);
     var.setClassDef(classDef);
@@ -97,43 +105,85 @@ public class VarExprent extends Exprent {
       tracer.incrementCurrentSourceLine(buffer.countLines());
     }
     else {
-      String name = null;
-      if (processor != null) {
-        name = processor.getVarName(new VarVersionPair(index, version));
-      }
+      VarVersionPair varVersion = new VarVersionPair(index, version);
+      String name = getName(varVersion);
 
       if (definition) {
-        if (processor != null && processor.getVarFinal(new VarVersionPair(index, version)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
+        if (processor != null && processor.getVarFinal(varVersion) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
           buffer.append("final ");
         }
-        boolean generic = false;
-        if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-          MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-          StructLocalVariableTypeTableAttribute attr = (StructLocalVariableTypeTableAttribute)method.methodStruct.getAttributes()
-            .getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
-          if (attr != null && processor != null) {
-            Integer index = processor.getVarOriginalIndex(new VarVersionPair(this.index, version));
-            if (index != null) {
-              String signature = attr.getMapVarSignatures().get(index);
+        appendDefinitionType(buffer, varVersion);
+        buffer.append(" ");
+      }
+
+      buffer.append(name == null ? ("var" + index + (this.version == 0 ? "" : "_" + this.version)) : name);
+    }
+
+    return buffer;
+  }
+
+  private String getName(VarVersionPair varVersion) {
+    String name = null;
+    if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
+      MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+      if (method != null) {
+        StructLocalVariableTableAttribute attr = method.methodStruct.getLocalVariableAttr();
+        if (attr != null && processor != null) {
+          Integer index = processor.getVarOriginalIndex(varVersion);
+          if (index != null) {
+            name = attr.getName(index, visibleOffset);
+            if (name != null && TextUtil.isValidIdentifier(name, method.methodStruct.getClassStruct().getBytecodeVersion())) {
+              return name;
+            }
+          }
+        }
+      }
+    }
+    if (processor != null) {
+      name = processor.getVarName(varVersion);
+    }
+    return name;
+  }
+
+  private void appendDefinitionType(TextBuffer buffer, VarVersionPair varVersion) {
+    if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
+      MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+      if (method != null) {
+        Integer originalIndex = null;
+        if (processor != null) {
+          originalIndex = processor.getVarOriginalIndex(varVersion);
+        }
+        if (originalIndex != null) {
+          // first try from signature
+          if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+            StructLocalVariableTypeTableAttribute attr = (StructLocalVariableTypeTableAttribute)method.methodStruct.getAttributes()
+              .getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+            if (attr != null) {
+              String signature = attr.getSignature(originalIndex, visibleOffset);
               if (signature != null) {
                 GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(signature);
                 if (descriptor != null) {
                   buffer.append(GenericMain.getGenericCastTypeName(descriptor.type));
-                  generic = true;
+                  return;
                 }
               }
             }
           }
+
+          // then try from descriptor
+          StructLocalVariableTableAttribute attr = method.methodStruct.getLocalVariableAttr();
+          if (attr != null) {
+            String descriptor = attr.getDescriptor(originalIndex, visibleOffset);
+            if (descriptor != null) {
+              buffer.append(ExprProcessor.getCastTypeName(new VarType(descriptor)));
+              return;
+            }
+          }
         }
-        if (!generic) {
-          buffer.append(ExprProcessor.getCastTypeName(getVarType()));
-        }
-        buffer.append(" ");
       }
-      buffer.append(name == null ? ("var" + index + (version == 0 ? "" : "_" + version)) : name);
     }
 
-    return buffer;
+    buffer.append(ExprProcessor.getCastTypeName(getVarType()));
   }
 
   @Override
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index fa79849..7e3da59 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -40,8 +40,9 @@ public class VarProcessor {
   }
 
   public void setVarVersions(RootStatement root) {
+    VarVersionsProcessor oldProcessor = varVersions;
     varVersions = new VarVersionsProcessor(method, methodDescriptor);
-    varVersions.setVarVersions(root);
+    varVersions.setVarVersions(root, oldProcessor);
   }
 
   public void setVarDefinitions(Statement root) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
index e68282e..4544004 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import java.util.Map.Entry;
 
 public class VarVersionsProcessor {
   private final StructMethod method;
-  private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<>();
+  private Map<Integer, Integer> mapOriginalVarIndices = Collections.emptyMap();
   private VarTypeProcessor typeProcessor;
 
   public VarVersionsProcessor(StructMethod mt, MethodDescriptor md) {
@@ -43,7 +43,7 @@ public class VarVersionsProcessor {
     typeProcessor = new VarTypeProcessor(mt, md);
   }
 
-  public void setVarVersions(RootStatement root) {
+  public void setVarVersions(RootStatement root, VarVersionsProcessor previousVersionsProcessor) {
     SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
     ssa.splitVariables(root, method);
 
@@ -60,7 +60,7 @@ public class VarVersionsProcessor {
 
     eliminateNonJavaTypes(typeProcessor);
 
-    setNewVarIndices(typeProcessor, graph);
+    setNewVarIndices(typeProcessor, graph, previousVersionsProcessor);
   }
 
   private static void mergePhiVersions(SSAConstructorSparseEx ssa, DirectGraph graph) {
@@ -227,7 +227,7 @@ public class VarVersionsProcessor {
     }
   }
 
-  private void setNewVarIndices(VarTypeProcessor typeProcessor, DirectGraph graph) {
+  private void setNewVarIndices(VarTypeProcessor typeProcessor, DirectGraph graph, VarVersionsProcessor previousVersionsProcessor) {
     final Map<VarVersionPair, VarType> mapExprentMaxTypes = typeProcessor.getMapExprentMaxTypes();
     Map<VarVersionPair, VarType> mapExprentMinTypes = typeProcessor.getMapExprentMinTypes();
     Map<VarVersionPair, Integer> mapFinalVars = typeProcessor.getMapFinalVars();
@@ -286,7 +286,19 @@ public class VarVersionsProcessor {
       }
     });
 
-    this.mapOriginalVarIndices = mapOriginalVarIndices;
+    if (previousVersionsProcessor != null) {
+      Map<Integer, Integer> oldIndices = previousVersionsProcessor.getMapOriginalVarIndices();
+      this.mapOriginalVarIndices = new HashMap<>(mapOriginalVarIndices.size());
+      for (Entry<Integer, Integer> entry : mapOriginalVarIndices.entrySet()) {
+        Integer value = entry.getValue();
+        Integer oldValue = oldIndices.get(value);
+        value = oldValue != null ? oldValue : value;
+        this.mapOriginalVarIndices.put(entry.getKey(), value);
+      }
+    }
+    else {
+      this.mapOriginalVarIndices = mapOriginalVarIndices;
+    }
   }
 
   public VarType getVarType(VarVersionPair pair) {
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index 1b6866e..86f79b4 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -61,7 +61,7 @@ public class StructMember {
         if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(name)) {
           // merge all variable tables
           StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(name);
-          table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
+          table.add((StructLocalVariableTableAttribute)attribute);
         }
         else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name) && attributes.containsKey(name)) {
           // merge all variable tables
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
index 9564814..0a06ea0 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
@@ -19,9 +19,12 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /*
   u2 local_variable_table_length;
@@ -34,32 +37,70 @@ import java.util.Map;
   }
 */
 public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-
-  private Map<Integer, String> mapVarNames = Collections.emptyMap();
+  private List<LocalVariable> localVariables = Collections.emptyList();
 
   @Override
   public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
-      mapVarNames = new HashMap<>(len);
+      localVariables = new ArrayList<>(len);
+
       for (int i = 0; i < len; i++) {
-        data.discard(4);
+        int start_pc = data.readUnsignedShort();
+        int length = data.readUnsignedShort();
         int nameIndex = data.readUnsignedShort();
-        data.discard(2);
+        int descriptorIndex = data.readUnsignedShort();
         int varIndex = data.readUnsignedShort();
-        mapVarNames.put(varIndex, pool.getPrimitiveConstant(nameIndex).getString());
+        localVariables.add(new LocalVariable(start_pc,
+                                             length,
+                                             pool.getPrimitiveConstant(nameIndex).getString(),
+                                             pool.getPrimitiveConstant(descriptorIndex).getString(),
+                                             varIndex));
       }
     }
     else {
-      mapVarNames = Collections.emptyMap();
+      localVariables = Collections.emptyList();
     }
   }
 
-  public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
-    mapVarNames.putAll(attr.getMapVarNames());
+  public void add(StructLocalVariableTableAttribute attr) {
+    localVariables.addAll(attr.localVariables);
   }
 
-  public Map<Integer, String> getMapVarNames() {
-    return mapVarNames;
+  public String getName(int index, int visibleOffset) {
+    return matchingVars(index, visibleOffset).map(v -> v.name).findFirst().orElse(null);
+  }
+
+  public String getDescriptor(int index, int visibleOffset) {
+    return matchingVars(index, visibleOffset).map(v -> v.descriptor).findFirst().orElse(null);
+  }
+
+  private Stream<LocalVariable> matchingVars(int index, int visibleOffset) {
+    return localVariables.stream()
+      .filter(v -> v.index == index && (visibleOffset >= v.start_pc && visibleOffset < v.start_pc + v.length));
+  }
+
+  public boolean containsName(String name) {
+    return localVariables.stream().anyMatch(v -> v.name == name);
+  }
+
+  public Map<Integer, String> getMapParamNames() {
+    return localVariables.stream().filter(v -> v.start_pc == 0).collect(Collectors.toMap(v -> v.index, v -> v.name, (n1, n2) -> n2));
+  }
+
+  private static class LocalVariable {
+    final int start_pc;
+    final int length;
+    final String name;
+    final String descriptor;
+    final int index;
+
+    private LocalVariable(int start_pc, int length, String name, String descriptor, int index) {
+      this.start_pc = start_pc;
+      this.length = length;
+      this.name = name;
+      this.descriptor = descriptor;
+      this.index = index;
+    }
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
index 96bf630..719b333 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
@@ -19,9 +19,7 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Set;
 
 /*
   u2 local_variable_type_table_length;
@@ -33,31 +31,19 @@ import java.util.Map;
     } local_variable_type_table[local_variable_type_table_length];
 */
 public class StructLocalVariableTypeTableAttribute extends StructGeneralAttribute {
-
-  private Map<Integer, String> mapVarSignatures = Collections.emptyMap();
+  // store signature instead of descriptor
+  private final StructLocalVariableTableAttribute backingAttribute = new StructLocalVariableTableAttribute();
 
   @Override
   public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
-    int len = data.readUnsignedShort();
-    if (len > 0) {
-      mapVarSignatures = new HashMap<>(len);
-      for (int i = 0; i < len; i++) {
-        data.discard(6);
-        int signatureIndex = data.readUnsignedShort();
-        int varIndex = data.readUnsignedShort();
-        mapVarSignatures.put(varIndex, pool.getPrimitiveConstant(signatureIndex).getString());
-      }
-    }
-    else {
-      mapVarSignatures = Collections.emptyMap();
-    }
+    backingAttribute.initContent(data, pool);
   }
 
   public void add(StructLocalVariableTypeTableAttribute attr) {
-    mapVarSignatures.putAll(attr.getMapVarSignatures());
+    backingAttribute.add(attr.backingAttribute);
   }
 
-  public Map<Integer, String> getMapVarSignatures() {
-    return mapVarSignatures;
+  public String getSignature(int index, int visibleOffset) {
+    return backingAttribute.getDescriptor(index, visibleOffset);
   }
 }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 993b9c4..6bcf941 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -93,6 +93,7 @@ public class SingleClassesTest {
   @Test public void testIllegalVarName() { doTest("pkg/TestIllegalVarName"); }
   @Test public void testKotlinConstructor() { doTest("pkg/TestKotlinConstructorKt"); }
   @Test public void testAsserts() { doTest("pkg/TestAsserts"); }
+  @Test public void testLocalsNames() { doTest("pkg/TestLocalsNames"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/bulk/pkg/res/Loader.java b/testData/bulk/pkg/res/Loader.java
index b0326dd..22a31bb 100644
--- a/testData/bulk/pkg/res/Loader.java
+++ b/testData/bulk/pkg/res/Loader.java
@@ -11,9 +11,9 @@ public class Loader {
          throw new RuntimeException("Resource missing");
       } else {
          try {
-            File e = new File(resource.toURI());
-            byte[] bytes = new byte[(int)e.length()];
-            FileInputStream stream = new FileInputStream(e);
+            File file = new File(resource.toURI());
+            byte[] bytes = new byte[(int)file.length()];
+            FileInputStream stream = new FileInputStream(file);
             stream.read(bytes);
             stream.close();
             return new String(bytes, "UTF-8");
diff --git a/testData/classes/pkg/TestLocalsNames.class b/testData/classes/pkg/TestLocalsNames.class
new file mode 100644
index 0000000000000000000000000000000000000000..f24049e31bf69e1c88eb16c71e76a89c67bcc8f3
GIT binary patch
literal 1707
zcmaJ?-%}e^6#g#RWH-xFNFYF3lvJxG*n+l56|k1l*2=G<AQh_CO>&_Nn`~xx)0sXx
zqvM<J<<XZu_|!TRI%4tNzevX!>vuO$Lg_TKv-jL{zjM#I-*@ijum67E12BrJi2;0Q
zB94ztjAKGslR7@uamhrYx$=p!E*qFq;}wONPU0l4D(jk#>jpkmD>n>$W}*`_Np3W2
zU`{#b4J;VAX<`wd>-fUN5|(v*DbRh!4g%?ij#mw?I)PnuWm!P12_z<+suNxkh~*0_
z0@}1!mI9q~PE{_{D@ExqE3iO%&MVpOitRgUzVFn+yG|gGnX7GWj4aC_j6lJHU6H{A
z_x5F#CWG^HoAy0>#PLS1JFc8qi&B*tAaLU76072l@gTH)E{Yl2>kOf<^Y)8KUAlHH
zP$$t8Mxfo7rMe$D_oRDYpkpbtOI!1HEvh!6d04=hEV=tfHkZ7*Uy`aMfu0xYA66Ax
z7(~v(3U2B6%EBtvEZoM|0#@sJ1p1<>Ygac$mO|gDZd|E5Zdv*kzQMN^?%+GtI2=}L
z7Hs7hMA5=)c-=w?EWiISeCj}_YrgOK0;zgc5uOXZT$4?fa|f(fQ!cgBx`hqgB~PK}
zZAGgNS1Um-PeM4<q@OE0enH2kg)J1>4KI;PhijpNTLN8&#oR1z$`WO0ci1)LHuQY*
z%1&Y9w7{0`2cfL6R+7&m!)2!;=N;Eoy+JTFOwtY&&-A47g=0!~Zpd(|7<g_yl#6!A
z)AZyEO}Sf0RV`)LYO+eo&h58U>+<o4eHj>NgkDn_w(HA6+51M5;AKzMc(m8lfsbTt
zGBfe2j7QQO;F%`o)k$gQd4fguOUT-!U16OA`I%R3+I`S>El~n`P3_@Uc}Wh%n|68U
z1$ueSs9pJaWARpm^#G^&Q5oP@Np$tAPNWrsQ0>n5Y0gGC3Xbui9f(IX+VBS7iOAW5
zH)&f<0M6ho&P=?Gcj#fTaEUYNdpguW+XFm#g4h&IZCuN0<MC{KZ!8fT(=&P|@e9_o
z@r-_c+}K5Ybr*@%9q3u30Y1sJ$yWpIJFv!+kI}J>3t1ye&xvgmcF}o&Pj?Zgf>P<U
zvWQ4UVcmcJpo@pk9x#7SUW`9R&whq<hPd8%1HI|K$jWMaKUUPVpHs#*kX46{MTZ`W
z4$})AeP~A(DRTENPGOb|eoy-+^7b>C`-5mj%nc%EF@`(}ND{e%AzB7wA8~e;RHpDN
z&S4lD<A%xgS$^F~7v3XI{hs1|Y9er+_8_!plt|ZcL1;Qg`3NfWFG_zS{ty3F41B=k
nP1!~xO+Y42HgIYiy7mxS>^F2Amr(5;N1Jt72|dP18!rA2sicK1

literal 0
HcmV?d00001

diff --git a/testData/results/TestAmbiguousCallWithDebugInfo.dec b/testData/results/TestAmbiguousCallWithDebugInfo.dec
index 40f1eaf..b697e79 100644
--- a/testData/results/TestAmbiguousCallWithDebugInfo.dec
+++ b/testData/results/TestAmbiguousCallWithDebugInfo.dec
@@ -11,7 +11,7 @@ class TestAmbiguousCall {
       IllegalArgumentException iae = new IllegalArgumentException();// 8
       this.m1((RuntimeException)iae, "RE");// 9
       this.m1(iae, "IAE");// 10
-      IllegalArgumentException re = new IllegalArgumentException();// 12
+      RuntimeException re = new IllegalArgumentException();// 12
       this.m1((RuntimeException)re, "RE");// 13
       this.m1((IllegalArgumentException)re, "IAE");// 14
    }// 15
diff --git a/testData/results/TestLocalsNames.dec b/testData/results/TestLocalsNames.dec
new file mode 100644
index 0000000..a5dc96f
--- /dev/null
+++ b/testData/results/TestLocalsNames.dec
@@ -0,0 +1,77 @@
+package pkg;
+
+import java.io.File;
+
+public class TestLocalsNames {
+   private static void rename(File file, boolean recursively) {
+      if(file.isDirectory()) {// 22
+         long start = System.currentTimeMillis();// 23
+         File[] files = file.listFiles();// 25
+         File[] var5 = files;
+         int var6 = files.length;
+
+         for(int var7 = 0; var7 < var6; ++var7) {// 26
+            File s = var5[var7];
+            File dest = new File(s.getAbsolutePath() + ".tmp");// 27
+
+            assert s.renameTo(dest) : "unable to rename " + s + " to " + dest;// 28
+         }
+
+         long elapsed = System.currentTimeMillis() - start;// 31
+         System.out.println("took " + elapsed + "ms (" + elapsed / (long)files.length + "ms per dir)");// 32
+      }
+
+   }// 34
+}
+
+class 'pkg/TestLocalsNames' {
+   method 'rename (Ljava/io/File;Z)V' {
+      1      6
+      4      6
+      7      7
+      a      7
+      c      8
+      f      8
+      13      9
+      17      10
+      18      10
+      1a      12
+      1b      12
+      21      12
+      28      13
+      29      13
+      38      14
+      3e      14
+      43      14
+      49      14
+      55      16
+      66      16
+      70      16
+      7a      16
+      81      12
+      87      19
+      8b      19
+      8c      19
+      8e      20
+      98      20
+      a2      20
+      ab      20
+      ac      20
+      ad      20
+      b1      20
+      b6      20
+      b9      20
+      bc      23
+   }
+}
+
+Lines mapping:
+22 <-> 7
+23 <-> 8
+25 <-> 9
+26 <-> 13
+27 <-> 15
+28 <-> 17
+31 <-> 20
+32 <-> 21
+34 <-> 24
diff --git a/testData/src/pkg/TestLocalsNames.java b/testData/src/pkg/TestLocalsNames.java
new file mode 100644
index 0000000..0049554
--- /dev/null
+++ b/testData/src/pkg/TestLocalsNames.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+import java.io.File;
+
+public class TestLocalsNames {
+  private static void rename(File file, boolean recursively) {
+    if (file.isDirectory()) {
+      long start = System.currentTimeMillis();
+
+      File[] files = file.listFiles();
+      for (File s : files) {
+        File dest = new File(s.getAbsolutePath() + ".tmp");
+        assert s.renameTo(dest) : "unable to rename " + s + " to " + dest;
+      }
+
+      long elapsed = System.currentTimeMillis() - start;
+      System.out.println("took " + elapsed + "ms (" + elapsed / files.length + "ms per dir)");
+    }
+  }
+}

From abbf2daf305258a2d661edd901bbb41cebf4be75 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 13 Jan 2017 13:04:32 +0300
Subject: [PATCH 083/252] use known list size

---
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 12e2de1..ef64f2c 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -605,7 +605,7 @@ public class NestedClassProcessor {
         DirectGraph graph = method.getOrBuildGraph();
 
         if (graph != null) { // something gone wrong, should not be null
-          List<VarFieldPair> fields = new ArrayList<>();
+          List<VarFieldPair> fields = new ArrayList<>(md.params.length);
 
           int varIndex = 1;
           for (int i = 0; i < md.params.length; i++) {  // no static methods allowed

From 0684264b3a82dd96c86fac422a1a033eef2fe9d0 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 13 Jan 2017 17:57:21 +0300
Subject: [PATCH 084/252] IDEA-166073 Extended Width (long, double)
 constructors cause issues with anonymous classes

---
 .../main/rels/NestedClassProcessor.java       |   4 +-
 .../modules/decompiler/exps/NewExprent.java   |  24 +-
 .../java/decompiler/SingleClassesTest.java    |   2 +
 .../pkg/TestAnonymousClassConstructor$1.class | Bin 0 -> 786 bytes
 .../TestAnonymousClassConstructor$10.class    | Bin 0 -> 682 bytes
 .../TestAnonymousClassConstructor$11.class    | Bin 0 -> 596 bytes
 .../TestAnonymousClassConstructor$12.class    | Bin 0 -> 564 bytes
 .../pkg/TestAnonymousClassConstructor$2.class | Bin 0 -> 788 bytes
 .../pkg/TestAnonymousClassConstructor$3.class | Bin 0 -> 817 bytes
 .../pkg/TestAnonymousClassConstructor$4.class | Bin 0 -> 770 bytes
 .../pkg/TestAnonymousClassConstructor$5.class | Bin 0 -> 708 bytes
 .../pkg/TestAnonymousClassConstructor$6.class | Bin 0 -> 660 bytes
 .../pkg/TestAnonymousClassConstructor$7.class | Bin 0 -> 686 bytes
 .../pkg/TestAnonymousClassConstructor$8.class | Bin 0 -> 655 bytes
 .../pkg/TestAnonymousClassConstructor$9.class | Bin 0 -> 727 bytes
 ...onymousClassConstructor$InnerPrivate.class | Bin 0 -> 1201 bytes
 ...sClassConstructor$InnerPrivateString.class | Bin 0 -> 976 bytes
 ...nonymousClassConstructor$InnerPublic.class | Bin 0 -> 894 bytes
 ...usClassConstructor$InnerPublicString.class | Bin 0 -> 670 bytes
 ...sClassConstructor$InnerStaticPrivate.class | Bin 0 -> 1051 bytes
 ...Constructor$InnerStaticPrivateString.class | Bin 0 -> 804 bytes
 ...usClassConstructor$InnerStaticPublic.class | Bin 0 -> 796 bytes
 ...sConstructor$InnerStaticPublicString.class | Bin 0 -> 549 bytes
 .../pkg/TestAnonymousClassConstructor.class   | Bin 0 -> 3315 bytes
 .../pkg/TestAnonymousParamNames$1.class       | Bin 0 -> 586 bytes
 .../pkg/TestAnonymousParamNames$Clazz.class   | Bin 0 -> 537 bytes
 .../classes/pkg/TestAnonymousParamNames.class | Bin 0 -> 556 bytes
 .../results/TestAnonymousClassConstructor.dec | 308 ++++++++++++++++++
 testData/results/TestAnonymousParamNames.dec  |  22 ++
 .../pkg/TestAnonymousClassConstructor.java    | 103 ++++++
 testData/src/pkg/TestAnonymousParamNames.java |  27 ++
 31 files changed, 471 insertions(+), 19 deletions(-)
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$1.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$10.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$11.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$12.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$2.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$3.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$4.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$5.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$6.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$7.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$8.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$9.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivate.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivateString.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerPublic.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerPublicString.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivate.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivateString.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublic.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublicString.class
 create mode 100644 testData/classes/pkg/TestAnonymousClassConstructor.class
 create mode 100644 testData/classes/pkg/TestAnonymousParamNames$1.class
 create mode 100644 testData/classes/pkg/TestAnonymousParamNames$Clazz.class
 create mode 100644 testData/classes/pkg/TestAnonymousParamNames.class
 create mode 100644 testData/results/TestAnonymousClassConstructor.dec
 create mode 100644 testData/results/TestAnonymousParamNames.dec
 create mode 100644 testData/src/pkg/TestAnonymousClassConstructor.java
 create mode 100644 testData/src/pkg/TestAnonymousParamNames.java

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index ef64f2c..b456cc8 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -393,7 +393,7 @@ public class NestedClassProcessor {
       mergeListSignatures(interPairMask, interMask, true);
 
       for (VarFieldPair pair : interPairMask) {
-        if (pair != null && pair.fieldKey.length() > 0) {
+        if (pair != null && !pair.fieldKey.isEmpty()) {
           nestedNode.mapFieldsToVars.put(pair.fieldKey, pair.varPair);
         }
       }
@@ -406,7 +406,7 @@ public class NestedClassProcessor {
         method.signatureFields = new ArrayList<>();
 
         for (VarFieldPair pair : entry.getValue()) {
-          method.signatureFields.add(pair == null ? null : pair.varPair);
+          method.signatureFields.add(pair == null || pair.fieldKey.isEmpty() ? null : pair.varPair);
         }
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 2db188f..f31f3a8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -210,8 +210,8 @@ public class NewExprent extends Exprent {
 
         ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(invSuper.getClassname());
 
-        List<VarVersionPair> sigFields = null;
-        if (newNode != null) { // own class
+        List<VarVersionPair> sigFields = child.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).signatureFields;
+        if (sigFields == null && newNode != null) { // own class
           if (newNode.getWrapper() != null) {
             sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, invSuper.getStringDescriptor()).signatureFields;
           }
@@ -224,27 +224,17 @@ public class NewExprent extends Exprent {
           }
         }
 
+        List<Exprent> lstParameters = constructor.getLstParameters();
+
+        int start = enumConst ? 2 : 0;
         boolean firstParam = true;
-        int start = 0, end = invSuper.getLstParameters().size();
-        if (enumConst) {
-          start += 2;
-          end -= 1;
-        }
-        for (int i = start; i < end; i++) {
+        for (int i = start; i < lstParameters.size(); i++) {
           if (sigFields == null || sigFields.get(i) == null) {
             if (!firstParam) {
               buf.append(", ");
             }
 
-            Exprent param = invSuper.getLstParameters().get(i);
-            if (param.type == Exprent.EXPRENT_VAR) {
-              int varIndex = ((VarExprent)param).getIndex();
-              if (varIndex > 0 && varIndex <= constructor.getLstParameters().size()) {
-                param = constructor.getLstParameters().get(varIndex - 1);
-              }
-            }
-
-            ExprProcessor.getCastedExprent(param, invSuper.getDescriptor().params[i], buf, indent, true, tracer);
+            ExprProcessor.getCastedExprent(lstParameters.get(i), constructor.getDescriptor().params[i], buf, indent, true, tracer);
 
             firstParam = false;
           }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 6bcf941..7c1cc33 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -62,6 +62,7 @@ public class SingleClassesTest {
   @Test public void testEnum() { doTest("pkg/TestEnum"); }
   @Test public void testDebugSymbols() { doTest("pkg/TestDebugSymbols"); }
   @Test public void testInvalidMethodSignature() { doTest("InvalidMethodSignature"); }
+  @Test public void testAnonymousClassConstructor() { doTest("pkg/TestAnonymousClassConstructor"); }
   @Test public void testInnerClassConstructor() { doTest("pkg/TestInnerClassConstructor"); }
   @Test public void testInnerClassConstructor11() { doTest("v11/TestInnerClassConstructor"); }
   @Test public void testTryCatchFinally() { doTest("pkg/TestTryCatchFinally"); }
@@ -94,6 +95,7 @@ public class SingleClassesTest {
   @Test public void testKotlinConstructor() { doTest("pkg/TestKotlinConstructorKt"); }
   @Test public void testAsserts() { doTest("pkg/TestAsserts"); }
   @Test public void testLocalsNames() { doTest("pkg/TestLocalsNames"); }
+  @Test public void testAnonymousParamNames() { doTest("pkg/TestAnonymousParamNames"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$1.class b/testData/classes/pkg/TestAnonymousClassConstructor$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..5c42a2c56ec8ee956af92bcf01739e5107a0a354
GIT binary patch
literal 786
zcmbVKTT22#7(Jt_o3^Ie{eCm>5}DvbPy`_bkwu{R*2B6EI<?Nk?ke=NdWfKhen3Ae
z`bK-INNHjAyPf&wJ7?zo<Mj<d85=Q#F&~G41rv)VmKdTzNBEfohMnreeY;raesC(4
zeC(>8UvX{UuPEsUUe5`XcSP`GAw_V)aF`tfU%j*YcG0zEyI2c6A=^i}27^&iEzXdv
z3dyf~-6r?ycGIOyx~d%8ZP=dB@mJE&12R|_QgUxF5vOo>^y!%r&C3Xz{y7Fiyrz1d
z!_S32c>7P<`<eyKdnO%M`NZOi2OZTiv0`BrYZfAiS}?IrB97EBQ(`EOMh)2Bc%p9y
zd?+39_$|3LvKMU>TDx!E!dZP6xBt7wvDD8suu1RDpr^-DDXo(BXqlKG8zb+Ms$sH;
zeBl`^U)W<W2t83EggE`919$|J<m*-hgoP=x+S3hny9AO*(T*^tDGDKt8L|duF-J8}
LtZTzhXP1Fb*Z0`D

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$10.class b/testData/classes/pkg/TestAnonymousClassConstructor$10.class
new file mode 100644
index 0000000000000000000000000000000000000000..fb064fa05ae9b6b52c02f7adcbcd6f2a5c1cfa73
GIT binary patch
literal 682
zcma)4TT22_5dMy?uG*THvin6#LJi8Ow;~8BP%Hw?_uX~TQ|mdgm!O~3Lj*na1Nu?X
zoUNB2vW3~1`R1EBGiT2G$Lkw_BUI9eV<`g-%Q{wctTH5nG54!YhVAbC-Dtn>_`#Ww
z;&CEFzvY^~-;%-)ywDD$cTDsXE_iUtP^<le-)Ywe3|dPL9fn+&3+F1FSdP~>EtimD
zSK6jKFg>pPZ%|VWF&J$j953p?A$Mo`Y1M-!HONeo4v9t5X2|qp=-JK%R|jtWIo{r_
z`9RsZb78yE=VEl}1Y<eWv2I`kn+6g{8qiT@s7}2r>W1NPIxQNr7nlLJuS3h_HbdbT
ztTMF{<#BaoKWoKnY6FRy+62n9eT^Oh%jeZB$|BK`BAq7dhN215*~acOSfgChUJ!dC
zAchS6lM%g+8L}Hup)3r{l1C{~K~*k`9P*T*tOAO}i(`(w80JwTtziL+6a&R#6#M!V
Hx`xyzvQMd0

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$11.class b/testData/classes/pkg/TestAnonymousClassConstructor$11.class
new file mode 100644
index 0000000000000000000000000000000000000000..4cc1fb9b1800a7e384d2278b8dbde240af2bf272
GIT binary patch
literal 596
zcma)3(MrQG6g_F{I%joS-KK&MipZwu9QdLWL56}*McCMT)|D;VCDNvXpXHO_gCF2W
zi8q^XLuVk|d(OEzxi|Uzdj9}$g3SVKth!ipQDVrQ3n}ykL#Y}(@Mm6+xg6BnIuUZv
ztaTZjmg+|g#X!jDE*tftq{DkLF@B&z9(Q>n4E`Y<JrpT}cOzw#v|^s75y8FS>2Xl+
zM5(@%O1_L#mX5WSlBrIzP^)CO(P%O-D)y)QU?{XzmW0u@FgNe~>2zeqpoXtx7^{@V
zxQ+Bs^<7jvtYgE2gE@xX|8&G~I=gH<YFl$H!uzZji*WLI43%G%?U}9&Tf#iywC{vr
zu&cE$j$zSfn#E|-U=(wdoe^(Q%<Uh%fxS{@!8LeXcZfXY<w*tRu|UXZ9u`Tru|&v1
X5z7=EtiVTsGM_l(2|8^PTSopHqr05|

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$12.class b/testData/classes/pkg/TestAnonymousClassConstructor$12.class
new file mode 100644
index 0000000000000000000000000000000000000000..c23af1a1b462fe0364b95c38bdc3028c9db1638d
GIT binary patch
literal 564
zcma)3O;5r=5PjPgidaSP13x1gV!(rndefK~f(ZnT350uFHn3WDO}jPmXL&O5;1BRe
z8K>2Q2P1AWJ8$01yxrM-|9E`^aEi@5Of1`2u~BBoo(n1T1w*FRY1an~R#Oc*L!m1q
zzlkRv5Bshc5L4<Z-wg(CD3bV_wDed+3{G209yS9via3RP-G}?pVV_6(QY!g0QE`;!
zno34GjD4-bYUB8ffw^QIGLNjykngED^!b%Y4&41y;NZ@Er0zmX`hkjs99?rgRzn+W
z4%V^Zz(R(h`k#w1oJ=oEC+ulg3;#Cu0^u_hf8lnfDlwEr@>)N&zA%GXs}FDlgMKJk
zjEu%0pC!~HY>~J3x3^xvo(USTY0svG4de({(pDQYn5Bq{;b1P!+n7gzvL+UYH&8^0
VyoE(9Ay248oIxI>V-mZH+$UZDiWvX^

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$2.class b/testData/classes/pkg/TestAnonymousClassConstructor$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..fb671b11eb6b4db812e816cfdd8fcd8e4bb87fad
GIT binary patch
literal 788
zcma)4+fKqj5IqZp3Ra6KUhu}vgiC@#e8ZR+q6q|yi3FbuG_VT0rY$6XmJi0n2S31%
zGR{`Rqp+Ll%$d%aotfRQ?~hLa=g3A7#BLNC_H-n5>@$SD5qEQE4B6K6)9|!oyWW+M
z;$<SIZhdUIZe0r3bEbVyIyDNv;DURX4Eg*L@y$k|%b?Zez-BO8T-dkMNzZmVR&Pw6
zcuV%Jao2LV!hcRp6~tgPgs>gI0-NB;;?r_fs*hPDO_Cl-gCTk^r%vC#;p)81zulD|
ztr@Y+YtbJ|my2QB_C|7`<IunnjtztmHlQO-vsyT+T$Q1`ILdGG&fzo5qxyb(p2PG)
zK2f+D)0`5_7rHt!4DIEvXNjp+YU&P`=(vIuy)KO&8jHo$u#`ojV}*2ttOxRiNSnpd
z8(6WFN@(mIfmd<`5T$R}Cq%GHcF|8|!oWHqBKav*LX&ok7|Pl}oZ^DmBox3F5~MY3
VV+U(wCFxI)v|7r0Ksu!W@B?b$&JF+o

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$3.class b/testData/classes/pkg/TestAnonymousClassConstructor$3.class
new file mode 100644
index 0000000000000000000000000000000000000000..80dd6bf340e9fdacfa5762ac35e41e22596f8785
GIT binary patch
literal 817
zcma)4+e!m55It$vuC1%qdcRw(&{naEK8T7SMM0?|RQevbp+?t4cGH5N<%0-5_yK;D
zI9Yx3(z5K%ndD^V%-OtuyuJb0K|YNnCNgj^>0-*oG(*bV$f&T%uu^-tYgMj9WR8?p
zkN3JARRbPHRjncuwtb_+eWD*oCCwqjZm|b`?Ur|VCE%)6shd!$)_$qM;8b-}FbvnE
z5*O|JYY|@Y>ws2rHSP1D!9!{D??uN7WbjUv5@D=JP`cW^dtsaOGUDcb%3#RUbvyLM
ziL{NE{~de7PC<H)l^^JcrZ^YoMmJr|dYHq!hd!h{xL70;yLwpIX4vb_il?m`Zlr%1
z$__W;%Rq*yzqj&T>(X&)ef+g@vRG=kSR#GJpN{q5_g4IOd$3>&OLPw%x{@rLweDF&
zuZw<)X+meTpQPxO*Pg-3>+A)IC(0AZ&^Hyc2Qfg{Rw5ofLliBt^=vf{!^qN!Bt|Gp
aAcs+k4#qH!K|(X%JqX6DGt_;-Ccr08bl?U6

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$4.class b/testData/classes/pkg/TestAnonymousClassConstructor$4.class
new file mode 100644
index 0000000000000000000000000000000000000000..74820acdeed679038981bd12419950d1314bc138
GIT binary patch
literal 770
zcma)4TT22_5dMy?ZrbLp>|!@>ff`hTZ$=POpjZTk@9VngDLp54k3v7IhX{J;2lS(&
zIZICw>B8*HeEZFunQzbM*ZT*621+r6u^oqj9TPbdy9`k^=6?B%q11hP9G%{~zPc1r
zJWu7!Z%u69Z%N@RZ{{fJHHm)C1y>ggmC6$QPP^J?Fj{ixG9<fPxVN+E!1eC!!Gw@Z
zS335jZ+l$lKcJxpVzAmmxLz=UOX<<#)5;B+kJ)4$vH@9}A>NZS&vCE0KCk%ib|(+^
zoT`&o!kI{)i_wj%#&T$4-@*Y7EkqEtV4^@;EtIO<U}!961xxmnt+;dN@wu(EDu026
zg}tbdYsr3f3s<Ur6GetvrPE$Q#ClWzvLzO*BTtvfpnJtqDXoo;$V{w|k5SYoG(tX6
zJAMVL<+BERL+FK&5aRTX2K+QuDXs;b60ne<jB0|8x?ciGq^LqiX=I2O#yVvoY#>YC
Xz$Uh^Mp2HwgvskiqkA+-KFIJ5DGbLN

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$5.class b/testData/classes/pkg/TestAnonymousClassConstructor$5.class
new file mode 100644
index 0000000000000000000000000000000000000000..c32a742c0732fffdf98b7230aa7b6f1d1b9cba0d
GIT binary patch
literal 708
zcma)4TT22#6#mBD+%n6uG_wnI11-peddUbv3W6;H#rJU?bZVW6-BIXg^%V5b59mil
zXIJ04=)lZ5=R4n=IhXnTdj9}$imenZtT<S8kYh+*NF~iBL$2gL@*%JITy-lA6G+vq
zm0JvUU3UaS#+6Fk5BhBpG<n-6B<pIA`z;>G$R2~X>B*2GeXEoR>OK!cLFR$`{M4;9
zMQE;+Rxf=$2xDJetIz}k&*)(Ptj55IoBf#vL#m+%fhTTc^ziP#fsUgpDBo-4`8uR3
z?u6;-j)S!{3Rq9W#s<UQ6bUh$PiDo1HVik?dkEx^8!_q~L*Z}N&cwJ3+cIk5FOf$O
zgH<ZG9BfjSzf5k5hF9b9PSJ=ePLQBK6D>yD#tg|MX*EI<B%Q+}_6GJ!Y61?O$(WeK
sEa~|X1#_4ui^xc0f&3O0$x0xDC6YFlkwuEM;y5Viwnb>3WRY-M-;f)^D*ylh

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$6.class b/testData/classes/pkg/TestAnonymousClassConstructor$6.class
new file mode 100644
index 0000000000000000000000000000000000000000..2dde5175e4c2ee33081bf9db238cda9691302818
GIT binary patch
literal 660
zcma)3-Alqy6#rc}-LjQsUuv0sg8EPi(u)y<Bq$bv;rpCJZ_RsSyA%4edJ1~z59p7I
z&Q>o$q=U2H$2sS2_neQ<w|4+_l+w_!VPMn17DMWS3$891lI2dj(r3_{a_BN-x?H%o
z;bh?Y_x8XeC)<^d?e%S+NBYOq)tCniR$B<yZ+dnRxFnCePmiP1dpA&5LW<{!41+k=
zlp;`m=qTwQoi`YmP0^tkP_!A+JsJ9r+v3sp4*u;wd9bI{ow*i{Cj%}<H?A7Xp@F=G
z0=6yaC^8(*@gEHJ*;VoVddgPZx%2tdR?$HIGWTbm#gOCCw0@oTEf}<NrEg%Dp-StR
zV~Vv#w6i&`S;H9;wD{;@6grZGDPk>RI-yxD71=A;3-JUDdZ*&bJWS$yaj%I5ERv#X
nSXhelCYF(*tcDfx6Iex-P{$h9ktSB4OoA}#(a6ma?!+2jN^z+!

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$7.class b/testData/classes/pkg/TestAnonymousClassConstructor$7.class
new file mode 100644
index 0000000000000000000000000000000000000000..6f08d90d5ead067f7d06644b5ce93123fd7da270
GIT binary patch
literal 686
zcma)4+e*Vg5Ix((#@1-tc)wJ<ROm&lpirSANKsIt2$sI5X=qo|UCBl8vwRT22S31%
z5@(|?qF57>IWv29_MBng-d|n;>|-?p4RcxOm^ZLsV38pm4R~1EW!SXuZu|AN7e>cI
ziie?$!<O%aVM~fI3Su{sL6hi*T=3|K;h_8vzJ24|J9Xa?{rYtjaM5p8It+SC_B@81
z&4qUv54&E_cDg=QEL*yc-*E!2@~@(<1TvUsLU=)<$fI;?^y#Gr>1D*Ve#&6TUduRe
zy;H6Z-uTn@j&ebIPlW5skX&4N(LnYLESp$C(Zm?iCJc<z5J%3i)L_^f%}U%}#a*Af
zpOa%K{8C#V*@^aXHM#G-v~s0`HM$Hs-3yk_D+>zIM?NTK2%XcqM$xR+p1`WL?PsJO
zDNi9w|8&AGVuG;hL_B(@C@Q4-sct56$kPrD1<F#eFila%3}!J&$V%1-(4(qLzy}DY
Bvs3^8

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$8.class b/testData/classes/pkg/TestAnonymousClassConstructor$8.class
new file mode 100644
index 0000000000000000000000000000000000000000..59b8436a37fe5fa64da1ddaa865cfcdd4e164f48
GIT binary patch
literal 655
zcma)3$w~u35Ph9YGA0?5823HV2w8ABcnBzh1cihsf+6?Gq)A#Q-7<^dXL%68gCF2W
ziPeK1yf_Zj)O(M5)z#G>pKtE~j#17aiIpr2teRLevCfbVCc>{CG3@pp?#G9H?g!^m
z$)~9b{kCiSep^XD@Ioh0-U*eT3Mqm!hFa|(_1#W=z+kl1h%*#=Lh|cyI^<s89=fEI
zddjigf$a&+zePh2#9(!#<X$uZC%PAZTD3*<F`J@GF{J1)WN%gIIs8)S^LGBc-NBvx
zNbbUgbX?^NIlkh-M2$>rTG+z2g%r{jOw7=(VpmmdG3>`zMVGt@hpuoKa=%z5)=dtf
zm-ORL*6IV4>4gn?Y*sAlfi<F_sVQd&4M<H<&NrGbV2x&Z(RfATnUn;w^iN0i732sv
wqE2~O$P*(^)KT}#qktkgG@3(+>XMizmcRlQDH~YAGG+;tNJ~=IpH?@3FBsyWe*gdg

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$9.class b/testData/classes/pkg/TestAnonymousClassConstructor$9.class
new file mode 100644
index 0000000000000000000000000000000000000000..ab22f7bda022e3c1564cef3d20d8c26f22d29b7c
GIT binary patch
literal 727
zcma)4%TB^T6g>l#@~DFKf$t|KfJR)nkYG#<(S!tz35I<s4UE<q(@stNEEmSag&*KY
z8ShkfK5)_Ab8pX_d++JIf4sf{IK+AeNz7+qplD*j#3DmV4S85PVAyWo-wtZmUZ_rm
z6pwc@3Y)$YhD|9#6-2I*L4)YWTyS;5a8&*WzkTC8I5po9gIY%gTnrkOE`!mOeUBmE
z=EA#-?s{Hu?eu)A*lp=Le%A@O&PPQ<56ED(gz$oRB9GFY@!d;xnwJsR{yqjnwj-m!
z_0G9&y!GeW`+5tS_e{9H3~7rCPYq??#Il7ItXh~r%7TeCGI6Yjr8+}>JS*O|qa4NE
ztElI5_sc(q;;&ye$Ewn4u3h{|H(A!dX0H6*t4bFebZrc}L99^F%W6cAi8RFwp%xOv
z0CLscXRzwt3ldM1CXl6fDkkqBM_3CH4Hl*-YNX|~SPpp<Vwq{m60k8t(ZDR`FiFTB
LwICQ*myrGhEYHF9

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivate.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivate.class
new file mode 100644
index 0000000000000000000000000000000000000000..dc248aff6b370a5bdb38c6ee52a86fc809d6cdc7
GIT binary patch
literal 1201
zcma)6ZEw<06n<{$D6QRwIGiu2Yy&Oecu{<1qLah~f}6<}662==4R*4Y^ku=H<p;rN
z;t%jg8P6?5TxNha_uO;uJ?A;kIj6V3et-W7pp2>l6?bJ4_Y|x`laNs$LgOMEL5|P&
zx!C0*ub_aUgpz~@3}Nr1>86SdJI%qTUg6kqy?x8JKA+mYTkGqtTeB_KbNr5HI~6kD
zGcD7rGHBWo_KkX`#UR$~uEDV0G%e%6KW!V%vEJ^}PONEn^nOcsOun9OikuLGTDL62
zdFPmCx<{syWkATF)8gXbseb{8In!x0XtZh6B|Kz!yIc-S#41&IqQa2sC=5$nP-%rB
z#YivZ&7d6FzSA+@n7lCCbK8(V(a&@hQCwEBhIOu$88-QDp|4xL!jb2gR`0cM_Pd6o
z;t?KG$~mq);o_-^XLv55qGAs(81f4nf3B7c(OIa&_KDH)=<8XGL1hVPyi8$zFfgnx
zLqcn0nlr3(w5eme+J(c)Jo|)JpLZPb>`4TM4eg>K1>9Pg1l7@Ei2sjR3rV_wt8^h*
zG|Kxznm{kL3G}Jc%0~z*G^ew<uMo0hgnmGLKgLROgm6q6ArcoykVjCy;nJ7D{R+u7
zasysM#w(<-j}2O7=^hgh;<!dL*LXk{XxDLr!t%YFNI;B&DBPY>_&@~0bS7tW$+$QM
zn}rDn?$rRk9PpI?!ppcbg_kMI3A~Ig4$r}`jUDn3h#t>5jZK<kq^b0$xk~yi8ua`D
D#)Ksr

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivateString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivateString.class
new file mode 100644
index 0000000000000000000000000000000000000000..dd660b70c8d657e5dc280949ee34ceafb56e558a
GIT binary patch
literal 976
zcmbVLT~8B16g_uay0WfND<7hwd=xB&STMwZH6)}7iAf_SG=1}7TPJ0)%#z(L!Jp-W
zf$-oD@JA8P42?Y0*oNKA?EN_R%)N8({=T{X1z;N`4`X;S&TZa94lg~t!h(xM7fXU%
zdK@OjO~G>g>|3YOP)WM4BmMm}>Ls;qkR-K8Cu!Vkr%_xb{6nb2bWgBT8UbHF3C@E`
zH_)BRQ5uK3Q(bEcvbE@|5=_=Ztv>ZmTPkh@tu8HvdejcO%^(hq-Zy4Vg7kgVTE(B^
z@H|M>Et$Z#Mw_N0=H2j=ii0$)O3VR+$+}n;e7RqtBc!rrZ^OCZ<vSN!W_v4G87WZU
z9YwvktqwwSaZCSg+Z)pbALH<RxOiZsqKg$Dt9UKg9@_SQ+?gPM*V@C@iE5{upy5oc
zGE*`$us9UUu4ut@X|OG8O)PMja~y8T=S@kJ9KNg&f``-^)H3`|l-Ga4DPJP9afR#;
zi}Q`$dUqM|9*<Dv0y%92eUGUbjA0fl74QU39>h=gPdFqxOP^a_-?)U_QRi&Pj-@Q$
oLjF>^nCVlxm^GA!08cSTG6&D7Id~49g94>7{-=|ar?~k10q*hk?EnA(

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublic.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublic.class
new file mode 100644
index 0000000000000000000000000000000000000000..b984943441530396685c2a2d23857208bdde7afc
GIT binary patch
literal 894
zcma)5Yi|-k6g?NVEG%n5EY=5F+Cp7Gx>ftF#zaX>AVf{tp#8YJOz76_EZK*NKg$nN
zqlrJjA7#9QCatLfvzc=rb7t?En>#;#e*F$$ANvIqao>Q64IOm@S!^iS%wtR0Z3PVl
zO#?f4pu^J9BIJ@2KW^+1wujUA6Z=TS$#WUXk7r>T_W~!5d!dYzDD{#sI$-)!U;4>2
zf@S>&f6#A@2wE>33qon=OYtf_b47IIxB+J>!_aerkrVkU{*%;{AVRS(rHJ07Zs2<a
za~{q02;Q`p*KS-o&$`LsHQ?p)>JyB^FpWI%(pNgR7T$XI)cN3;xQ0~|CA10aDq#nX
zoY;p+<jcv6)DOlYGSR_9{(VO|T?M-)Z0zZHWa2TN5V}iSd|5W3d{ODOdn&wykhN4x
zbIx=s<d{&i2Cd-*>n}Zg?XGoY^I#FbX7v|s=acYv1;UzjmB<A*m)?*YBnj1j2^*o#
zGi>rWQ@N}ft~~xqC^KH?DCPNGVcTqXK7-ol$b3Wg_#9e&hLuWg2ED4yke{LO1;!^P
zW>8^V<zv8G6z~oW9ODK@ZD@>5tYMw4@>D^Zd$(|#PpaG<++|({HI6d4hns8-W)=Aj
GRe@jN?%+EB

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublicString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublicString.class
new file mode 100644
index 0000000000000000000000000000000000000000..e96ecf433a49c078201bc02d4eed2d3d0cdbd649
GIT binary patch
literal 670
zcma)4+e*Vg5IviwO&epIR_pyzwGV9-E2tn;1StqY@Yd4zB!-%rZX_4M&+<VOAN&A6
zN}Npv9|~3$cITWuGn^Ub^XvTszya2CkWp5V#+-_IEGSr1u*8sw?%c4t$FOBQ-1nPZ
zCyY+H&!2{V9JW0(4BI{rqad~;KWLHs*yV0?!f;gkhu#>Nk7m;|dB53-0+;t&^&W%V
z_HP}Ag5h%KA|6^!&^0ZOn3Cb!rq?qASKuE~76uuL=bSsiRcv{#J*vf^C0ydtA<5xn
zN7b<^)DxrJ(zsOywd2Qu?VP#7+~%L7*%h5?$UxDM#j=7G4XapV*q=DnaZe2T@8B-2
zfn!GushXJG#>8^e4`(RX#v7{lP@yGA(>^d=7hXj~CyN~2DxoeUr0C5zwqL*+uaI`$
zka{LY!j#~X-)qv}U>Y50#8pNagmpqfBPz2bDxyT05@rZVm_>nJmHuQ}!94H{1*fij

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivate.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivate.class
new file mode 100644
index 0000000000000000000000000000000000000000..9e7f68865684b5753547dd34dd0cd40ff970d6c7
GIT binary patch
literal 1051
zcmbVL>uwT36#j<W;&xjrw$=+sTUuSHEp4q;gE3K(Cg5sKXh{4yzy!B$XUXntqmShu
zFq-%PK9upyN+bqD8zFOM&h0zjnc4H>=hyE54)D~(9M(-(C>hu=kwi(0%`EQe{k|5q
z7G)C^Y#Df9V4ETH%$2Ts&XBg7jdGhIRrh;>;i}_G@g_R!h~R{GJhJ2*zstQg4_vK}
zjVbls4awJ#QUoo<mD_zAxaV9^f)yL<9uGr7F^A6JL%(_=LiIxW^3$0gg|V;h%TNVT
zSNXxlG)#?waav7U9a;?oI}8;fdkMI`n(ip^aaW5yE%q5UFO|q(w)`mQiX&Gyzdn=q
z&M80V7Ur>_MU`Pi8>$|c{c1}EuI#^zT(2hr3%ej5Y)c>ZwRmXJ+dVRHXyGxQFdY2P
zB{3{c3LbY(MOQJDE=D3MNn2l0h7Sfp_89VZv+PW;{vuCLv29N|YqR3>c4L-1tNh;;
z7?$kmKq|O)VH0$ll41E@#M)S;nXqU)fCT;NeL!C}X@ce;MSHO_LgE{e??y-!he+o#
zLl}i2vO`??0`qg6xJYt=5`b5f<lrt|;~HtJv8{+4mPsQp+`tMI(5IWYg(M};<IcF`
zG3BPoXH<%X5!eJe6Q?v|$V$x0_ycJmKZZ0=(2yE{2oxzUK?HPPYgnQ^N2fU&?CZ$l
IHtF>H1q?&`u>b%7

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivateString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivateString.class
new file mode 100644
index 0000000000000000000000000000000000000000..9352fd7392b93dfb2c181bd59368156fd90e2376
GIT binary patch
literal 804
zcmbVL+fExX5IwV5cF8tC2&B+*X}C#TB+^Jc6;!DTP$5MvQX<}+trZ*+FWPlb_$;1+
zc<2Z4QHb#d!9$@Sypm_fbLM!?*uK5H`3qnN%K==>1{lGo0G~1EW8TLC!P`?>neT++
zdaW%kM7bk$t6Vp+(yiT%6M|cf{z$?^O=<b7*KNwUA(|atDb%7+bWTL9tpBj+np2e!
zW{<R%aoq@`!sA$72qTA-gj^b`c0`g$M()+l&syb%Ow11*>C0}^OVU_1(us+Cp^4(v
zm&kSr#1w^p3-_@|`1XvVH|$nPWjp<^1gBpiti36R5Y(ey9Lhswo3s31MccO1Ie75x
z^u<Rhhb8!2^81@X$UmLm?`B(uhOqKFA1lnP+k;+u70d0`DDgcS;VT6={ILWOM%g=H
z>#)sk4&ZEEBXgBPvOJF?lLA~EGV~_`_C5~5_`p#+vY0>~lm}B59w_%2V>7+YtpVtX
s&*M0-pYoK3h({g|Q<leOVH!ndaCk3U><q@(7WmKQ2aw}RCfVn44}B2E?f?J)

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublic.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublic.class
new file mode 100644
index 0000000000000000000000000000000000000000..d78a2d068aef134556c0fe41807880f32839ddcb
GIT binary patch
literal 796
zcmbVKTWb?R6#mX8&BpE8OWN9M(<Z%WH?3`i)~AY~0U;r%kP_(Q>}H5lx3gh)R`6%}
zl8S;qz#k=^i9(S`1P9J{Zr{1gFyDWC`3B$&Pdv<H(?!*TgG~!tWo%nrvrxCN<6#$j
zF7{nKB$S>ht;}=6T+nGZ`h;RD8A!rnS84e=zYb-3A;Op=m2MJ=xGz#={olc&d8abM
za$9Se_KYwpdYgx_iU|HB)`~@zNv1sQj@}QO7cw(1bfQ0ACwVr>wGy3~G>=S@?oV|&
zCy-$2u!Jmag4av(G?K5B-D!7bzmqHRLHO|Th_G($W-Rou*)yrq!<V^=2Qu|>fPgz6
zS)*a$(8m!TyEyi7f+pegKlUap-OhUxUdhN13W0s!k{FGo9uTTQr_sG-{jn9_`#6|N
zp3mY}gZ8X+*(ARv5LSa}A`jg8=RNtEG-2&;i}g{5{d@K>jo<t(;{tmU1r%A=4sSqT
z;auLJP#dFInH!_DHHJGz`7`c(Vv2)B#sw|_A}$(Wo6DEjt50GzEMt{DZiY47;{n!M
W#|CE|+-J|h1FW$2IA_0k1?8V70>+d8

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublicString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublicString.class
new file mode 100644
index 0000000000000000000000000000000000000000..8eec4e1ecd2f61463863fe5f1b42e30fd35d4241
GIT binary patch
literal 549
zcmbV~!Ab)$5QhJ3YqwojTdQr=lZuC`U@u;zB1lmX78P20Q^~HOP2DDv%?du2C&hyg
z;6sVCt>8gaFozkw$;{8pByaC8uK@P2>LHJ+hea&8sJW;!6b_`4_K>003`YE(w_>ga
zt*$jv4cc3MhI~ig2!?VXl{ibsp)frj#uTXrI^uDk8=3KEFmH!4VQ8ExB}~_HE2E1v
zjAb-cWbh|9otP(ypu~1?cROhHL}HJWRu5yHCX>64R*5xfWVPA+L95NcNTK?@Z3eHa
zQxl03nKioctNd;@wT~GzTrB%oL4jfa-%T-8zP5NCjznY`a?Na!>wk*UKniQf(IaJt
zklHGcb%~D2JLF5-PhdOGa2^R96v@t032;eeSH#yS5!I*3@GwV2Wt3H(NK}X%EWju4
LQ6xv-VHU*?tG|v3

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClassConstructor.class b/testData/classes/pkg/TestAnonymousClassConstructor.class
new file mode 100644
index 0000000000000000000000000000000000000000..7c692b8115bf9f88cbead56bd6376f7acd690eb9
GIT binary patch
literal 3315
zcmbVP>sH%F5dIcp%a(-+28RHJ0&yDKEjU~gE=`-zrXisTttqLS-ejW^5hJ;_Oha$!
zv-AzxA8<~6P9LBT)zewsyjY>=WY3XCnw|Ofo0;9Q{LjCC{S9Cdzsb0UZ3&;m@u`d+
zlqBp#X@-x8j3_>nuqz|MC!WYi^7qeW^r0-_3mN@*D&b2R1AP7~8H0TOYZ)2-{*8=b
z{{F3u5pJ)_7{k*9DyT}>lQDtqI5aN5<F|bo&!9^<knmhWjbUKZFtkR=QZ2o@-Kx~|
zDuZI{Hfn0KsWl}WG7JZ-N>)QR_9Yk$Nqf?9mSB3Aj>5C6Go(e3hJK`4nuPBet_1a-
zSHmN-?b$ay99QF5GQ`$(L$_`-L~{9EhTaWxPh;rc(hcoV>#(9VcGOCZH0dp~s@8VZ
zhR)wzWv}&2C*Z4F_2>J=9j$5IF-+t5&}=pBBy5;Q(`vM;mf2V%1f6HBYk5UfQb_iz
zn^lLpN7QjYGsQ4*p1ost4j``?W!qWWuAR3?QqWQLMD#Ouj;~9`t^W8q)*h8tp*c(#
zZH7#4>p(qHi#65QFFJJActIF1TyTm(E}5-HRlBG2>P-J{@@F}+f}6NSwYsoW**V$<
zmiEHp9#$xid2ZSYWx5c`YB7}65?}UVDAQ$bdKAj^W+<z0sa#>mhDi90aAs7PFlh4<
zeo*iN$FzgH_tf2%Ufa{CJw%OMesxm8kN8Q!&-g{cuL@rBY))NBnBh_f_i^PwtI{@E
zxX>-T8Ely=ui@n#)|rsLUV9G9P;9^qiy>F(>P)Mz<K{&+8`9Zrrr}9;b>CaL5S=^N
ze0X2Vg>ikb$xWj<M+%#!blkKw`hAR;E!sL6X9?Xb5<kPDENJQ>{bIz_dR;U27-nA8
z90R=Ey-kjB%k)w?l*<PU$zssnz-L!vkm`K>nt@4V>C=Oc6kXIf!LUM4MUsqUv~UXc
z2R-y)mF_WH8NnJoD~<uy@h-gqw|(bT^xAVu8$IPhI&zBMCmjs_fkVLb6%!M16d&h3
zA7|ZNFV#l0To^)3Iz>Eyl%Ve*SwKqpNbmbd0;7b(NDkoi5u=oV(_wVS#}ODMJw{3Z
zX@D4|1tgDA9Cv-B>xkG{OSaKh<|#_qFw9P~lcEfTbs2GN_)d9B8y|gb^p~A{Tnf02
zP-RBR=mXzPh<?C{J{{mZPSH;YoIBBf=;H{{4|>rL1(2pF`e^~liypY=BMFQ$4x`Hf
zoNL7BEdi&)=p!FTU^MJ8x)MOj6QhEF<S~llzK<l-W5lk<s0}05V}|N6OZC|ForHRf
zx%GG>;5J9~m?yUfcu1#$AFlgUdw#e^|HOD36XjF9nVvksRDrG&OrPLt_i0(8Z}(*(
zf>CVYV?yY`Bm4dsIg-C)h%%PNby_V?vOw}}lJC&m49QuNMUpp2KSz?YS|GVd`X!Rf
rB**9i=|@~SY)jC831<wta=?}Swv1DT`G`}^oRM&)_cw;0c^dx#=9wew

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousParamNames$1.class b/testData/classes/pkg/TestAnonymousParamNames$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..3a8a43f23486af403e4b154a5a7f9c00b5872355
GIT binary patch
literal 586
zcmaJ;T}uK%6g{)9ZrZk*WnU_3_)rR!&|49d6eODji4VSwI_TE!tn98q{;M7$=%F9b
zkBaVyJ+=cg=bkfX?!7bf{qy++;0)z764=f_$Buzr1A7dqXySymQ--oVeIB25MHpR4
zU%q<&EPUVr_d47Y;W-&E9O*=t3<rm?&UXK($Dp_TkzmN$juf4lHxNOW4_s36wm;-<
zj|Yz8OHo%%Fqn5zilF84Fcd`h<LcC!s;8;y&}LxmKXOf^&yacaXTeb1I;v*rpIaS2
z@fS`_-pHZrhmIWIi)iAH43tbHkuqUmg&rp6U208+YTQ0uW<F;~F0mNnMTI^`r+;F(
zoGPy(n$!bfnxY=5NkXgMcn7ODDh2%m+8ZevGPI@^{sLAht}ilKFkum+GmDHWpM@-P
hbV5bz$dfOD4PqKLQ6SW@Me7>PJZT9+HI!O}_6wKVhX4Qo

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousParamNames$Clazz.class b/testData/classes/pkg/TestAnonymousParamNames$Clazz.class
new file mode 100644
index 0000000000000000000000000000000000000000..9e4c76a529c6e681fdbf61f60b9464bc43bf66b1
GIT binary patch
literal 537
zcmaJ;O;5r=5Pee$m0G3ZCjyBd91s)n;7wzqBqovuO(Yz+Ex5sAKS*0l<X?F(CLa6&
z{wU)t>d|JC-Fa`{?3<nW{CfWYaDr+c8Elx)v1y=WV4ILj9^ANgOsG1O$5FE@<K!X;
zgJ(aS#<wC8en<E+K4syV8@S0iVXvO5Z1)d(1icmBOG3eM1KFAS0~vM2z+<N9ghS!=
zMC2;`OX{i!Lbm0J*^FRa2Z4+j#Ia<0Kh3W;&r$VFRJ9I)+JE4ZL7!mWh0|y#uUzF{
z`R9j6WAP*`WRbIAplqN**iGrkk1xSic}-6Qqvp+EEQbjpQ&$}*rzB&C=b-aQ$hMWG
zig+1V;62aCfyO*wHV$7wjW=j7j5L^v;}h6oT?vaEskansp}?n#Y^=;RCW=^P9}R2F
PYgotf{GLnX{3U4Lh?#wy

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousParamNames.class b/testData/classes/pkg/TestAnonymousParamNames.class
new file mode 100644
index 0000000000000000000000000000000000000000..d8faae560ac9034acf8809ceca0819bea8b7ead8
GIT binary patch
literal 556
zcmaJ;%TB^T6g>ll+FAs8_yQI_7QjMc;!a~iNK7;YO(Z0`8|sL~c50@@ME=T!A<@JS
z@S}`(z^$FdedV5W?%ezR^YI1X7<C(2R7`BxNMX}L23sb!P3)McGGw|wpUoJY3n_)7
zB#K1DU@7q+l#s4q*zY|*joSke#T^;S*C3om*Ie<S&jS%1Ebu1`*;7w?@fkz9(Ht@u
z-SD2U`JN|5e;SO08t{=%m0~Y+xj*E})A?V~h#x&tttTmwhJ6!Gl`GCYO;r15qQeP)
z;SL<+h%jmLBi&SUU}Ke`n$XEm(41|b%W?Z^G!bshu$ur_E`?#Qk@%s@yXFwPbdW3^
ziZ-JsSwwUW<fyVnSqCOXK&dqcYkeYh+p^Mgq~Bq@Q8|S?S$$fd3<DJuC~}q%tP`p3
TDJ^Un7WpFOCW)?)*C=|wn_q_d

literal 0
HcmV?d00001

diff --git a/testData/results/TestAnonymousClassConstructor.dec b/testData/results/TestAnonymousClassConstructor.dec
new file mode 100644
index 0000000..66960ce
--- /dev/null
+++ b/testData/results/TestAnonymousClassConstructor.dec
@@ -0,0 +1,308 @@
+package pkg;
+
+class TestAnonymousClassConstructor {
+   void innerPrivateString() {
+      TestAnonymousClassConstructor.InnerPrivateString var10001 = new TestAnonymousClassConstructor.InnerPrivateString("text") {// 5
+      };
+   }// 6
+
+   void innerPrivate() {
+      TestAnonymousClassConstructor.InnerPrivate var10001 = new TestAnonymousClassConstructor.InnerPrivate(3L, 4) {// 9
+      };
+   }// 10
+
+   void innerStaticPrivateString() {
+      TestAnonymousClassConstructor.InnerStaticPrivateString var10001 = new TestAnonymousClassConstructor.InnerStaticPrivateString("text") {// 13
+      };
+   }// 14
+
+   void innerStaticPrivate() {
+      TestAnonymousClassConstructor.InnerStaticPrivate var10001 = new TestAnonymousClassConstructor.InnerStaticPrivate(3L, 4) {// 17
+      };
+   }// 18
+
+   static void innerStaticPrivateStringStatic() {
+      TestAnonymousClassConstructor.InnerStaticPrivateString var10001 = new TestAnonymousClassConstructor.InnerStaticPrivateString("text") {// 21
+      };
+   }// 22
+
+   static void innerStaticPrivateStatic() {
+      TestAnonymousClassConstructor.InnerStaticPrivate var10001 = new TestAnonymousClassConstructor.InnerStaticPrivate(3L, 4) {// 25
+      };
+   }// 26
+
+   void innerPublicString() {
+      TestAnonymousClassConstructor.InnerPublicString var10001 = new TestAnonymousClassConstructor.InnerPublicString("text") {// 29
+      };
+   }// 30
+
+   void innerPublic() {
+      TestAnonymousClassConstructor.InnerPublic var10001 = new TestAnonymousClassConstructor.InnerPublic(3L, 4) {// 33
+      };
+   }// 34
+
+   void innerStaticPublicString() {
+      TestAnonymousClassConstructor.InnerStaticPublicString var10001 = new TestAnonymousClassConstructor.InnerStaticPublicString("text") {// 37
+      };
+   }// 38
+
+   void innerStaticPublic() {
+      TestAnonymousClassConstructor.InnerStaticPublic var10001 = new TestAnonymousClassConstructor.InnerStaticPublic(3L, 4) {// 41
+      };
+   }// 42
+
+   static void innerStaticPublicStringStatic() {
+      TestAnonymousClassConstructor.InnerStaticPublicString var10001 = new TestAnonymousClassConstructor.InnerStaticPublicString("text") {// 45
+      };
+   }// 46
+
+   static void innerStaticPublicStatic() {
+      TestAnonymousClassConstructor.InnerStaticPublic var10001 = new TestAnonymousClassConstructor.InnerStaticPublic(3L, 4) {// 49
+      };
+   }// 50
+
+   static void n(String s) {
+      System.out.println("n(): " + s);// 53
+   }// 54
+
+   static class InnerStaticPublic {
+      public InnerStaticPublic(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 100
+      }// 101
+   }
+
+   static class InnerStaticPublicString {
+      public InnerStaticPublicString(String s) {
+         TestAnonymousClassConstructor.n(s);// 94
+      }// 95
+   }
+
+   class InnerPublic {
+      public InnerPublic(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 88
+      }// 89
+   }
+
+   class InnerPublicString {
+      public InnerPublicString(String s) {
+         TestAnonymousClassConstructor.n(s);// 82
+      }// 83
+   }
+
+   static class InnerStaticPrivate {
+      private InnerStaticPrivate(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 76
+      }// 77
+   }
+
+   static class InnerStaticPrivateString {
+      private InnerStaticPrivateString(String s) {
+         TestAnonymousClassConstructor.n(s);// 70
+      }// 71
+   }
+
+   class InnerPrivate {
+      private InnerPrivate(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 64
+      }// 65
+   }
+
+   class InnerPrivateString {
+      private InnerPrivateString(String s) {
+         TestAnonymousClassConstructor.n(s);// 58
+      }// 59
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor' {
+   method 'innerPrivateString ()V' {
+      5      4
+      b      6
+   }
+
+   method 'innerPrivate ()V' {
+      5      9
+      8      9
+      d      11
+   }
+
+   method 'innerStaticPrivateString ()V' {
+      5      14
+      b      16
+   }
+
+   method 'innerStaticPrivate ()V' {
+      5      19
+      8      19
+      d      21
+   }
+
+   method 'innerStaticPrivateStringStatic ()V' {
+      4      24
+      a      26
+   }
+
+   method 'innerStaticPrivateStatic ()V' {
+      4      29
+      7      29
+      c      31
+   }
+
+   method 'innerPublicString ()V' {
+      5      34
+      b      36
+   }
+
+   method 'innerPublic ()V' {
+      5      39
+      8      39
+      d      41
+   }
+
+   method 'innerStaticPublicString ()V' {
+      5      44
+      b      46
+   }
+
+   method 'innerStaticPublic ()V' {
+      5      49
+      8      49
+      d      51
+   }
+
+   method 'innerStaticPublicStringStatic ()V' {
+      4      54
+      a      56
+   }
+
+   method 'innerStaticPublicStatic ()V' {
+      4      59
+      7      59
+      c      61
+   }
+
+   method 'n (Ljava/lang/String;)V' {
+      0      64
+      a      64
+      13      64
+      16      64
+      19      65
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPublic' {
+   method '<init> (JI)V' {
+      f      69
+      18      69
+      1b      69
+      1e      70
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPublicString' {
+   method '<init> (Ljava/lang/String;)V' {
+      5      75
+      8      76
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPublic' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
+      14      81
+      1e      81
+      21      81
+      24      82
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPublicString' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
+      a      87
+      d      88
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPrivate' {
+   method '<init> (JI)V' {
+      f      93
+      18      93
+      1b      93
+      1e      94
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPrivateString' {
+   method '<init> (Ljava/lang/String;)V' {
+      5      99
+      8      100
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPrivate' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
+      14      105
+      1e      105
+      21      105
+      24      106
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPrivateString' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
+      a      111
+      d      112
+   }
+}
+
+Lines mapping:
+5 <-> 5
+6 <-> 7
+9 <-> 10
+10 <-> 12
+13 <-> 15
+14 <-> 17
+17 <-> 20
+18 <-> 22
+21 <-> 25
+22 <-> 27
+25 <-> 30
+26 <-> 32
+29 <-> 35
+30 <-> 37
+33 <-> 40
+34 <-> 42
+37 <-> 45
+38 <-> 47
+41 <-> 50
+42 <-> 52
+45 <-> 55
+46 <-> 57
+49 <-> 60
+50 <-> 62
+53 <-> 65
+54 <-> 66
+58 <-> 112
+59 <-> 113
+64 <-> 106
+65 <-> 107
+70 <-> 100
+71 <-> 101
+76 <-> 94
+77 <-> 95
+82 <-> 88
+83 <-> 89
+88 <-> 82
+89 <-> 83
+94 <-> 76
+95 <-> 77
+100 <-> 70
+101 <-> 71
+Not mapped:
+57
+63
+69
+75
+81
+87
+93
+99
diff --git a/testData/results/TestAnonymousParamNames.dec b/testData/results/TestAnonymousParamNames.dec
new file mode 100644
index 0000000..810799c
--- /dev/null
+++ b/testData/results/TestAnonymousParamNames.dec
@@ -0,0 +1,22 @@
+package pkg;
+
+public class TestAnonymousParamNames {
+   private final TestAnonymousParamNames.Clazz reference = new TestAnonymousParamNames.Clazz(0L, false) {
+   };
+
+   private class Clazz {
+      public Clazz(long paramL, boolean paramB) {
+      }// 25
+   }
+}
+
+class 'pkg/TestAnonymousParamNames$Clazz' {
+   method '<init> (Lpkg/TestAnonymousParamNames;JZ)V' {
+      9      8
+   }
+}
+
+Lines mapping:
+25 <-> 9
+Not mapped:
+24
diff --git a/testData/src/pkg/TestAnonymousClassConstructor.java b/testData/src/pkg/TestAnonymousClassConstructor.java
new file mode 100644
index 0000000..5104b50
--- /dev/null
+++ b/testData/src/pkg/TestAnonymousClassConstructor.java
@@ -0,0 +1,103 @@
+package pkg;
+
+class TestAnonymousClassConstructor {
+  void innerPrivateString() {
+    new InnerPrivateString("text"){};
+  }
+
+  void innerPrivate() {
+    new InnerPrivate(3, 4){};
+  }
+
+  void innerStaticPrivateString() {
+    new InnerStaticPrivateString("text"){};
+  }
+
+  void innerStaticPrivate() {
+    new InnerStaticPrivate(3, 4){};
+  }
+
+  static void innerStaticPrivateStringStatic() {
+    new InnerStaticPrivateString("text"){};
+  }
+
+  static void innerStaticPrivateStatic() {
+    new InnerStaticPrivate(3, 4){};
+  }
+
+  void innerPublicString() {
+    new InnerPublicString("text"){};
+  }
+
+  void innerPublic() {
+    new InnerPublic(3, 4){};
+  }
+
+  void innerStaticPublicString() {
+    new InnerStaticPublicString("text"){};
+  }
+
+  void innerStaticPublic() {
+    new InnerStaticPublic(3, 4){};
+  }
+
+  static void innerStaticPublicStringStatic() {
+    new InnerStaticPublicString("text"){};
+  }
+
+  static void innerStaticPublicStatic() {
+    new InnerStaticPublic(3, 4){};
+  }
+
+  static void n(String s) {
+    System.out.println("n(): " + s);
+  }
+
+  class InnerPrivateString {
+    private InnerPrivateString(String s) {
+      n(s);
+    }
+  }
+
+  class InnerPrivate {
+    private InnerPrivate(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+
+  static class InnerStaticPrivateString {
+    private InnerStaticPrivateString(String s) {
+      n(s);
+    }
+  }
+
+  static class InnerStaticPrivate {
+    private InnerStaticPrivate(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+
+  class InnerPublicString {
+    public InnerPublicString(String s) {
+      n(s);
+    }
+  }
+
+  class InnerPublic {
+    public InnerPublic(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+
+  static class InnerStaticPublicString {
+    public InnerStaticPublicString(String s) {
+      n(s);
+    }
+  }
+
+  static class InnerStaticPublic {
+    public InnerStaticPublic(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+}
diff --git a/testData/src/pkg/TestAnonymousParamNames.java b/testData/src/pkg/TestAnonymousParamNames.java
new file mode 100644
index 0000000..5c83de9
--- /dev/null
+++ b/testData/src/pkg/TestAnonymousParamNames.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+import java.io.File;
+
+public class TestAnonymousParamNames {
+  private final Clazz reference = new Clazz(0, false) {};
+
+  private class Clazz {
+    public Clazz(long paramL, boolean paramB) {
+    }
+  }
+}

From f466a2bc55c977d7bd8240fba59240f7896df455 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 13 Jan 2017 21:01:29 +0300
Subject: [PATCH 085/252] more correct variable name in cases where definition
 is not inside debug name offsets

---
 .../decompiler/main/rels/ClassWrapper.java    | 18 +++++++
 .../modules/decompiler/exps/VarExprent.java   | 47 +++++++++----------
 .../modules/decompiler/vars/VarProcessor.java |  4 +-
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index f5cd82c..d0efaae 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
@@ -35,6 +36,7 @@ import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.io.IOException;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class ClassWrapper {
@@ -165,6 +167,22 @@ public class ClassWrapper {
         if (attr != null) {
           // only param names here
           varProc.setDebugVarNames(attr.getMapParamNames());
+
+          // the rest is here
+          methodWrapper.getOrBuildGraph().iterateExprents(exprent -> {
+            List<Exprent> lst = exprent.getAllExprents(true);
+            lst.add(exprent);
+            lst.stream()
+              .filter(e -> e.type == Exprent.EXPRENT_VAR)
+              .forEach(e -> {
+                VarExprent varExprent = (VarExprent)e;
+                String name = varExprent.getDebugName(mt);
+                if (name != null) {
+                  varProc.setVarName(varExprent.getVarVersionPair(), name);
+                }
+              });
+            return 0;
+          });
         }
       }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index 8fc43ff..0cb7fd1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
@@ -105,14 +106,17 @@ public class VarExprent extends Exprent {
       tracer.incrementCurrentSourceLine(buffer.countLines());
     }
     else {
-      VarVersionPair varVersion = new VarVersionPair(index, version);
-      String name = getName(varVersion);
+      VarVersionPair varVersion = getVarVersionPair();
+      String name = null;
+      if (processor != null) {
+        name = processor.getVarName(varVersion);
+      }
 
       if (definition) {
         if (processor != null && processor.getVarFinal(varVersion) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
           buffer.append("final ");
         }
-        appendDefinitionType(buffer, varVersion);
+        appendDefinitionType(buffer);
         buffer.append(" ");
       }
 
@@ -122,36 +126,31 @@ public class VarExprent extends Exprent {
     return buffer;
   }
 
-  private String getName(VarVersionPair varVersion) {
-    String name = null;
-    if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
-      MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-      if (method != null) {
-        StructLocalVariableTableAttribute attr = method.methodStruct.getLocalVariableAttr();
-        if (attr != null && processor != null) {
-          Integer index = processor.getVarOriginalIndex(varVersion);
-          if (index != null) {
-            name = attr.getName(index, visibleOffset);
-            if (name != null && TextUtil.isValidIdentifier(name, method.methodStruct.getClassStruct().getBytecodeVersion())) {
-              return name;
-            }
-          }
+  public VarVersionPair getVarVersionPair() {
+    return new VarVersionPair(index, version);
+  }
+
+  public String getDebugName(StructMethod method) {
+    StructLocalVariableTableAttribute attr = method.getLocalVariableAttr();
+    if (attr != null && processor != null) {
+      Integer origIndex = processor.getVarOriginalIndex(index);
+      if (origIndex != null) {
+        String name = attr.getName(origIndex, visibleOffset);
+        if (name != null && TextUtil.isValidIdentifier(name, method.getClassStruct().getBytecodeVersion())) {
+          return name;
         }
       }
     }
-    if (processor != null) {
-      name = processor.getVarName(varVersion);
-    }
-    return name;
+    return null;
   }
 
-  private void appendDefinitionType(TextBuffer buffer, VarVersionPair varVersion) {
+  private void appendDefinitionType(TextBuffer buffer) {
     if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
       MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
       if (method != null) {
         Integer originalIndex = null;
         if (processor != null) {
-          originalIndex = processor.getVarOriginalIndex(varVersion);
+          originalIndex = processor.getVarOriginalIndex(index);
         }
         if (originalIndex != null) {
           // first try from signature
@@ -208,7 +207,7 @@ public class VarExprent extends Exprent {
   public VarType getVarType() {
     VarType vt = null;
     if (processor != null) {
-      vt = processor.getVarType(new VarVersionPair(index, version));
+      vt = processor.getVarType(getVarVersionPair());
     }
 
     if (vt == null || (varType != null && varType.type != CodeConstants.TYPE_UNKNOWN)) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 7e3da59..728addf 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -84,12 +84,12 @@ public class VarProcessor {
     }
   }
 
-  public Integer getVarOriginalIndex(VarVersionPair pair) {
+  public Integer getVarOriginalIndex(int index) {
     if (varVersions == null) {
       return null;
     }
 
-    return varVersions.getMapOriginalVarIndices().get(pair.var);
+    return varVersions.getMapOriginalVarIndices().get(index);
   }
 
   public void refreshVarNames(VarNamesCollector vc) {

From 9ee45b3f5a69b4a7ce1bb21fed322fcda99fbb95 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 17 Jan 2017 20:45:27 +0300
Subject: [PATCH 086/252] cleanup: use streams

---
 src/org/jetbrains/java/decompiler/main/ClassWriter.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index d80090d..0986a22 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -651,15 +651,10 @@ public class ClassWriter {
         if (attr != null) {
           descriptor = GenericMain.parseMethodSignature(attr.getSignature());
           if (descriptor != null) {
-            int actualParams = md.params.length;
+            long actualParams = md.params.length;
             List<VarVersionPair> sigFields = methodWrapper.signatureFields;
             if (sigFields != null) {
-              actualParams = 0;
-              for (VarVersionPair field : methodWrapper.signatureFields) {
-                if (field == null) {
-                  actualParams++;
-                }
-              }
+              actualParams = sigFields.stream().filter(Objects::isNull).count();
             }
             else if (isEnum && init) actualParams -= 2;
             if (actualParams != descriptor.params.size()) {

From 6713b9c495e32b500ba5c0dc7facaec9e0bbcccb Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 17 Jan 2017 20:46:58 +0300
Subject: [PATCH 087/252] test for anonymous class with params

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestAnonymousParams$1.class   | Bin 0 -> 771 bytes
 .../classes/pkg/TestAnonymousParams.class     | Bin 0 -> 749 bytes
 testData/results/TestAnonymousParams.dec      |  36 ++++++++++++++++++
 testData/src/pkg/TestAnonymousParams.java     |  32 ++++++++++++++++
 5 files changed, 69 insertions(+)
 create mode 100644 testData/classes/pkg/TestAnonymousParams$1.class
 create mode 100644 testData/classes/pkg/TestAnonymousParams.class
 create mode 100644 testData/results/TestAnonymousParams.dec
 create mode 100644 testData/src/pkg/TestAnonymousParams.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 7c1cc33..7a69a8e 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -96,6 +96,7 @@ public class SingleClassesTest {
   @Test public void testAsserts() { doTest("pkg/TestAsserts"); }
   @Test public void testLocalsNames() { doTest("pkg/TestLocalsNames"); }
   @Test public void testAnonymousParamNames() { doTest("pkg/TestAnonymousParamNames"); }
+  @Test public void testAnonymousParams() { doTest("pkg/TestAnonymousParams"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestAnonymousParams$1.class b/testData/classes/pkg/TestAnonymousParams$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..dccd219da7f3606a18053add2e5edc0c9b0e936e
GIT binary patch
literal 771
zcmZ`%!EVz)5Pj=7F%5>gEu|@;5U7D9AVLwhA|zB5$x<klTIIe?mUh9}jclhX|HK7}
z3W)<Bz(*n8nie=DmUd=m=IPCw@&5ev{Re;-c(ec?8_wLRql&u$S^@3}R8M6ZO97Dx
z)QS_G$Ik@T`;(8yy+f53uZ=aI#&(+T%S?{*ZGv8Eql;Gp&)aiR{SWd~_O$IKW-=`f
zicHDzcG4LL_&au_1Qz?+sJ-d<NM(oeC}n23Z-+7+$V|KVBI!Fp0%2l|%63wj=Zax-
zUf+0&`n)p^usTx#+f&I%pwjMe-1_d>P)!PLO&;Jr;{!X*hU$%WdKxpPf9l4f_+2wh
zZLZDnTUDIcQGm@5F&>1tf`t$@1R?5p$TiN{V!XxL<%-y@P}zTr5?HycCGY-96j+<X
z#&O<TOUCxhq06;5X4g6cwD=;bd?8*GIpqL7$8Z^*I<A8I=WUO%Pakz3pF?yv&f#^R
zd_(0+iM&QzBNAxfI&BLT+6aqSqIWmP>FN=du|h6^8(5`x+&xCFR_%U;_n8+D{|K8U
hVfY7dL3ooGpP4nbX_WYN+$wWT+-3_WoIjhM-)~lVs&fDU

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousParams.class b/testData/classes/pkg/TestAnonymousParams.class
new file mode 100644
index 0000000000000000000000000000000000000000..0946b63019f38000bada2e6df2089716088d128d
GIT binary patch
literal 749
zcmZ`%T~8B16g{(Dy1HGV3j(d6e27wNbffVNV`7LVn>1ho!T2~W0}gIyn%%9@pXG}r
zn)n0!QO2`dU5V03X71dtbMLt`KYo7w4&W)aeblkyVbzC&+dl4K&BMBf4S^swMx}d+
z%rcb;)Sqdi^XCG!&d#xbyJt_7z+6uowLc#AReB`*2`%$IJCMn-Om(6EHoEycO^kML
z^!_Y5Qd$1OSo3LU$JuL{%3-!k*i&m6(dnJb4>Hm=ip^-8ALgl&!`-+j>1ZRcc%@%J
zNbXo5Jk?3A(o4w#D^<>`f1NDszx+5*qg-2)dDx_WXvgV5F_dgtS2X*m=rF)FTxY*i
z2yHzs0`7X)3UCki1(v4-3N%Z?i8N=?LH}G0a)E_v1_xDh0#7<q$5#=&#CtNd_8+MK
zsPhdu+mrG^V{BlCKcQF-M8S=xPc5Pplr!B6h|i_F!Lwc(mk{tCOagENv($h&Gzn59
zOM<$T;Ws#MyAM_`P}_g_1@4=_K(nYZpoIp%UK492V0V&K0fq=MUls|mfSUwwuz^J^
YF?X5SE`2Rp+q^rt1&`9F&7tJ_1)5@~H~;_u

literal 0
HcmV?d00001

diff --git a/testData/results/TestAnonymousParams.dec b/testData/results/TestAnonymousParams.dec
new file mode 100644
index 0000000..c487941
--- /dev/null
+++ b/testData/results/TestAnonymousParams.dec
@@ -0,0 +1,36 @@
+package pkg;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class TestAnonymousParams {
+   void foo(InputStream in, final int a) throws IOException {
+      FilterInputStream filterInputStream = new FilterInputStream(in) {
+         public int read() throws IOException {
+            return a;// 27
+         }
+      };// 24
+      filterInputStream.read();// 30
+   }// 31
+}
+
+class 'pkg/TestAnonymousParams$1' {
+   method 'read ()I' {
+      4      10
+   }
+}
+
+class 'pkg/TestAnonymousParams' {
+   method 'foo (Ljava/io/InputStream;I)V' {
+      a      12
+      c      13
+      10      14
+   }
+}
+
+Lines mapping:
+24 <-> 13
+27 <-> 11
+30 <-> 14
+31 <-> 15
diff --git a/testData/src/pkg/TestAnonymousParams.java b/testData/src/pkg/TestAnonymousParams.java
new file mode 100644
index 0000000..55e58bf
--- /dev/null
+++ b/testData/src/pkg/TestAnonymousParams.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class TestAnonymousParams {
+  void foo(InputStream in, int a) throws IOException {
+    FilterInputStream filterInputStream = new FilterInputStream(in) {
+      @Override
+      public int read() throws IOException {
+        return a;
+      }
+    };
+    filterInputStream.read();
+  }
+}

From 85f61bee8194ab69afa746b965973a18eda67608 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 17 Jan 2017 21:38:48 +0300
Subject: [PATCH 088/252] fixed IdeaDecompilerTest.testStubCompatibility

---
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index b456cc8..897b394 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -405,8 +405,10 @@ public class NestedClassProcessor {
         MethodWrapper method = nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entry.getKey());
         method.signatureFields = new ArrayList<>();
 
+        boolean firstSignField = nestedNode.type != ClassNode.CLASS_ANONYMOUS;
         for (VarFieldPair pair : entry.getValue()) {
-          method.signatureFields.add(pair == null || pair.fieldKey.isEmpty() ? null : pair.varPair);
+          method.signatureFields.add(pair == null || (!firstSignField && pair.fieldKey.isEmpty()) ? null : pair.varPair);
+          firstSignField = false;
         }
       }
     }

From 45384fb8c5f5903b707da79a047a1bb6ac640979 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 23 Jan 2017 18:07:50 +0300
Subject: [PATCH 089/252] fixed access to private outer class methods with
 params

---
 .../main/rels/NestedMemberAccess.java         |  12 +--
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestAccessReplace$Inner.class | Bin 0 -> 723 bytes
 testData/classes/pkg/TestAccessReplace.class  | Bin 0 -> 1079 bytes
 testData/results/TestAccessReplace.dec        |  69 ++++++++++++++++++
 testData/src/pkg/TestAccessReplace.java       |  32 ++++++++
 6 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 testData/classes/pkg/TestAccessReplace$Inner.class
 create mode 100644 testData/classes/pkg/TestAccessReplace.class
 create mode 100644 testData/results/TestAccessReplace.dec
 create mode 100644 testData/src/pkg/TestAccessReplace.java

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index a460ef9..5be55d0 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -149,19 +149,21 @@ public class NestedMemberAccess {
 
               InvocationExprent invexpr = (InvocationExprent)exprCore;
 
-              if ((invexpr.isStatic() && invexpr.getLstParameters().size() == parcount) ||
-                  (!invexpr.isStatic() && invexpr.getInstance().type == Exprent.EXPRENT_VAR
+              boolean isStatic = invexpr.isStatic();
+              if ((isStatic && invexpr.getLstParameters().size() == parcount) ||
+                  (!isStatic && invexpr.getInstance().type == Exprent.EXPRENT_VAR
                    && ((VarExprent)invexpr.getInstance()).getIndex() == 0 && invexpr.getLstParameters().size() == parcount - 1)) {
 
                 boolean equalpars = true;
 
+                int index = isStatic ? 0 : 1;
                 for (int i = 0; i < invexpr.getLstParameters().size(); i++) {
                   Exprent parexpr = invexpr.getLstParameters().get(i);
-                  if (parexpr.type != Exprent.EXPRENT_VAR ||
-                      ((VarExprent)parexpr).getIndex() != i + (invexpr.isStatic() ? 0 : 1)) {
+                  if (parexpr.type != Exprent.EXPRENT_VAR || ((VarExprent)parexpr).getIndex() != index) {
                     equalpars = false;
                     break;
                   }
+                  index += mtdesc.params[i + (isStatic ? 0 : 1)].stackSize;
                 }
 
                 if (equalpars) {
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 7a69a8e..8b876c8 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -97,6 +97,7 @@ public class SingleClassesTest {
   @Test public void testLocalsNames() { doTest("pkg/TestLocalsNames"); }
   @Test public void testAnonymousParamNames() { doTest("pkg/TestAnonymousParamNames"); }
   @Test public void testAnonymousParams() { doTest("pkg/TestAnonymousParams"); }
+  @Test public void testAccessReplace() { doTest("pkg/TestAccessReplace"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestAccessReplace$Inner.class b/testData/classes/pkg/TestAccessReplace$Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..a339ed0fd9f6e56b0a11d258692b121b58baf5c9
GIT binary patch
literal 723
zcmZ`%+fKqj5ItKcNG*zY<t7L!7bAFi)0h|&6A95o4ev|cV6_&~R{zTfBk{ox@S}_~
zpwUFwO=kAYo;@==nUBx6cL4j?iXn!i0Rt%mX=K=Bb-LoEF<NDliy|Mznm{DDwf$mU
zV5!-=@6@i99~@hj^8HKIbEKsXh;nGVc5o!HRT{%--pMCfbEMm;T?L-)b`Hudf$&N9
zMhQ$eZC9N?KD3p0E!z%7W}970IxXqhjK70nE<`{-b6w>Lm;-;}NZ(f!&Wz4n9I&WH
z(Pr6yWe6Bo-AB(-r#2^E{P(?Weqv%0rinNTQ4~$AqhMkKn<h#qo2Z~FkQ&*XVS0hY
zZ{mygow5RfP>EZxF!C8yB?mn&*6Y;yAF#t9Ij+Yn_ru&}re10^{s#9rm>&0>xyaLO
z7&HeWk>D@$iFO=QWTy#v&=De^t5jbgDzDJ`2vz$C8}rcnh*pPw;+Z%a5@eHzkX_-K
uBfS*G(pW+UtH@%8m4<ql#R4J5oL3A^i^SAuFB8&8W1hT0cQMkKgZKh844&-(

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAccessReplace.class b/testData/classes/pkg/TestAccessReplace.class
new file mode 100644
index 0000000000000000000000000000000000000000..e72075490473d3120882f72690b9dcdddd331d8c
GIT binary patch
literal 1079
zcmZ`%(Nfb;5Ir|-5~xvXp+%rT(W<4WEvPT*=s1kd*y*Sv4DYw`iowz{O>z2LKEe3l
z2l!ErXOk3TDamB_-o1Oy-m{zEe}4V~@B|NYaBx@5Ju&yi)N*jK>7wpp%f$l)`(3YR
z1`1x}ce^?aO{n0!2ztTrr9!5*d7zNp?SD23bM2sK-k%<K%wS)4x{MUseP4GE^dOLZ
z63h<22IN?5pL{!P?3-}-+V@QueljOr?VIPM`_k|4k(*8-C!3FYppS{MYps?PRGMFl
zUq@k<3FGsej;N~5W|PQdvn`wD+7;!5&KjlCcO=~!ZT};9ERph61o4fm(GCH7{nLSO
z-Ugz*bV=HyBmG@_SVGamf|z-D9tvWv!BZ$sZHPi%aE-3+9X396j*LH4Secqyji!VR
zPSWL!fmtY_roGNxgI>|w^)uK%xUg`8)`@}z%yBKLOh6tt>2q>9Mg+XXPaY*el>*L_
zhC-6Gt>`pKOY<+J_$evjXB!gWQv$PN{xq-{0ZXhRbxT;Jm(?w<EWT`KLh*`mTh1o6
zl_H7?G7&JYJth;qF<B-*gXIe$Wya;no+CRcxxma7l#{aQwq_<v|KHYCkxlU0#hsr~
zw8(bWD(A4Kqhsw3Ruk<G)<rvcDx7sZo;Or3+THs4#@Xc##Mg*B;F5^fkmQI+I^g0q
XDKl*69quetIeVGE!VLcp{ziWRsNa$z

literal 0
HcmV?d00001

diff --git a/testData/results/TestAccessReplace.dec b/testData/results/TestAccessReplace.dec
new file mode 100644
index 0000000..1177aa2
--- /dev/null
+++ b/testData/results/TestAccessReplace.dec
@@ -0,0 +1,69 @@
+package pkg;
+
+public class TestAccessReplace {
+   private static void fooS() {
+   }// 19
+
+   private void foo() {
+   }// 20
+
+   private static void fooSParams(long a, long b) {
+   }// 21
+
+   private void fooParams(long a, long b) {
+   }// 22
+
+   public class Inner {
+      public Inner(String b) {
+         TestAccessReplace.fooS();// 25
+         TestAccessReplace.this.foo();
+         TestAccessReplace.fooSParams(1L, 2L);// 28
+         TestAccessReplace.this.fooParams(1L, 2L);// 29
+      }// 30
+   }
+}
+
+class 'pkg/TestAccessReplace' {
+   method 'fooS ()V' {
+      0      4
+   }
+
+   method 'foo ()V' {
+      0      7
+   }
+
+   method 'fooSParams (JJ)V' {
+      0      10
+   }
+
+   method 'fooParams (JJ)V' {
+      0      13
+   }
+}
+
+class 'pkg/TestAccessReplace$Inner' {
+   method '<init> (Lpkg/TestAccessReplace;Ljava/lang/String;)V' {
+      0      17
+      1      18
+      2      19
+      3      20
+      10      19
+      11      19
+      18      20
+      19      20
+      1f      21
+   }
+}
+
+Lines mapping:
+19 <-> 5
+20 <-> 8
+21 <-> 11
+22 <-> 14
+25 <-> 18
+28 <-> 20
+29 <-> 21
+30 <-> 22
+Not mapped:
+26
+27
diff --git a/testData/src/pkg/TestAccessReplace.java b/testData/src/pkg/TestAccessReplace.java
new file mode 100644
index 0000000..e5a21bc
--- /dev/null
+++ b/testData/src/pkg/TestAccessReplace.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public class TestAccessReplace {
+  private static void fooS() {};
+  private void foo() {};
+  private static void fooSParams(long a, long b) {};
+  private void fooParams(long a, long b) {};
+
+  public class Inner {
+    public Inner(String b) {
+      fooS();
+      foo();
+      fooSParams(1,2);
+      fooParams(1,2);
+    }
+  }
+}

From f53a873116342516ddd358a0eee8feaa9fd6dcdf Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 7 Feb 2017 17:51:02 +0300
Subject: [PATCH 090/252] IDEA-167346 Do not escape single quote in strings

---
 .../modules/decompiler/exps/ConstExprent.java |  34 ++++++++--------
 .../java/decompiler/SingleClassesTest.java    |   6 ++-
 testData/classes/pkg/TestStringLiterals.class | Bin 0 -> 534 bytes
 testData/results/TestStringLiterals.dec       |  38 ++++++++++++++++++
 testData/src/pkg/TestStringLiterals.java      |  25 ++++++++++++
 5 files changed, 84 insertions(+), 19 deletions(-)
 create mode 100644 testData/classes/pkg/TestStringLiterals.class
 create mode 100644 testData/results/TestStringLiterals.dec
 create mode 100644 testData/src/pkg/TestStringLiterals.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index e82fec7..962bb77 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,17 +33,17 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class ConstExprent extends Exprent {
-  private static final Map<Integer, String> ESCAPES;
+  private static final Map<Integer, String> CHAR_ESCAPES;
   static {
-    ESCAPES = new HashMap<>();
-    ESCAPES.put(new Integer(0x8), "\\b");   /* \u0008: backspace BS */
-    ESCAPES.put(new Integer(0x9), "\\t");   /* \u0009: horizontal tab HT */
-    ESCAPES.put(new Integer(0xA), "\\n");   /* \u000a: linefeed LF */
-    ESCAPES.put(new Integer(0xC), "\\f");   /* \u000c: form feed FF */
-    ESCAPES.put(new Integer(0xD), "\\r");   /* \u000d: carriage return CR */
-    ESCAPES.put(new Integer(0x22), "\\\""); /* \u0022: double quote " */
-    ESCAPES.put(new Integer(0x27), "\\\'"); /* \u0027: single quote ' */
-    ESCAPES.put(new Integer(0x5C), "\\\\"); /* \u005c: backslash \ */
+    CHAR_ESCAPES = new HashMap<>();
+    CHAR_ESCAPES.put(new Integer(0x8), "\\b");   /* \u0008: backspace BS */
+    CHAR_ESCAPES.put(new Integer(0x9), "\\t");   /* \u0009: horizontal tab HT */
+    CHAR_ESCAPES.put(new Integer(0xA), "\\n");   /* \u000a: linefeed LF */
+    CHAR_ESCAPES.put(new Integer(0xC), "\\f");   /* \u000c: form feed FF */
+    CHAR_ESCAPES.put(new Integer(0xD), "\\r");   /* \u000d: carriage return CR */
+    //CHAR_ESCAPES.put(new Integer(0x22), "\\\""); /* \u0022: double quote " */
+    CHAR_ESCAPES.put(new Integer(0x27), "\\\'"); /* \u0027: single quote ' */
+    CHAR_ESCAPES.put(new Integer(0x5C), "\\\\"); /* \u005c: backslash \ */
   }
 
   private VarType constType;
@@ -130,7 +130,7 @@ public class ConstExprent extends Exprent {
 
       case CodeConstants.TYPE_CHAR:
         Integer val = (Integer)value;
-        String ret = ESCAPES.get(val);
+        String ret = CHAR_ESCAPES.get(val);
         if (ret == null) {
           char c = (char)val.intValue();
           if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
@@ -140,7 +140,7 @@ public class ConstExprent extends Exprent {
             ret = TextUtil.charToUnicodeLiteral(c);
           }
         }
-        return new TextBuffer().append('\'').append(ret).append('\'');
+        return new TextBuffer(ret).enclose("'", "'");
 
       case CodeConstants.TYPE_BYTE:
       case CodeConstants.TYPE_BYTECHAR:
@@ -235,7 +235,7 @@ public class ConstExprent extends Exprent {
 
       case CodeConstants.TYPE_OBJECT:
         if (constType.equals(VarType.VARTYPE_STRING)) {
-          return new TextBuffer().append('"').append(convertStringToJava(value.toString(), ascii)).append('"');
+          return new TextBuffer(convertStringToJava(value.toString(), ascii)).enclose("\"", "\"");
         }
         else if (constType.equals(VarType.VARTYPE_CLASS)) {
           String stringVal = value.toString();
@@ -274,9 +274,9 @@ public class ConstExprent extends Exprent {
         case 0x22: //"\\\\\""); // u0022: double quote "
           buffer.append("\\\"");
           break;
-        case 0x27: //"\\\\'");  // u0027: single quote '
-          buffer.append("\\\'");
-          break;
+        //case 0x27: //"\\\\'");  // u0027: single quote '
+        //  buffer.append("\\\'");
+        //  break;
         default:
           if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
             buffer.append(c);
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 8b876c8..2388d8d 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -22,9 +22,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
 import static org.junit.Assert.assertTrue;
@@ -98,6 +99,7 @@ public class SingleClassesTest {
   @Test public void testAnonymousParamNames() { doTest("pkg/TestAnonymousParamNames"); }
   @Test public void testAnonymousParams() { doTest("pkg/TestAnonymousParams"); }
   @Test public void testAccessReplace() { doTest("pkg/TestAccessReplace"); }
+  @Test public void testStringLiterals() { doTest("pkg/TestStringLiterals"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestStringLiterals.class b/testData/classes/pkg/TestStringLiterals.class
new file mode 100644
index 0000000000000000000000000000000000000000..f4cb2b9568d3e936cfb164a575f43dfb2f01d16c
GIT binary patch
literal 534
zcmZut$xZ@65Pc1^F%HrqiyJOnz$KCxF9u^YCZ2Ffa7ZR_8K5PtFc=t2{470SVvHZ)
zM;WW(V2JkNRrTvvRj>N%`~4HZAvSH8;1(8QNMg}O3TXuy6Il~W492kxWO%|5EpFEs
zwDW#jFeEB65LcsKQw(nXW|tVP=gWX0Q><6+{U^WF^@C2S8V+R8DXT)e+8+&C;zBBM
z_ErqT>0?EPV&Hd&`>M);g&4!U-)vbi+ll83jkdTmvFu<4t0vYQ<gl(_gGN0*bV`34
zG4Njl*Ufv;3TLS5^Dq=W+NVFFhxF8~?3ZrHs`4cKUYTKW(qoopFdvnuOM9k^|F5YR
z>*w1wY{8&!RVM<bmLjz2mZQih>N{^>FO)FM5gHRRNiqj<%9T_?LzLoKGE(8zhweqW
z<$4;Axt`8#*E6`|dM1y%p2hR7#|>T}G<n0ld_{D342{Cx82ay+40LLkqPA%qAcG@h
Naf&4xI8S^8i60%LY-#`i

literal 0
HcmV?d00001

diff --git a/testData/results/TestStringLiterals.dec b/testData/results/TestStringLiterals.dec
new file mode 100644
index 0000000..c5afe18
--- /dev/null
+++ b/testData/results/TestStringLiterals.dec
@@ -0,0 +1,38 @@
+package pkg;
+
+public class TestStringLiterals {
+   public static void main(String[] var0) {
+      String var1 = "abc\b\t\n\f\r\"'\\def";// 20
+      char[] var2 = new char[]{'\b', '\t', '\n', '\f', '\r', '"', '\'', '\\'};// 21
+      System.out.println(var1);// 22
+      System.out.println(var2);// 23
+   }// 24
+}
+
+class 'pkg/TestStringLiterals' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      4
+      2      4
+      9      5
+      e      5
+      13      5
+      18      5
+      1d      5
+      22      5
+      28      5
+      2e      5
+      31      5
+      32      6
+      36      6
+      39      7
+      3d      7
+      40      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+21 <-> 6
+22 <-> 7
+23 <-> 8
+24 <-> 9
diff --git a/testData/src/pkg/TestStringLiterals.java b/testData/src/pkg/TestStringLiterals.java
new file mode 100644
index 0000000..ebefa32
--- /dev/null
+++ b/testData/src/pkg/TestStringLiterals.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public class TestStringLiterals {
+  public static void main(String[] args) {
+    String a = "abc\b\t\n\f\r\"'\\def";
+    char chars[] = {'\b', '\t', '\n', '\f', '\r', '"', '\'', '\\'};
+    System.out.println(a);
+    System.out.println(chars);
+  }
+}

From 024978848c5ebe05de8b7e11f6f0827d3a219c0d Mon Sep 17 00:00:00 2001
From: DMP9 <dylanperks23@gmail.com>
Date: Sat, 11 Feb 2017 19:32:41 +0000
Subject: [PATCH 091/252] Fernflower readme markdown

---
 readme.txt => README.md | 67 ++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 34 deletions(-)
 rename readme.txt => README.md (60%)

diff --git a/readme.txt b/README.md
similarity index 60%
rename from readme.txt
rename to README.md
index cd47656..28b82dc 100644
--- a/readme.txt
+++ b/README.md
@@ -1,4 +1,4 @@
-1. About the decompiler 
+## About fernflower
 
 Fernflower is the first actually working analytical decompiler for Java and 
 probably for a high-level programming language in general. Naturally it is still 
@@ -6,12 +6,11 @@ under development, please send your bug reports and improvement suggestions at
 fernflower.decompiler@gmail.com
 
 
-2. License
+## Licence
 
-http://www.apache.org/licenses/LICENSE-2.0
+Fernflower is licenced under the Apache Licence Version 2.0. It can be found here: http://www.apache.org/licenses/LICENSE-2.0
 
-
-3. Running from the command line
+## Running from command line
 
 java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>
 
@@ -24,14 +23,14 @@ java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>
 <destination>: destination directory 
 <option>,<value>: command line option with the corresponding value, see 4.
 
-Examples:
+### Examples
 
 java -jar fernflower.jar -hes=0 -hdc=0 c:\Temp\binary\ -e=c:\Java\rt.jar c:\Temp\source\
 
 java -jar fernflower.jar -dgs=1 c:\Temp\binary\library.jar c:\Temp\binary\Boot.class c:\Temp\source\
 
 
-4. Command line options
+## Command line options
 
 With the exception of mpm and urc the value of 1 means the option is activated, 0 - deactivated. Default 
 value, if any, is given between parentheses.
@@ -39,39 +38,39 @@ value, if any, is given between parentheses.
 Typically, the following options will be changed by user, if any: hes, hdc, dgs, mpm, ren, urc 
 The rest of options can be left as they are: they are aimed at professional reverse engineers.
 
-rbr (1): hide bridge methods
-rsy (0): hide synthetic class members
-din (1): decompile inner classes
-dc4 (1): collapse 1.4 class references
-das (1): decompile assertions
-hes (1): hide empty super invocation
-hdc (1): hide empty default constructor
-dgs (0): decompile generic signatures
-ner (1): assume return not throwing exceptions
-den (1): decompile enumerations
-rgn (1): remove getClass() invocation, when it is part of a qualified new statement
-lit (0): output numeric literals "as-is"
-asc (0): encode non-ASCII characters in string and character literals as Unicode escapes
-bto (1): interpret int 1 as boolean true (workaround to a compiler bug)
-nns (1): allow for not set synthetic attribute (workaround to a compiler bug)
-uto (1): consider nameless types as java.lang.Object (workaround to a compiler architecture flaw)
-udv (1): reconstruct variable names from debug information, if present
-rer (1): remove empty exception ranges
-fdi (1): de-inline finally structures
-mpm (0): maximum allowed processing time per decompiled method, in seconds. 0 means no upper limit
-ren (0): rename ambiguous (resp. obfuscated) classes and class elements
-urc    : full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
+- rbr (1): hide bridge methods
+- rsy (0): hide synthetic class members
+- din (1): decompile inner classes
+- dc4 (1): collapse 1.4 class references
+- das (1): decompile assertions
+- hes (1): hide empty super invocation
+- hdc (1): hide empty default constructor
+- dgs (0): decompile generic signatures
+- ner (1): assume return not throwing exceptions
+- den (1): decompile enumerations
+- rgn (1): remove getClass() invocation, when it is part of a qualified new statement
+- lit (0): output numeric literals "as-is"
+- asc (0): encode non-ASCII characters in string and character literals as Unicode escapes
+- bto (1): interpret int 1 as boolean true (workaround to a compiler bug)
+- nns (1): allow for not set synthetic attribute (workaround to a compiler bug)
+- uto (1): consider nameless types as java.lang.Object (workaround to a compiler architecture flaw)
+- udv (1): reconstruct variable names from debug information, if present
+- rer (1): remove empty exception ranges
+- fdi (1): de-inline finally structures
+- mpm (0): maximum allowed processing time per decompiled method, in seconds. 0 means no upper limit
+- ren (0): rename ambiguous (resp. obfuscated) classes and class elements
+- urc    : full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
          should be renamed and provides new identifier names. For more information see section 5
-inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
-lac (0): decompile lambda expressions to anonymous classes
-nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent
-ind    : indentation string (default is "   " (3 spaces))
+- inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
+- lac (0): decompile lambda expressions to anonymous classes
+- nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent
+- ind    : indentation string (default is "   " (3 spaces))
  
 The default logging level is INFO. This value can be overwritten by setting the option 'log' as follows:
 log (INFO): possible values TRACE, INFO, WARN, ERROR
 
 
-5. Renaming identifiers
+## Renaming identifiers
 
 Some obfuscators give classes and their member elements short, meaningless and above all ambiguous names. Recompiling of such
 code leads to a great number of conflicts. Therefore it is advisable to let the decompiler rename elements in its turn, 

From e09e303e718d9b4369db9921dd7cbe34a52f91ab Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 3 Apr 2017 17:15:31 +0300
Subject: [PATCH 092/252] IDEA-169534 Decompiler overuses ternary operation

---
 .../decompiler/SimplifyExprentsHelper.java    |  11 +-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestIffSimplification.class   | Bin 0 -> 1149 bytes
 testData/results/TestIffSimplification.dec    | 107 ++++++++++++++++++
 testData/src/pkg/TestIffSimplification.java   |  48 ++++++++
 5 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 testData/classes/pkg/TestIffSimplification.class
 create mode 100644 testData/results/TestIffSimplification.dec
 create mode 100644 testData/src/pkg/TestIffSimplification.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index 28b76e9..0be7d59 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -854,6 +854,11 @@ public class SimplifyExprentsHelper {
                 return false;
               }
 
+              // avoid flattening to 'iff' if any of the branches is an 'iff' already
+              if (isIff(ifex.getValue()) || isIff(elseex.getValue())) {
+                return false;
+              }
+
               List<Exprent> data = new ArrayList<>();
               data.addAll(stif.getFirst().getExprents());
 
@@ -880,6 +885,10 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
+  private static boolean isIff(Exprent exp) {
+    return exp.type == Exprent.EXPRENT_FUNCTION && ((FunctionExprent) exp).getFuncType() == FunctionExprent.FUNCTION_IIF;
+  }
+
   static {
     class14Builder.parse(
           "statement type:if iftype:if exprsize:-1\n" +
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 2388d8d..1c2779c 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -93,6 +93,7 @@ public class SingleClassesTest {
   @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
   @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
   @Test public void testIllegalVarName() { doTest("pkg/TestIllegalVarName"); }
+  @Test public void testIffSimplification() { doTest("pkg/TestIffSimplification"); }
   @Test public void testKotlinConstructor() { doTest("pkg/TestKotlinConstructorKt"); }
   @Test public void testAsserts() { doTest("pkg/TestAsserts"); }
   @Test public void testLocalsNames() { doTest("pkg/TestLocalsNames"); }
diff --git a/testData/classes/pkg/TestIffSimplification.class b/testData/classes/pkg/TestIffSimplification.class
new file mode 100644
index 0000000000000000000000000000000000000000..6dcb9b188a2529473af8cf9d8db3321ca9297fe6
GIT binary patch
literal 1149
zcmZ`(O>YuW6g_WdVEC9qTcNgvwrbS^Entm1O=BuCA(`rerY5bMVVKfsfgv#TU%1!A
zq{dA*EOcQsE?m0szqmB+jOPs$Yoa9c-o5wTd(J)gz3}bV=Pv;6;Z6);<YLI95Z-$C
z_2-)p-(Toh*RdfGe&BXoe@j5k<@W@%M_$7bNSbcPc`|6%o!+ihZ!t1!dbZWtvwE)d
z$3e|Ma{B@qvwPAk?>c?IdU#lK+ufFX=-QU=dY$_M(Y}m0JR)0e|Dc+$(&+n^KVYrc
zr*mqx1`ZwNfJaj`-?C43tnQd3a#1f3>5#)|REebL_Qz0B+v_x3Nk%T)Yj>@lv+D`O
zbJgnhcBN7c2-UW|NjBosx=W#UzbOOTBa@ME-}ZWrj8!finb+`Sq1@=jYTlq{JC9vC
zlEr^2E*)E^mH{0R9Yq5rlm!<4J0F2*nO|;Moo4xI{n)X6fyAHCj^!V*WvkBVXt_$h
zg6jzJHsvn_jsX#_QF>+WLPiT8A>Pwa5aSvi1reuhjBNu`^vHuGS6Tdw*(&!$<`tqF
zYUv!|4Xrd}M7@Nf2PoG@nM9K)tid#90^|f{afL`JMnh0yoUK55LUJ%BF-W45WcU|F
zB7luUBXEQ@vf&YxF`+UhRK_JL6+#YS4p+HKHK!!fxTi>z%#y4aDh-PyEMC?$#~zu(
z%rpt-NU}iqrGU6Fs-F<2Cd4VsQ>_wIO0{aBR)b=&4I(U#d-y>FDZ$KS&p6iXTj<(3
zG-bGy*3OXRI*H7O=Jn<$C@H8fUt>BQO~-hqFk2hSGX}@C#2ekmGA|yuK?SSq>^8e!
zqgTKt*0IGmCz+oIvoI$bOk|K{ckGEOvw;Q^%UB5pZ*tfxfohXaOd`v?Ra%nC#7$Pn
d*_yaTD;B7pK|Jx0e-``}_{I4NHY1<j+HXhFs)GOk

literal 0
HcmV?d00001

diff --git a/testData/results/TestIffSimplification.dec b/testData/results/TestIffSimplification.dec
new file mode 100644
index 0000000..26940dc
--- /dev/null
+++ b/testData/results/TestIffSimplification.dec
@@ -0,0 +1,107 @@
+package pkg;
+
+public class TestIffSimplification {
+   public int simpleIff(boolean status, int[] values) {
+      return status?values[0]:values[1];// 7
+   }
+
+   public int simpleIf(boolean status, int[] values) {
+      return status?values[0]:values[1];// 11 12 15
+   }
+
+   public int nestedIf(boolean status, boolean condition, int[] values) {
+      if(status) {// 20
+         return condition?values[2]:values[0];// 21 22 25
+      } else {
+         return values[1];// 29
+      }
+   }
+
+   public int compareTo(int mc1, int mc2, byte csg1, byte csg2, double score1, double score2, int doc1, int doc2) {
+      if(mc1 != mc2) {// 34
+         return mc1 < mc2?1:-1;// 35
+      } else if(csg1 != csg2) {// 38
+         return csg1 < csg2?1:-1;// 39
+      } else if(Math.abs(score1 - score2) < 1.0E-6D) {// 42
+         return doc1 < doc2?-1:1;// 43
+      } else {
+         return score1 < score2?1:-1;// 46
+      }
+   }
+}
+
+class 'pkg/TestIffSimplification' {
+   method 'simpleIff (Z[I)I' {
+      1      4
+      5      4
+      6      4
+      b      4
+      c      4
+      d      4
+   }
+
+   method 'simpleIf (Z[I)I' {
+      1      8
+      5      8
+      6      8
+      9      8
+      a      8
+   }
+
+   method 'nestedIf (ZZ[I)I' {
+      1      12
+      5      13
+      9      13
+      a      13
+      d      13
+      e      13
+      11      15
+      12      15
+      13      15
+   }
+
+   method 'compareTo (IIBBDDII)I' {
+      2      20
+      7      21
+      a      21
+      e      21
+      f      21
+      13      22
+      19      23
+      1c      23
+      20      23
+      21      23
+      26      24
+      27      24
+      2a      24
+      2d      24
+      2e      24
+      35      25
+      38      25
+      3c      25
+      3d      25
+      42      27
+      43      27
+      46      27
+      4a      27
+      4b      27
+   }
+}
+
+Lines mapping:
+7 <-> 5
+11 <-> 9
+12 <-> 9
+15 <-> 9
+20 <-> 13
+21 <-> 14
+22 <-> 14
+25 <-> 14
+29 <-> 16
+34 <-> 21
+35 <-> 22
+38 <-> 23
+39 <-> 24
+42 <-> 25
+43 <-> 26
+46 <-> 28
diff --git a/testData/src/pkg/TestIffSimplification.java b/testData/src/pkg/TestIffSimplification.java
new file mode 100644
index 0000000..5b87363
--- /dev/null
+++ b/testData/src/pkg/TestIffSimplification.java
@@ -0,0 +1,48 @@
+package pkg;
+
+import java.lang.Math;
+
+public class TestIffSimplification {
+    public int simpleIff(boolean status, int[] values) {
+        return status ? values[0] : values[1];
+    }
+
+    public int simpleIf(boolean status, int[] values) {
+        if (status) {
+            return values[0];
+        }
+        else {
+            return values[1];
+        }
+    }
+
+    public int nestedIf(boolean status, boolean condition, int[] values) {
+        if (status) {
+            if (condition) {
+                return values[2];
+            }
+            else {
+                return values[0];
+            }
+        }
+        else {
+            return values[1];
+        }
+    }
+
+    public int compareTo(int mc1, int mc2, byte csg1, byte csg2, double score1, double score2, int doc1, int doc2) {
+        if (mc1 != mc2) {
+            return mc1 < mc2 ? 1 : -1;
+        }
+
+        if (csg1 != csg2) {
+            return csg1 < csg2 ? 1 : -1;
+        }
+
+        if (Math.abs(score1 - score2) < 1e-6) {
+            return doc1 < doc2 ? -1 : 1;
+        }
+
+        return score1 < score2 ? 1 : -1;
+    }
+}
\ No newline at end of file

From d706718b1b22dfe2e378bd06c21c2cd8a8b194c7 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 4 Apr 2017 17:03:49 +0300
Subject: [PATCH 093/252] added spaces after if and inside the ternary operator

---
 .../decompiler/exps/FunctionExprent.java      | 16 +++++++-------
 .../modules/decompiler/exps/IfExprent.java    |  4 ++--
 .../decompiler/stats/CatchAllStatement.java   |  4 ++--
 testData/bulk/pkg/res/Loader.java             |  2 +-
 testData/results/TestAnonymousClass.dec       |  2 +-
 testData/results/TestClassCast.dec            |  2 +-
 testData/results/TestClassLoop.dec            | 12 +++++-----
 .../TestClassSimpleBytecodeMapping.dec        |  2 +-
 testData/results/TestClassTypes.dec           |  8 +++----
 testData/results/TestClassVar.dec             |  4 ++--
 testData/results/TestIffSimplification.dec    | 22 +++++++++----------
 testData/results/TestKotlinConstructorKt.dec  |  2 +-
 testData/results/TestLocalsNames.dec          |  2 +-
 testData/results/TestThrowException.dec       |  2 +-
 testData/results/TestTryCatchFinally.dec      |  4 ++--
 15 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index faaa6d2..6662965 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -485,9 +485,9 @@ public class FunctionExprent extends Exprent {
         return res.append(".length");
       case FUNCTION_IIF:
         return wrapOperandString(lstOperands.get(0), true, indent, tracer)
-          .append("?")
+          .append(" ? ")
           .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
-          .append(":")
+          .append(" : ")
           .append(wrapOperandString(lstOperands.get(2), true, indent, tracer));
       case FUNCTION_IPP:
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).append("++");
@@ -501,27 +501,27 @@ public class FunctionExprent extends Exprent {
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).append(" instanceof ").append(wrapOperandString(lstOperands.get(1), true, indent, tracer));
       case FUNCTION_LCMP: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__lcmp__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_FCMPL: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpl__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_FCMPG: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpg__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_DCMPL: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpl__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_DCMPG: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpg__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
index be4d6f6..d1537bd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ public class IfExprent extends Exprent {
   @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     tracer.addMapping(bytecode);
-    return condition.toJava(indent, tracer).enclose("if(", ")");
+    return condition.toJava(indent, tracer).enclose("if (", ")");
   }
 
   @Override
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 4b06411..c6f90d8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -144,7 +144,7 @@ public class CatchAllStatement extends Statement {
     tracer.incrementCurrentSourceLine();
 
     if (monitor != null) {
-      buf.appendIndent(indent+1).append("if(").append(monitor.toJava(indent, tracer)).append(") {").appendLineSeparator();
+      buf.appendIndent(indent+1).append("if (").append(monitor.toJava(indent, tracer)).append(") {").appendLineSeparator();
       tracer.incrementCurrentSourceLine();
     }
 
diff --git a/testData/bulk/pkg/res/Loader.java b/testData/bulk/pkg/res/Loader.java
index 22a31bb..cdb1db5 100644
--- a/testData/bulk/pkg/res/Loader.java
+++ b/testData/bulk/pkg/res/Loader.java
@@ -7,7 +7,7 @@ import java.net.URL;
 public class Loader {
    public String getResource() {
       URL resource = this.getClass().getClassLoader().getResource("pkg/res/resource.txt");
-      if(resource == null) {
+      if (resource == null) {
          throw new RuntimeException("Resource missing");
       } else {
          try {
diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
index 75d1df2..924b764 100644
--- a/testData/results/TestAnonymousClass.dec
+++ b/testData/results/TestAnonymousClass.dec
@@ -45,7 +45,7 @@ public abstract class TestAnonymousClass {
    };
 
    void foo(int var1) throws Exception {
-      if(var1 > 0) {// 10
+      if (var1 > 0) {// 10
          TestAnonymousClass.I var2 = new TestAnonymousClass.I() {
             public void foo() throws Exception {
                boolean var1 = true;// 13
diff --git a/testData/results/TestClassCast.dec b/testData/results/TestClassCast.dec
index c45fad8..e807294 100644
--- a/testData/results/TestClassCast.dec
+++ b/testData/results/TestClassCast.dec
@@ -6,7 +6,7 @@ import java.util.List;
 public class TestClassCast {
    public void test(List var1) {
       Object var2 = var1;// 22
-      if(var1 != null) {// 23
+      if (var1 != null) {// 23
          ((List)(var2 = new ArrayList(var1))).add("23");// 24
       }
 
diff --git a/testData/results/TestClassLoop.dec b/testData/results/TestClassLoop.dec
index 0ea725e..ba29595 100644
--- a/testData/results/TestClassLoop.dec
+++ b/testData/results/TestClassLoop.dec
@@ -12,7 +12,7 @@ public class TestClassLoop {
 
       while(true) {
          try {
-            if(!var0) {// 33
+            if (!var0) {// 33
                return;// 34
             }
          } finally {
@@ -30,7 +30,7 @@ public class TestClassLoop {
                System.out.println("1");// 49
                break;
             } finally {
-               if(var0) {// 52
+               if (var0) {// 52
                   System.out.println("3");// 53
                   continue;// 54
                }
@@ -51,19 +51,19 @@ public class TestClassLoop {
 
       for(boolean var8 = false; var2 < var1; ++var2) {// 70 73 90
          char var6 = var0.charAt(var2);// 74
-         if(var6 == 48) {// 75
+         if (var6 == 48) {// 75
             ++var7;// 76
          } else {
-            if(var6 != 46) {// 77
+            if (var6 != 46) {// 77
                break;
             }
 
-            if(var3) {// 78
+            if (var3) {// 78
                throw new NumberFormatException("multiple points");// 80
             }
 
             var5 = var2;// 82
-            if(var4) {// 83
+            if (var4) {// 83
                var5 = var2 - 1;// 84
             }
 
diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
index a48375a..8883fab 100644
--- a/testData/results/TestClassSimpleBytecodeMapping.dec
+++ b/testData/results/TestClassSimpleBytecodeMapping.dec
@@ -9,7 +9,7 @@ public class TestClassSimpleBytecodeMapping {
          }// 18
       });
       this.test2("1");// 21
-      if(Math.random() > 0.0D) {// 23
+      if (Math.random() > 0.0D) {// 23
          System.out.println("0");// 24
          return 0;// 25
       } else {
diff --git a/testData/results/TestClassTypes.dec b/testData/results/TestClassTypes.dec
index c957f3f..1b76bbb 100644
--- a/testData/results/TestClassTypes.dec
+++ b/testData/results/TestClassTypes.dec
@@ -7,13 +7,13 @@ public class TestClassTypes {
    public void testBoolean() {
       byte var1 = 0;// 25
       long var2 = System.currentTimeMillis();// 26
-      if(var2 % 2L > 0L) {// 28
+      if (var2 % 2L > 0L) {// 28
          var1 = 1;// 29
-      } else if(var2 % 3L > 0L) {// 31
+      } else if (var2 % 3L > 0L) {// 31
          var1 = 2;// 32
       }
 
-      if(var1 == 1) {// 35
+      if (var1 == 1) {// 35
          System.out.println();// 36
       }
 
@@ -40,7 +40,7 @@ public class TestClassTypes {
 
    public void testAssignmentType(List var1) {
       Object var2 = var1;// 61
-      if(var1 != null) {// 63
+      if (var1 != null) {// 63
          ((List)(var2 = new ArrayList(var1))).add("23");// 64
       }
 
diff --git a/testData/results/TestClassVar.dec b/testData/results/TestClassVar.dec
index 548c6f4..fb7cb0f 100644
--- a/testData/results/TestClassVar.dec
+++ b/testData/results/TestClassVar.dec
@@ -9,7 +9,7 @@ public class TestClassVar {
          try {
             System.out.println();// 29
          } finally {
-            if(this.field_boolean) {// 32
+            if (this.field_boolean) {// 32
                System.out.println();// 33
             }
 
@@ -31,7 +31,7 @@ public class TestClassVar {
             ;
          }
 
-         if(var2 != var1) {// 54
+         if (var2 != var1) {// 54
             System.out.println();// 55
          }
       }
diff --git a/testData/results/TestIffSimplification.dec b/testData/results/TestIffSimplification.dec
index 26940dc..595c4cb 100644
--- a/testData/results/TestIffSimplification.dec
+++ b/testData/results/TestIffSimplification.dec
@@ -2,30 +2,30 @@ package pkg;
 
 public class TestIffSimplification {
    public int simpleIff(boolean status, int[] values) {
-      return status?values[0]:values[1];// 7
+      return status ? values[0] : values[1];// 7
    }
 
    public int simpleIf(boolean status, int[] values) {
-      return status?values[0]:values[1];// 11 12 15
+      return status ? values[0] : values[1];// 11 12 15
    }
 
    public int nestedIf(boolean status, boolean condition, int[] values) {
-      if(status) {// 20
-         return condition?values[2]:values[0];// 21 22 25
+      if (status) {// 20
+         return condition ? values[2] : values[0];// 21 22 25
       } else {
          return values[1];// 29
       }
    }
 
    public int compareTo(int mc1, int mc2, byte csg1, byte csg2, double score1, double score2, int doc1, int doc2) {
-      if(mc1 != mc2) {// 34
-         return mc1 < mc2?1:-1;// 35
-      } else if(csg1 != csg2) {// 38
-         return csg1 < csg2?1:-1;// 39
-      } else if(Math.abs(score1 - score2) < 1.0E-6D) {// 42
-         return doc1 < doc2?-1:1;// 43
+      if (mc1 != mc2) {// 34
+         return mc1 < mc2 ? 1 : -1;// 35
+      } else if (csg1 != csg2) {// 38
+         return csg1 < csg2 ? 1 : -1;// 39
+      } else if (Math.abs(score1 - score2) < 1.0E-6D) {// 42
+         return doc1 < doc2 ? -1 : 1;// 43
       } else {
-         return score1 < score2?1:-1;// 46
+         return score1 < score2 ? 1 : -1;// 46
       }
    }
 }
diff --git a/testData/results/TestKotlinConstructorKt.dec b/testData/results/TestKotlinConstructorKt.dec
index f032804..d1e3f7b 100644
--- a/testData/results/TestKotlinConstructorKt.dec
+++ b/testData/results/TestKotlinConstructorKt.dec
@@ -23,7 +23,7 @@ public final class TestKotlinConstructorKt {
          Object item$iv$iv = var4.next();
          String it = (String)item$iv$iv;// 12
          Mapping var10000 = new Mapping;
-         if(it == null) {// 3
+         if (it == null) {// 3
             throw new TypeCastException("null cannot be cast to non-null type kotlin.String");
          }
 
diff --git a/testData/results/TestLocalsNames.dec b/testData/results/TestLocalsNames.dec
index a5dc96f..fe6fe79 100644
--- a/testData/results/TestLocalsNames.dec
+++ b/testData/results/TestLocalsNames.dec
@@ -4,7 +4,7 @@ import java.io.File;
 
 public class TestLocalsNames {
    private static void rename(File file, boolean recursively) {
-      if(file.isDirectory()) {// 22
+      if (file.isDirectory()) {// 22
          long start = System.currentTimeMillis();// 23
          File[] files = file.listFiles();// 25
          File[] var5 = files;
diff --git a/testData/results/TestThrowException.dec b/testData/results/TestThrowException.dec
index eae0e70..7c52234 100644
--- a/testData/results/TestThrowException.dec
+++ b/testData/results/TestThrowException.dec
@@ -4,7 +4,7 @@ public class TestThrowException {
    Runnable r;
 
    public TestThrowException(int var1) {
-      if(var1 > 0) {// 9
+      if (var1 > 0) {// 9
          throw new IllegalArgumentException("xxx");// 10
       } else {
          this.r = new Runnable() {// 12
diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
index 772a76e..092564e 100644
--- a/testData/results/TestTryCatchFinally.dec
+++ b/testData/results/TestTryCatchFinally.dec
@@ -17,9 +17,9 @@ public class TestTryCatchFinally {
    }// 36
 
    int foo(int var1) throws Exception {
-      if(var1 < 1) {// 39
+      if (var1 < 1) {// 39
          throw new RuntimeException();// 40
-      } else if(var1 < 5) {// 41
+      } else if (var1 < 5) {// 41
          return var1;// 42
       } else {
          throw new Exception();// 45

From fdf34d9be209fa863c177d54782b288eb5ba57a6 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Thu, 13 Apr 2017 12:45:45 +0700
Subject: [PATCH 094/252] DataPoint: useless check removed (already handled in
 previous branch)

---
 src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
index 546c5a5..e067999 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,9 +43,6 @@ public class DataPoint {
     if (index < localVariables.size()) {
       return localVariables.get(index);
     }
-    else if (index < 0) {
-      throw new IndexOutOfBoundsException();
-    }
     else {
       return new VarType(CodeConstants.TYPE_NOTINITIALIZED);
     }

From 4beda48cf85d992fcd31117504be2e6bc485cb40 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 13 Apr 2017 20:04:30 +0300
Subject: [PATCH 095/252] IDEABKL-7547 Decompiler fails to rename class which
 consists of digits only

---
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 71dc351..4625fe7 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public class ConverterHelper implements IIdentifierRenamer {
     }
 
     int index = 0;
-    while (Character.isDigit(shortName.charAt(index))) {
+    while (index < shortName.length() && Character.isDigit(shortName.charAt(index))) {
       index++;
     }
 

From cd1acfa266b2245994b6f8fa399f308bd4dab7a2 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Fri, 14 Apr 2017 00:00:42 +0200
Subject: [PATCH 096/252] IDEA-171459 fix type cast for int literals used as
 byte / short in decompiled code

---
 .../modules/decompiler/ExprProcessor.java     |   2 +-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestPrimitives.class     | Bin 0 -> 2632 bytes
 testData/results/MoreAnnotations.dec          |   8 +-
 testData/results/TestPrimitives.dec           | 221 ++++++++++++++++++
 testData/src/pkg/TestPrimitives.java          |  66 ++++++
 6 files changed, 293 insertions(+), 5 deletions(-)
 create mode 100644 testData/classes/pkg/TestPrimitives.class
 create mode 100644 testData/results/TestPrimitives.dec
 create mode 100644 testData/src/pkg/TestPrimitives.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index cffc5ac..1b834a0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -876,7 +876,7 @@ public class ExprProcessor implements CodeConstants {
       castAlways ||
       (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
       (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
-      (isIntConstant(exprent) && rightType.isStrictSuperset(leftType));
+      (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
 
     boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
 
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 1c2779c..ba2429f 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -101,6 +101,7 @@ public class SingleClassesTest {
   @Test public void testAnonymousParams() { doTest("pkg/TestAnonymousParams"); }
   @Test public void testAccessReplace() { doTest("pkg/TestAccessReplace"); }
   @Test public void testStringLiterals() { doTest("pkg/TestStringLiterals"); }
+  @Test public void testPrimitives() { doTest("pkg/TestPrimitives"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
new file mode 100644
index 0000000000000000000000000000000000000000..77d091354d71f969eb2dc6aa4bea17012bd698fb
GIT binary patch
literal 2632
zcmaKt`%@cL6vw|eS+Zf-LPEkrsY0cZG^I_gRa?Q*0;Ynopo=Kf*Cs4sX_CdTK`B1)
z{eHil@i%{TI-@_tj5GQN_+R)p_`Bn|cQ?yIyUk2??>Xn5&pqefbMF5A-yeSgID;P*
z#IdO0D4ybvr}<-vKbG6b&VM^xx*|>dwDB_^JrkMu_j>Z$KbNj^=~@1Gt{u<gg(!3x
z1uhpAtia%-RRtxi@sX)u9as6Nte}Fb0t*`oUPLX5%_wXIb!<iPl7g49t>7AVqIgBY
zt9VVu>kN@`vufJs8N%sfiwx3~wPG-I<;|*bxn3z4wFSLUCQWzVD(dA$y=HRRRZ8}n
zxyg{sZ(J>97mQ7NzGhZT+uSlX#~7j;HM448ESDKnF`TrlvY}ULmGm-Sj1}m=%+T&w
zw{2QSN>2*YB!eQ<+L~3fxn2``T8?Qg_Doe+W`xBg%S;QFx2h%XG%HLL0h?_Bb7e~x
zZaHCFC0mZ6Lo7CJ)kU^adRiD)$T;0%POa%R&YTjaBAKR$Su$)dFWN&&N9HP#49S#7
zlw>yxQc&;_Qi#w=q=*&Gs@IA}&gA=?*uRY@*Yz!3MGAMTIDwNY?!jr5s_Q-#XK_x&
zI37}Q0T)$F<6#w#U`EESiZ}2kLuaZmI+R*z{TX5$mM!bmQg*JeZWL`5c|0cLEfsI$
z9Tk@`C*xf%yr*IwkIQ(U3m>R>0-B5ux$u#Uk5znvPi1_j;&Xh#5K7TGhEgjszT`8$
z;=-zouetDzjBok-JFYCs_?`<tP&wULG5g}vwl{5~LRD$i>8yJ4B68Ep&hwJe?3$rh
zsKVlV33+EAZ|UW_F-OPROI7ALij>_M<ksnP6X%qmqVvxrB~9zvo8}&0l8VqbPiXgt
zLC0#83@Ve}^o)P1tEb7nL!dlNUZ#;%t5)GPc`ogz3+vbwpUOG4F+bR05I1p?EuvZ!
zWnHG8>$wS=7qV|NoTf=o)A-ip%Ke++Hc&F1^Uo97{rR=JsfW7BM|9L)$l`E#Z|Oyw
z?_57Mm~Xac8N(5}<l^G$>;&UILC+DAv-D>4Zp-`*_A3oSNYgVSlwlmBvFc1f2FFQa
z81<Z+?!5Jk)IcZ`+i4)2i8I!KB!sq15|IX?neO%m6cRcbIFyMkH_-VTy1HZXpNKDo
zGYxb%k<gYT8YP?P(U#h1)Z0X#wiKaJe-pQ9P2AqVz+QwIC?d`_$ml>6-DpQY=>|zk
zQOu(_gwyDPiI^{obuSCL5hxeF1#^@|h~9lXro)nmX@CcGa7jf>OQ07?f$VkMTqFT#
zH%}3i@tfvm@H;$sPXN4+;QfK{dj*_suv^3X0^kD#KO6wR9}fsP-Hf+}-*^(vwhR({
zC;<K-#sr*hTn{cI+}d+@TLzoBGa&L|f*%clpT~rN(@pNdeFr+|?D=pLLjmv+f~N!E
zlb8~4`a*bcU*s-)q=_Q|@Z$s@4S?rxNx<pL<H3EA-{n=yZ~#0@@KXWsSv)G>^p$eq
zqe7+*5C1|t@9*<7g5mUe$m<aLq`96aT+eW9_n_-ppKI82r4OL%%A1VeFH(FL2YttV
bzLMul-%HnbZ`sU2*9$(^y=50fUQhlH-~r95

literal 0
HcmV?d00001

diff --git a/testData/results/MoreAnnotations.dec b/testData/results/MoreAnnotations.dec
index 37302cc..d7287c1 100644
--- a/testData/results/MoreAnnotations.dec
+++ b/testData/results/MoreAnnotations.dec
@@ -33,11 +33,11 @@ public @interface MoreAnnotations {
    String annotatedWithEmptyArrays = "";
    @MoreAnnotations(
       intArray = {1, 0, 2147483647, -2147483648},
-      byteArray = {1, 0, 127, -128, -1},
+      byteArray = {(byte)1, (byte)0, (byte)127, (byte)-128, (byte)-1},
       floatArray = {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0},
       doubleArray = {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0, 1.0D / 0.0, -1.0D / 0.0},
       booleanArray = {true, false},
-      shortArray = {1, 0, 32767, -32768, -1},
+      shortArray = {(short)1, (short)0, (short)32767, (short)-32768, (short)-1},
       longArray = {1L, 0L, 9223372036854775807L, -9223372036854775808L},
       charArray = {'a', '\n', '\u0001', '\u0000', '\uffff', '\u0000'},
       enumArray = {MoreAnnotations.TestEnum.FirstValue, MoreAnnotations.TestEnum.SecondValue},
@@ -73,7 +73,7 @@ public @interface MoreAnnotations {
 
    int[] intArray() default {1, 0, 2147483647, -2147483648};
 
-   byte[] byteArray() default {1, 0, 127, -128, -1};
+   byte[] byteArray() default {(byte)1, (byte)0, (byte)127, (byte)-128, (byte)-1};
 
    float[] floatArray() default {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0};
 
@@ -81,7 +81,7 @@ public @interface MoreAnnotations {
 
    boolean[] booleanArray() default {true, false};
 
-   short[] shortArray() default {1, 0, 32767, -32768, -1};
+   short[] shortArray() default {(short)1, (short)0, (short)32767, (short)-32768, (short)-1};
 
    long[] longArray() default {1L, 0L, 9223372036854775807L, -9223372036854775808L};
 
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
new file mode 100644
index 0000000..dce1a66
--- /dev/null
+++ b/testData/results/TestPrimitives.dec
@@ -0,0 +1,221 @@
+package pkg;
+
+public class TestPrimitives {
+   public void printAll() {
+      this.printBoolean(true);// 6
+      this.printByte((byte)123);// 7
+      this.printShort((short)257);// 8
+      this.printInt(123);// 9
+      this.printLong(123L);// 10
+      this.printFloat(1.23F);// 11
+      this.printDouble(1.23D);// 12
+      this.printChar('Z');// 13
+      System.out.println(String.format("%b, %d, %d, %d", new Object[]{Boolean.valueOf(this.getBoolean()), Byte.valueOf(this.getByte()), Short.valueOf(this.getShort()), Integer.valueOf(this.getInt())}));// 15
+   }// 16
+
+   public void printBoolean(boolean b) {
+      System.out.println(String.format("%b", new Object[]{Boolean.valueOf(b)}));// 19
+   }// 20
+
+   public void printByte(byte b) {
+      System.out.println(String.format("%d", new Object[]{Byte.valueOf(b)}));// 23
+   }// 24
+
+   public void printShort(short s) {
+      System.out.println(String.format("%d", new Object[]{Short.valueOf(s)}));// 27
+   }// 28
+
+   public void printInt(int i) {
+      System.out.println(String.format("%d", new Object[]{Integer.valueOf(i)}));// 31
+   }// 32
+
+   public void printLong(long l) {
+      System.out.println(String.format("%d", new Object[]{Long.valueOf(l)}));// 35
+   }// 36
+
+   public void printFloat(float f) {
+      System.out.println(String.format("%f", new Object[]{Float.valueOf(f)}));// 39
+   }// 40
+
+   public void printDouble(double d) {
+      System.out.println(String.format("%f", new Object[]{Double.valueOf(d)}));// 43
+   }// 44
+
+   public void printChar(char c) {
+      System.out.println(String.format("%c", new Object[]{Character.valueOf(c)}));// 47
+   }// 48
+
+   public boolean getBoolean() {
+      return false;// 52
+   }
+
+   public byte getByte() {
+      return (byte)-128;// 56
+   }
+
+   public short getShort() {
+      return (short)-32768;// 60
+   }
+
+   public int getInt() {
+      return 42;// 64
+   }
+}
+
+class 'pkg/TestPrimitives' {
+   method 'printAll ()V' {
+      1      4
+      2      4
+      6      5
+      8      5
+      c      6
+      f      6
+      13      7
+      15      7
+      19      8
+      1c      8
+      20      9
+      22      9
+      26      10
+      29      10
+      2d      11
+      2f      11
+      32      12
+      35      12
+      3e      12
+      41      12
+      48      12
+      4b      12
+      52      12
+      55      12
+      5c      12
+      5f      12
+      63      12
+      66      12
+      69      13
+   }
+
+   method 'printBoolean (Z)V' {
+      0      16
+      3      16
+      c      16
+      10      16
+      13      16
+      16      17
+   }
+
+   method 'printByte (B)V' {
+      0      20
+      3      20
+      c      20
+      10      20
+      13      20
+      16      21
+   }
+
+   method 'printShort (S)V' {
+      0      24
+      3      24
+      c      24
+      10      24
+      13      24
+      16      25
+   }
+
+   method 'printInt (I)V' {
+      0      28
+      3      28
+      c      28
+      10      28
+      13      28
+      16      29
+   }
+
+   method 'printLong (J)V' {
+      0      32
+      3      32
+      c      32
+      10      32
+      13      32
+      16      33
+   }
+
+   method 'printFloat (F)V' {
+      0      36
+      3      36
+      c      36
+      10      36
+      13      36
+      16      37
+   }
+
+   method 'printDouble (D)V' {
+      0      40
+      3      40
+      c      40
+      10      40
+      13      40
+      16      41
+   }
+
+   method 'printChar (C)V' {
+      0      44
+      3      44
+      c      44
+      10      44
+      13      44
+      16      45
+   }
+
+   method 'getBoolean ()Z' {
+      0      48
+      1      48
+   }
+
+   method 'getByte ()B' {
+      0      52
+      2      52
+   }
+
+   method 'getShort ()S' {
+      0      56
+      3      56
+   }
+
+   method 'getInt ()I' {
+      0      60
+      2      60
+   }
+}
+
+Lines mapping:
+6 <-> 5
+7 <-> 6
+8 <-> 7
+9 <-> 8
+10 <-> 9
+11 <-> 10
+12 <-> 11
+13 <-> 12
+15 <-> 13
+16 <-> 14
+19 <-> 17
+20 <-> 18
+23 <-> 21
+24 <-> 22
+27 <-> 25
+28 <-> 26
+31 <-> 29
+32 <-> 30
+35 <-> 33
+36 <-> 34
+39 <-> 37
+40 <-> 38
+43 <-> 41
+44 <-> 42
+47 <-> 45
+48 <-> 46
+52 <-> 49
+56 <-> 53
+60 <-> 57
+64 <-> 61
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
new file mode 100644
index 0000000..f82f585
--- /dev/null
+++ b/testData/src/pkg/TestPrimitives.java
@@ -0,0 +1,66 @@
+package pkg;
+
+public class TestPrimitives {
+
+  public void printAll() {
+    printBoolean(true);
+    printByte((byte) 123);
+    printShort((short) 257);
+    printInt(123);
+    printLong(123L);
+    printFloat(1.23F);
+    printDouble(1.23);
+    printChar('Z');
+
+    System.out.println(String.format("%b, %d, %d, %d", getBoolean(), getByte(), getShort(), getInt()));
+  }
+
+  public void printBoolean(boolean b) {
+    System.out.println(String.format("%b", b));
+  }
+
+  public void printByte(byte b) {
+    System.out.println(String.format("%d", b));
+  }
+
+  public void printShort(short s) {
+    System.out.println(String.format("%d", s));
+  }
+
+  public void printInt(int i) {
+    System.out.println(String.format("%d", i));
+  }
+
+  public void printLong(long l) {
+    System.out.println(String.format("%d", l));
+  }
+
+  public void printFloat(float f) {
+    System.out.println(String.format("%f", f));
+  }
+
+  public void printDouble(double d) {
+    System.out.println(String.format("%f", d));
+  }
+
+  public void printChar(char c) {
+    System.out.println(String.format("%c", c));
+  }
+
+
+  public boolean getBoolean() {
+    return false;
+  }
+
+  public byte getByte() {
+    return (byte) 128;
+  }
+
+  public short getShort() {
+    return (short) 32768;
+  }
+
+  public int getInt() {
+    return 42;
+  }
+}

From 7e1cb88fe2e069ca240d8426234c8ffbd626a4d0 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Fri, 14 Apr 2017 00:16:53 +0200
Subject: [PATCH 097/252] Removed unnecessary boxing of primitive types

---
 .../decompiler/exps/InvocationExprent.java    | 49 +++++++++++++++++++
 testData/results/TestPrimitives.dec           | 18 +++----
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 5b2ffbd..ff70462 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -216,6 +216,11 @@ public class InvocationExprent extends Exprent {
     tracer.addMapping(bytecode);
 
     if (isStatic) {
+      if (isBoxingCall()) {
+        ExprProcessor.getCastedExprent(lstParameters.get(0), descriptor.params[0], buf, indent, false, false, tracer);
+        return buf;
+      }
+
       ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
       if (node == null || !classname.equals(node.classStruct.qualifiedName)) {
         buf.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(classname)));
@@ -358,6 +363,50 @@ public class InvocationExprent extends Exprent {
     return buf;
   }
 
+  private boolean isBoxingCall() {
+    if (isStatic && "valueOf".equals(name) && lstParameters.size() == 1) {
+      int paramType = lstParameters.get(0).getExprType().type;
+
+      // special handling for ambiguous types
+      if (lstParameters.get(0).type == Exprent.EXPRENT_CONST) {
+        if (paramType == CodeConstants.TYPE_BYTECHAR || paramType == CodeConstants.TYPE_SHORTCHAR) {
+          if (classname.equals("java/lang/Character")) {
+            return true;
+          }
+        }
+      }
+
+      return classname.equals(getClassNameForPrimitiveType(paramType));
+    }
+
+    return false;
+  }
+
+  // TODO: move to CodeConstants ???
+  private static String getClassNameForPrimitiveType(int type) {
+    switch (type) {
+      case CodeConstants.TYPE_BOOLEAN:
+        return "java/lang/Boolean";
+      case CodeConstants.TYPE_BYTE:
+      case CodeConstants.TYPE_BYTECHAR:
+        return "java/lang/Byte";
+      case CodeConstants.TYPE_CHAR:
+        return "java/lang/Character";
+      case CodeConstants.TYPE_SHORT:
+      case CodeConstants.TYPE_SHORTCHAR:
+        return "java/lang/Short";
+      case CodeConstants.TYPE_INT:
+        return "java/lang/Integer";
+      case CodeConstants.TYPE_LONG:
+        return "java/lang/Long";
+      case CodeConstants.TYPE_FLOAT:
+        return "java/lang/Float";
+      case CodeConstants.TYPE_DOUBLE:
+        return "java/lang/Double";
+    }
+    return null;
+  }
+
   private BitSet getAmbiguousParameters() {
     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
     if (cl == null) return EMPTY_BIT_SET;
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index dce1a66..d2be8be 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -10,39 +10,39 @@ public class TestPrimitives {
       this.printFloat(1.23F);// 11
       this.printDouble(1.23D);// 12
       this.printChar('Z');// 13
-      System.out.println(String.format("%b, %d, %d, %d", new Object[]{Boolean.valueOf(this.getBoolean()), Byte.valueOf(this.getByte()), Short.valueOf(this.getShort()), Integer.valueOf(this.getInt())}));// 15
+      System.out.println(String.format("%b, %d, %d, %d", new Object[]{this.getBoolean(), this.getByte(), this.getShort(), this.getInt()}));// 15
    }// 16
 
    public void printBoolean(boolean b) {
-      System.out.println(String.format("%b", new Object[]{Boolean.valueOf(b)}));// 19
+      System.out.println(String.format("%b", new Object[]{b}));// 19
    }// 20
 
    public void printByte(byte b) {
-      System.out.println(String.format("%d", new Object[]{Byte.valueOf(b)}));// 23
+      System.out.println(String.format("%d", new Object[]{b}));// 23
    }// 24
 
    public void printShort(short s) {
-      System.out.println(String.format("%d", new Object[]{Short.valueOf(s)}));// 27
+      System.out.println(String.format("%d", new Object[]{s}));// 27
    }// 28
 
    public void printInt(int i) {
-      System.out.println(String.format("%d", new Object[]{Integer.valueOf(i)}));// 31
+      System.out.println(String.format("%d", new Object[]{i}));// 31
    }// 32
 
    public void printLong(long l) {
-      System.out.println(String.format("%d", new Object[]{Long.valueOf(l)}));// 35
+      System.out.println(String.format("%d", new Object[]{l}));// 35
    }// 36
 
    public void printFloat(float f) {
-      System.out.println(String.format("%f", new Object[]{Float.valueOf(f)}));// 39
+      System.out.println(String.format("%f", new Object[]{f}));// 39
    }// 40
 
    public void printDouble(double d) {
-      System.out.println(String.format("%f", new Object[]{Double.valueOf(d)}));// 43
+      System.out.println(String.format("%f", new Object[]{d}));// 43
    }// 44
 
    public void printChar(char c) {
-      System.out.println(String.format("%c", new Object[]{Character.valueOf(c)}));// 47
+      System.out.println(String.format("%c", new Object[]{c}));// 47
    }// 48
 
    public boolean getBoolean() {

From 0a7a60fa7baf8560f97681301fc4369fda851f40 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Wed, 19 Apr 2017 01:16:47 +0200
Subject: [PATCH 098/252] Add '(byte)' and '(short)' type cast for int literals
 only in invocation parameters

---
 .../modules/decompiler/ExprProcessor.java     |   5 ++--
 .../decompiler/exps/InvocationExprent.java    |  13 +++++++++--
 testData/classes/pkg/TestPrimitives.class     | Bin 2632 -> 2731 bytes
 testData/results/MoreAnnotations.dec          |   8 +++----
 testData/results/TestPrimitives.dec           |  22 ++++++++++++++++--
 testData/src/pkg/TestPrimitives.java          |   5 ++++
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 1b834a0..930b1ee 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -860,7 +860,7 @@ public class ExprProcessor implements CodeConstants {
                                          int indent,
                                          boolean castNull,
                                          BytecodeMappingTracer tracer) {
-    return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, tracer);
+    return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, false, tracer);
   }
 
   public static boolean getCastedExprent(Exprent exprent,
@@ -869,6 +869,7 @@ public class ExprProcessor implements CodeConstants {
                                          int indent,
                                          boolean castNull,
                                          boolean castAlways,
+                                         boolean castNarrowing,
                                          BytecodeMappingTracer tracer) {
     VarType rightType = exprent.getExprType();
 
@@ -876,7 +877,7 @@ public class ExprProcessor implements CodeConstants {
       castAlways ||
       (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
       (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
-      (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
+      (castNarrowing && isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
 
     boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index ff70462..dd8e26e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -217,7 +217,9 @@ public class InvocationExprent extends Exprent {
 
     if (isStatic) {
       if (isBoxingCall()) {
-        ExprProcessor.getCastedExprent(lstParameters.get(0), descriptor.params[0], buf, indent, false, false, tracer);
+        // process general "boxing" calls, e.g. 'Object[] data = { true }' or 'Byte b = 123'
+        // here 'byte' and 'short' values do not need an explicit narrowing type cast
+        ExprProcessor.getCastedExprent(lstParameters.get(0), descriptor.params[0], buf, indent, false, false, false, tracer);
         return buf;
       }
 
@@ -351,7 +353,14 @@ public class InvocationExprent extends Exprent {
 
         TextBuffer buff = new TextBuffer();
         boolean ambiguous = setAmbiguousParameters.get(i);
-        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, tracer);
+
+        Exprent param = lstParameters.get(i);
+        // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
+        if (param.type == Exprent.EXPRENT_INVOCATION && ((InvocationExprent)param).isBoxingCall()) {
+          param = ((InvocationExprent)param).lstParameters.get(0);
+        }
+        // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
+        ExprProcessor.getCastedExprent(param, descriptor.params[i], buff, indent, true, ambiguous, true, tracer);
         buf.append(buff);
 
         firstParameter = false;
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 77d091354d71f969eb2dc6aa4bea17012bd698fb..a2e23ba7c71e119a3f73fa320e5092fb1e1cba65 100644
GIT binary patch
delta 443
zcmXAlOHWfl7(maxEuGuR6=SK1KR_Oq1u?j1Be1Jjl{X^LQcAVG+?I!}T3^W12V8uh
zVaLv-2_fmi1#9AOaKmqKPnb_<aps(vZ#Hup|9Q3c`~24laEl+BD-3C_Gb|Vpj0(n@
z%)P9t)Ofh(z&jM1i1hre$17+3b*YDf$taJQa+p@kNT)R!X2r6aIdWq2nmmuio@feP
z6g3_T8lRFw*<n$$#InPR<|!3Tm1hpmH7}?sULMs~t>#OfpDUD;Q@&qZ&ZL8zb}I79
z<uz}D4ZE}U)@7A<E=lev)+E+l2Dq!(kl1udaZj-&v8{OT@_~<vPcA#`TG*}Ag0v!#
zi9Lx~#b=2xim$SNlfxOszQlKnn3vCX-OrTD1AgwfJJfAkmyfeef5O9UShSn3>%}$(
uEr~>fYdZ}>|0HM-J~GEP9fr+>3~v)P<1zZUVaomgj0BygEFKuz3|;`o!c%Ji

delta 345
zcmWlVxlTf15Ju0v0{`{Tjfn=|Kr0Ih?I|ei6!(2&6>&j8QBZNieZOv)*x8wo7&;4U
z<1^U!4E9E5iZkDtnQC5}KfT4TzxNNIgC|WRgPInG1jB+6!Kk~omnw*jx%|(m7fItD
z|8K>c|LLrVO$a9InPS>vMiCMZYa&D?#WZndB_%X-Bqhyj7JMvfmPl!qNn2zrvYHiE
zEpnPQ)-`zw78{yPwiLy;O382nX3(>3v%{`aHrtAOHv5!py69FMh#cAk=}{bs9NYBL
zr#KNgRh-$JbD_Ajx#HTuYz+w_iW|9bL}H3tkvqk`^amM+6^|ligQiq6?(2_cvcYts
T8mMbGjfQH@{q3r~%4Fal?bSsx

diff --git a/testData/results/MoreAnnotations.dec b/testData/results/MoreAnnotations.dec
index d7287c1..37302cc 100644
--- a/testData/results/MoreAnnotations.dec
+++ b/testData/results/MoreAnnotations.dec
@@ -33,11 +33,11 @@ public @interface MoreAnnotations {
    String annotatedWithEmptyArrays = "";
    @MoreAnnotations(
       intArray = {1, 0, 2147483647, -2147483648},
-      byteArray = {(byte)1, (byte)0, (byte)127, (byte)-128, (byte)-1},
+      byteArray = {1, 0, 127, -128, -1},
       floatArray = {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0},
       doubleArray = {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0, 1.0D / 0.0, -1.0D / 0.0},
       booleanArray = {true, false},
-      shortArray = {(short)1, (short)0, (short)32767, (short)-32768, (short)-1},
+      shortArray = {1, 0, 32767, -32768, -1},
       longArray = {1L, 0L, 9223372036854775807L, -9223372036854775808L},
       charArray = {'a', '\n', '\u0001', '\u0000', '\uffff', '\u0000'},
       enumArray = {MoreAnnotations.TestEnum.FirstValue, MoreAnnotations.TestEnum.SecondValue},
@@ -73,7 +73,7 @@ public @interface MoreAnnotations {
 
    int[] intArray() default {1, 0, 2147483647, -2147483648};
 
-   byte[] byteArray() default {(byte)1, (byte)0, (byte)127, (byte)-128, (byte)-1};
+   byte[] byteArray() default {1, 0, 127, -128, -1};
 
    float[] floatArray() default {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0};
 
@@ -81,7 +81,7 @@ public @interface MoreAnnotations {
 
    boolean[] booleanArray() default {true, false};
 
-   short[] shortArray() default {(short)1, (short)0, (short)32767, (short)-32768, (short)-1};
+   short[] shortArray() default {1, 0, 32767, -32768, -1};
 
    long[] longArray() default {1L, 0L, 9223372036854775807L, -9223372036854775808L};
 
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index d2be8be..63f2f64 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -50,16 +50,21 @@ public class TestPrimitives {
    }
 
    public byte getByte() {
-      return (byte)-128;// 56
+      return -128;// 56
    }
 
    public short getShort() {
-      return (short)-32768;// 60
+      return -32768;// 60
    }
 
    public int getInt() {
       return 42;// 64
    }
+
+   public void printNarrowed() {
+      this.printByte((byte)this.getInt());// 68
+      this.printShort((short)this.getInt());// 69
+   }// 70
 }
 
 class 'pkg/TestPrimitives' {
@@ -186,6 +191,16 @@ class 'pkg/TestPrimitives' {
       0      60
       2      60
    }
+
+   method 'printNarrowed ()V' {
+      2      64
+      5      64
+      6      64
+      b      65
+      e      65
+      f      65
+      12      66
+   }
 }
 
 Lines mapping:
@@ -219,3 +234,6 @@ Lines mapping:
 56 <-> 53
 60 <-> 57
 64 <-> 61
+68 <-> 65
+69 <-> 66
+70 <-> 67
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index f82f585..1ecb5e7 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -63,4 +63,9 @@ public class TestPrimitives {
   public int getInt() {
     return 42;
   }
+
+  public void printNarrowed() {
+    printByte((byte)getInt());
+    printShort((short)getInt());
+  }
 }

From 7868c0e83a716824025eb6758d5725ca86144267 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 20 Apr 2017 12:32:55 +0300
Subject: [PATCH 099/252] avoid string concat in a loop

---
 .../code/cfg/ExceptionRangeCFG.java           | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
index 38a105b..84640d7 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,8 @@ package org.jetbrains.java.decompiler.code.cfg;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.stream.Collectors;
 
 public class ExceptionRangeCFG {
 
@@ -105,21 +104,7 @@ public class ExceptionRangeCFG {
       return null;
     }
 
-    Set<String> setExceptionStrings = new HashSet<>();
-
-    for (String exceptionType : exceptionTypes) { // normalize order
-      setExceptionStrings.add(exceptionType);
-    }
-
-    String ret = "";
-    for (String exception : setExceptionStrings) {
-      if (!ret.isEmpty()) {
-        ret += ":";
-      }
-      ret += exception;
-    }
-
-    return ret;
+    return exceptionTypes.stream().distinct().collect(Collectors.joining(":"));
   }
 
 

From 6fc7ae736a44da1f9069b46f3b009f779612296e Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 20 Apr 2017 16:29:55 +0300
Subject: [PATCH 100/252] speedup descriptors parsing, avoid using regexp split

---
 .../struct/consts/LinkConstant.java           | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
index 71bf146..5d37f0f 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,31 +135,32 @@ public class LinkConstant extends PooledConstant {
   }
 
   private void resolveDescriptor(String descr) {
+    int parenth = descr.indexOf(')');
+    if (descr.length() < 2 || parenth < 0 || descr.charAt(0) != '(') {
+      throw new IllegalArgumentException("Invalid descriptor: " + descr);
+    }
 
-    String[] arr = descr.split("[()]");
-    String par = arr[1];
-
-    int index = 0, counter = 0;
-    int len = par.length();
-
-    while (index < len) {
-
-      char c = par.charAt(index);
-      if (c == 'L') {
-        index = par.indexOf(";", index);
-      }
-      else if (c == '[') {
+    int counter = 0;
+    if (parenth > 1) { // params
+      int index = 1;
+      while (index < parenth) {
+        char c = descr.charAt(index);
+        if (c == 'L') {
+          index = descr.indexOf(";", index);
+        }
+        else if (c == '[') {
+          index++;
+          continue;
+        }
+        counter++;
         index++;
-        continue;
       }
-
-      counter++;
-      index++;
     }
 
     paramCount = counter;
-    isVoid = "V".equals(arr[2]);
-    returnCategory2 = ("D".equals(arr[2]) || "J".equals(arr[2]));
-  }
+    char retChar = descr.charAt(parenth + 1);
+    isVoid = retChar == 'V';
+    returnCategory2 = (retChar == 'D') || (retChar == 'J');
+   }
 }
 

From 234073efb2079e20a983c4dd5993ce53cca8bfe6 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 20 Apr 2017 19:11:52 +0300
Subject: [PATCH 101/252] specify the exact collection size when we know

---
 src/org/jetbrains/java/decompiler/struct/StructClass.java  | 6 +++---
 src/org/jetbrains/java/decompiler/struct/StructMember.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
index 33dc178..fafd5f8 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public class StructClass extends StructMember {
 
     // fields
     length = in.readUnsignedShort();
-    fields = new VBStyleCollection<>();
+    fields = new VBStyleCollection<>(length);
     for (int i = 0; i < length; i++) {
       StructField field = new StructField(in, this);
       fields.addWithKey(field, InterpreterUtil.makeUniqueKey(field.getName(), field.getDescriptor()));
@@ -101,7 +101,7 @@ public class StructClass extends StructMember {
 
     // methods
     length = in.readUnsignedShort();
-    methods = new VBStyleCollection<>();
+    methods = new VBStyleCollection<>(length);
     for (int i = 0; i < length; i++) {
       StructMethod method = new StructMethod(in, this);
       methods.addWithKey(method, InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor()));
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index 86f79b4..bfe2270 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -48,9 +48,9 @@ public class StructMember {
   }
 
   protected VBStyleCollection<StructGeneralAttribute, String> readAttributes(DataInputFullStream in, ConstantPool pool) throws IOException {
-    VBStyleCollection<StructGeneralAttribute, String> attributes = new VBStyleCollection<>();
-
     int length = in.readUnsignedShort();
+
+    VBStyleCollection<StructGeneralAttribute, String> attributes = new VBStyleCollection<>(length);
     for (int i = 0; i < length; i++) {
       int nameIndex = in.readUnsignedShort();
       String name = pool.getPrimitiveConstant(nameIndex).getString();

From 7041accfe9ac901e93df6353b1be790f55a363a3 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 20 Apr 2017 19:27:41 +0300
Subject: [PATCH 102/252] reduced memory usage - use HashMap for attributes

---
 .../java/decompiler/main/ClassWriter.java     | 30 +++++++++----------
 .../decompiler/main/ClassesProcessor.java     |  6 ++--
 .../decompiler/main/rels/LambdaProcessor.java |  4 +--
 .../main/rels/NestedClassProcessor.java       |  2 +-
 .../modules/decompiler/ExprProcessor.java     |  2 +-
 .../modules/decompiler/IdeaNotNullHelper.java | 12 +++-----
 .../modules/decompiler/exps/ExitExprent.java  |  4 +--
 .../modules/decompiler/exps/VarExprent.java   |  4 +--
 .../java/decompiler/struct/StructMember.java  | 25 +++++++++-------
 .../java/decompiler/struct/StructMethod.java  |  9 +++---
 10 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 0986a22..6233efe 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -271,7 +271,7 @@ public class ClassWriter {
 
   private static void addTracer(StructClass cls, StructMethod method, BytecodeMappingTracer tracer) {
     StructLineNumberTableAttribute table =
-      (StructLineNumberTableAttribute)method.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
+      (StructLineNumberTableAttribute)method.getAttribute(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
     tracer.setLineNumberTable(table);
     String key = InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor());
     DecompilerContext.getBytecodeSourceMapper().addTracer(cls.qualifiedName, key, tracer);
@@ -287,8 +287,8 @@ public class ClassWriter {
     StructClass cl = wrapper.getClassStruct();
 
     int flags = node.type == ClassNode.CLASS_ROOT ? cl.getAccessFlags() : node.access;
-    boolean isDeprecated = cl.getAttributes().containsKey("Deprecated");
-    boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || cl.getAttributes().containsKey("Synthetic");
+    boolean isDeprecated = cl.hasAttribute("Deprecated");
+    boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || cl.hasAttribute("Synthetic");
     boolean isEnum = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM) && (flags & CodeConstants.ACC_ENUM) != 0;
     boolean isInterface = (flags & CodeConstants.ACC_INTERFACE) != 0;
     boolean isAnnotation = (flags & CodeConstants.ACC_ANNOTATION) != 0;
@@ -379,7 +379,7 @@ public class ClassWriter {
   private void fieldToJava(ClassWrapper wrapper, StructClass cl, StructField fd, TextBuffer buffer, int indent, BytecodeMappingTracer tracer) {
     int start = buffer.length();
     boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
-    boolean isDeprecated = fd.getAttributes().containsKey("Deprecated");
+    boolean isDeprecated = fd.hasAttribute("Deprecated");
     boolean isEnum = fd.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
 
     if (isDeprecated) {
@@ -407,7 +407,7 @@ public class ClassWriter {
 
     GenericFieldDescriptor descriptor = null;
     if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)fd.getAttributes().getWithKey("Signature");
+      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)fd.getAttribute("Signature");
       if (attr != null) {
         descriptor = GenericMain.parseFieldSignature(attr.getSignature());
       }
@@ -448,7 +448,7 @@ public class ClassWriter {
     }
     else if (fd.hasModifier(CodeConstants.ACC_FINAL) && fd.hasModifier(CodeConstants.ACC_STATIC)) {
       StructConstantValueAttribute attr =
-        (StructConstantValueAttribute)fd.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_CONSTANT_VALUE);
+        (StructConstantValueAttribute)fd.getAttribute(StructGeneralAttribute.ATTRIBUTE_CONSTANT_VALUE);
       if (attr != null) {
         PrimitiveConstant constant = cl.getPool().getPrimitiveConstant(attr.getIndex());
         buffer.append(" = ");
@@ -587,7 +587,7 @@ public class ClassWriter {
       boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
       boolean isAnnotation = cl.hasModifier(CodeConstants.ACC_ANNOTATION);
       boolean isEnum = cl.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
-      boolean isDeprecated = mt.getAttributes().containsKey("Deprecated");
+      boolean isDeprecated = mt.hasAttribute("Deprecated");
       boolean clinit = false, init = false, dinit = false;
 
       MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
@@ -609,7 +609,7 @@ public class ClassWriter {
         appendRenameComment(buffer, oldName, MType.METHOD, indent);
       }
 
-      boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || mt.getAttributes().containsKey("Synthetic");
+      boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || mt.hasAttribute("Synthetic");
       boolean isBridge = (flags & CodeConstants.ACC_BRIDGE) != 0;
       if (isSynthetic) {
         appendComment(buffer, "synthetic method", indent);
@@ -647,7 +647,7 @@ public class ClassWriter {
 
       GenericMethodDescriptor descriptor = null;
       if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-        StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)mt.getAttributes().getWithKey("Signature");
+        StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)mt.getAttribute("Signature");
         if (attr != null) {
           descriptor = GenericMain.parseMethodSignature(attr.getSignature());
           if (descriptor != null) {
@@ -771,7 +771,7 @@ public class ClassWriter {
 
         buffer.append(')');
 
-        StructExceptionsAttribute attr = (StructExceptionsAttribute)mt.getAttributes().getWithKey("Exceptions");
+        StructExceptionsAttribute attr = (StructExceptionsAttribute)mt.getAttribute("Exceptions");
         if ((descriptor != null && !descriptor.exceptions.isEmpty()) || attr != null) {
           throwsExceptions = true;
           buffer.append(" throws ");
@@ -796,7 +796,7 @@ public class ClassWriter {
 
       if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) { // native or abstract method (explicit or interface)
         if (isAnnotation) {
-          StructAnnDefaultAttribute attr = (StructAnnDefaultAttribute)mt.getAttributes().getWithKey("AnnotationDefault");
+          StructAnnDefaultAttribute attr = (StructAnnDefaultAttribute)mt.getAttribute("AnnotationDefault");
           if (attr != null) {
             buffer.append(" default ");
             buffer.append(attr.getDefaultValue().toJava(0, BytecodeMappingTracer.DUMMY));
@@ -943,7 +943,7 @@ public class ClassWriter {
     Set<String> filter = new HashSet<>();
 
     for (String name : ANNOTATION_ATTRIBUTES) {
-      StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttributes().getWithKey(name);
+      StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttribute(name);
       if (attribute != null) {
         for (AnnotationExprent annotation : attribute.getAnnotations()) {
           String text = annotation.toJava(indent, BytecodeMappingTracer.DUMMY).toString();
@@ -960,7 +960,7 @@ public class ClassWriter {
     Set<String> filter = new HashSet<>();
 
     for (String name : PARAMETER_ANNOTATION_ATTRIBUTES) {
-      StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttributes().getWithKey(name);
+      StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttribute(name);
       if (attribute != null) {
         List<List<AnnotationExprent>> annotations = attribute.getParamAnnotations();
         if (param < annotations.size()) {
@@ -978,7 +978,7 @@ public class ClassWriter {
 
   private static void appendTypeAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType, int index, Set<String> filter) {
     for (String name : TYPE_ANNOTATION_ATTRIBUTES) {
-      StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)mb.getAttributes().getWithKey(name);
+      StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)mb.getAttribute(name);
       if (attribute != null) {
         for (TypeAnnotation annotation : attribute.getAnnotations()) {
           if (annotation.isTopLevel() && annotation.getTargetType() == targetType && (index < 0 || annotation.getIndex() == index)) {
@@ -1041,7 +1041,7 @@ public class ClassWriter {
 
   public static GenericClassDescriptor getGenericClassDescriptor(StructClass cl) {
     if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)cl.getAttributes().getWithKey("Signature");
+      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)cl.getAttribute("Signature");
       if (attr != null) {
         return GenericMain.parseClassSignature(attr.getSignature());
       }
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 4afeddf..a743f98 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public class ClassesProcessor {
     for (StructClass cl : context.getClasses().values()) {
       if (cl.isOwn() && !mapRootClasses.containsKey(cl.qualifiedName)) {
         if (bDecompileInner) {
-          StructInnerClassesAttribute inner = (StructInnerClassesAttribute)cl.getAttributes().getWithKey("InnerClasses");
+          StructInnerClassesAttribute inner = (StructInnerClassesAttribute)cl.getAttribute("InnerClasses");
 
           if (inner != null) {
             for (StructInnerClassesAttribute.Entry entry : inner.getEntries()) {
@@ -157,7 +157,7 @@ public class ClassesProcessor {
             if (setNestedClasses != null) {
 
               StructClass scl = superNode.classStruct;
-              StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttributes().getWithKey("InnerClasses");
+              StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttribute("InnerClasses");
 
               if (inner == null || inner.getEntries().isEmpty()) {
                 DecompilerContext.getLogger().writeMessage(superClass + " does not contain inner classes!", IFernflowerLogger.Severity.WARN);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
index 0063a15..3b2e74d 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class LambdaProcessor {
     }
 
     StructBootstrapMethodsAttribute bootstrap =
-      (StructBootstrapMethodsAttribute)cl.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
+      (StructBootstrapMethodsAttribute)cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
     if (bootstrap == null || bootstrap.getMethodsNumber() == 0) {
       return false; // no bootstrap constants in pool
     }
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 897b394..974c057 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -192,7 +192,7 @@ public class NestedClassProcessor {
 
         if (!setEnclosing.isEmpty()) {
           StructEnclosingMethodAttribute attr =
-            (StructEnclosingMethodAttribute)child.classStruct.getAttributes().getWithKey("EnclosingMethod");
+            (StructEnclosingMethodAttribute)child.classStruct.getAttribute("EnclosingMethod");
           if (attr != null &&
               attr.getMethodName() != null &&
               node.classStruct.qualifiedName.equals(attr.getClassName()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 930b1ee..f6005ba 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -288,7 +288,7 @@ public class ExprProcessor implements CodeConstants {
 
     ConstantPool pool = cl.getPool();
     StructBootstrapMethodsAttribute bootstrap =
-      (StructBootstrapMethodsAttribute)cl.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
+      (StructBootstrapMethodsAttribute)cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
 
     BasicBlock block = stat.getBlock();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
index 40d94fd..d6f917d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import org.jetbrains.java.decompiler.struct.attr.StructAnnotationAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructAnnotationParameterAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.util.List;
 
@@ -85,11 +84,10 @@ public class IdeaNotNullHelper {
             boolean thisvar = !mt.hasModifier(CodeConstants.ACC_STATIC);
 
             MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-            VBStyleCollection<StructGeneralAttribute, String> attributes = mt.getAttributes();
 
             // parameter annotations
-            StructAnnotationParameterAttribute param_annotations = (StructAnnotationParameterAttribute)attributes
-              .getWithKey(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
+            StructAnnotationParameterAttribute param_annotations =
+              (StructAnnotationParameterAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
             if (param_annotations != null) {
 
               List<List<AnnotationExprent>> param_annotations_lists = param_annotations.getParamAnnotations();
@@ -172,13 +170,11 @@ public class IdeaNotNullHelper {
 
   private static boolean findAndRemoveReturnCheck(Statement stat, StructMethod mt) {
 
-    VBStyleCollection<StructGeneralAttribute, String> attributes = mt.getAttributes();
-
     boolean is_notnull_check = false;
 
     // method annotation, refers to the return value
     StructAnnotationAttribute attr =
-      (StructAnnotationAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
+      (StructAnnotationAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
     if (attr != null) {
       List<AnnotationExprent> annotations = attr.getAnnotations();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index abfc4ab..0f16b66 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ public class ExitExprent extends Exprent {
       ClassNode node = ((ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE));
 
       if (method != null && node != null) {
-        StructExceptionsAttribute attr = (StructExceptionsAttribute)method.methodStruct.getAttributes().getWithKey("Exceptions");
+        StructExceptionsAttribute attr = (StructExceptionsAttribute)method.methodStruct.getAttribute("Exceptions");
 
         if (attr != null) {
           String classname = null;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index 0cb7fd1..d31f809 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -155,8 +155,8 @@ public class VarExprent extends Exprent {
         if (originalIndex != null) {
           // first try from signature
           if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-            StructLocalVariableTypeTableAttribute attr = (StructLocalVariableTypeTableAttribute)method.methodStruct.getAttributes()
-              .getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+            StructLocalVariableTypeTableAttribute attr = (StructLocalVariableTypeTableAttribute)method.methodStruct
+              .getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
             if (attr != null) {
               String signature = attr.getSignature(originalIndex, visibleOffset);
               if (signature != null) {
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index bfe2270..585fcb2 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -21,22 +21,27 @@ import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribu
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
-import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class StructMember {
 
   protected int accessFlags;
-  protected VBStyleCollection<StructGeneralAttribute, String> attributes;
+  protected Map<String, StructGeneralAttribute> attributes;
 
 
   public int getAccessFlags() {
     return accessFlags;
   }
 
-  public VBStyleCollection<StructGeneralAttribute, String> getAttributes() {
-    return attributes;
+  public StructGeneralAttribute getAttribute(String name) {
+    return attributes.get(name);
+  }
+
+  public boolean hasAttribute(String name) {
+    return attributes.containsKey(name);
   }
 
   public boolean hasModifier(int modifier) {
@@ -44,13 +49,13 @@ public class StructMember {
   }
 
   public boolean isSynthetic() {
-    return hasModifier(CodeConstants.ACC_SYNTHETIC) || attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
+    return hasModifier(CodeConstants.ACC_SYNTHETIC) || hasAttribute(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
   }
 
-  protected VBStyleCollection<StructGeneralAttribute, String> readAttributes(DataInputFullStream in, ConstantPool pool) throws IOException {
+  protected Map<String, StructGeneralAttribute> readAttributes(DataInputFullStream in, ConstantPool pool) throws IOException {
     int length = in.readUnsignedShort();
 
-    VBStyleCollection<StructGeneralAttribute, String> attributes = new VBStyleCollection<>(length);
+    Map<String, StructGeneralAttribute> attributes = new HashMap<>(length);
     for (int i = 0; i < length; i++) {
       int nameIndex = in.readUnsignedShort();
       String name = pool.getPrimitiveConstant(nameIndex).getString();
@@ -60,16 +65,16 @@ public class StructMember {
       if (attribute != null) {
         if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(name)) {
           // merge all variable tables
-          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(name);
+          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.get(name);
           table.add((StructLocalVariableTableAttribute)attribute);
         }
         else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name) && attributes.containsKey(name)) {
           // merge all variable tables
-          StructLocalVariableTypeTableAttribute table = (StructLocalVariableTypeTableAttribute)attributes.getWithKey(name);
+          StructLocalVariableTypeTableAttribute table = (StructLocalVariableTypeTableAttribute)attributes.get(name);
           table.add((StructLocalVariableTypeTableAttribute)attribute);
         }
         else {
-          attributes.addWithKey(attribute, attribute.getName());
+          attributes.put(attribute.getName(), attribute);
         }
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index d398c5e..64ee869 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.jetbrains.java.decompiler.util.VBStyleCollection;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static org.jetbrains.java.decompiler.code.CodeConstants.*;
 
@@ -53,7 +54,7 @@ public class StructMethod extends StructMember {
   private int codeFullLength = 0;
   private InstructionSequence seq;
   private boolean expanded = false;
-  private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
+  private Map<String, StructGeneralAttribute> codeAttributes;
 
   public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
     classStruct = clStruct;
@@ -69,7 +70,7 @@ public class StructMethod extends StructMember {
 
     attributes = readAttributes(in, pool);
     if (codeAttributes != null) {
-      attributes.addAllWithKey(codeAttributes);
+      attributes.putAll(codeAttributes);
       codeAttributes = null;
     }
   }
@@ -391,7 +392,7 @@ public class StructMethod extends StructMember {
   }
 
   public StructLocalVariableTableAttribute getLocalVariableAttr() {
-    return (StructLocalVariableTableAttribute)getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+    return (StructLocalVariableTableAttribute)getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
   }
 
   @Override

From 0b442fc64b6624a744e8cde2e4899bfd3049a0cc Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 21 Apr 2017 19:16:45 +0300
Subject: [PATCH 103/252] do not process vars if there were errors in the
 method

---
 .../decompiler/main/rels/ClassWrapper.java    | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index d0efaae..5ae532a 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -158,31 +158,33 @@ public class ClassWrapper {
 
       methods.addWithKey(methodWrapper, InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor()));
 
-      // rename vars so that no one has the same name as a field
-      varProc.refreshVarNames(new VarNamesCollector(setFieldNames));
+      if (!isError) {
+        // rename vars so that no one has the same name as a field
+        varProc.refreshVarNames(new VarNamesCollector(setFieldNames));
 
-      // if debug information present and should be used
-      if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
-        StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
-        if (attr != null) {
-          // only param names here
-          varProc.setDebugVarNames(attr.getMapParamNames());
+        // if debug information present and should be used
+        if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
+          StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
+          if (attr != null) {
+            // only param names here
+            varProc.setDebugVarNames(attr.getMapParamNames());
 
-          // the rest is here
-          methodWrapper.getOrBuildGraph().iterateExprents(exprent -> {
-            List<Exprent> lst = exprent.getAllExprents(true);
-            lst.add(exprent);
-            lst.stream()
-              .filter(e -> e.type == Exprent.EXPRENT_VAR)
-              .forEach(e -> {
-                VarExprent varExprent = (VarExprent)e;
-                String name = varExprent.getDebugName(mt);
-                if (name != null) {
-                  varProc.setVarName(varExprent.getVarVersionPair(), name);
-                }
-              });
-            return 0;
-          });
+            // the rest is here
+            methodWrapper.getOrBuildGraph().iterateExprents(exprent -> {
+              List<Exprent> lst = exprent.getAllExprents(true);
+              lst.add(exprent);
+              lst.stream()
+                .filter(e -> e.type == Exprent.EXPRENT_VAR)
+                .forEach(e -> {
+                  VarExprent varExprent = (VarExprent)e;
+                  String name = varExprent.getDebugName(mt);
+                  if (name != null) {
+                    varProc.setVarName(varExprent.getVarVersionPair(), name);
+                  }
+                });
+              return 0;
+            });
+          }
         }
       }
 

From 2a213aa4a054bbe22925cb2a679d38a537ad88a4 Mon Sep 17 00:00:00 2001
From: Oleg Panashchenko <helg.git@helg.com>
Date: Mon, 24 Apr 2017 14:22:41 +0300
Subject: [PATCH 104/252] Use fully qualified static field name in conflict
 #541

---
 .../main/collectors/ImportCollector.java      |  36 ++++++
 .../modules/decompiler/exps/FieldExprent.java |   2 +-
 .../decompiler/exps/InvocationExprent.java    |   4 +-
 .../java/decompiler/SingleClassesTest.java    |   5 +
 testData/classes/ext/TestClashNameIface.class | Bin 0 -> 141 bytes
 .../classes/ext/TestClashNameParent.class     | Bin 0 -> 261 bytes
 testData/classes/pkg/NonSharedName.class      | Bin 0 -> 339 bytes
 testData/classes/pkg/SharedName1.class        | Bin 0 -> 337 bytes
 testData/classes/pkg/SharedName2.class        | Bin 0 -> 282 bytes
 testData/classes/pkg/SharedName3.class        | Bin 0 -> 282 bytes
 testData/classes/pkg/SharedName4.class        | Bin 0 -> 148 bytes
 testData/classes/pkg/SharedName5.class        | Bin 0 -> 265 bytes
 testData/classes/pkg/TestClashName.class      | Bin 0 -> 1171 bytes
 testData/classes/pkg/TestClashNameIface.class | Bin 0 -> 134 bytes
 .../classes/pkg/TestClashNameParent.class     | Bin 0 -> 210 bytes
 testData/classes/pkg/TestSwitchOnEnum$1.class | Bin 0 -> 618 bytes
 testData/classes/pkg/TestSwitchOnEnum.class   | Bin 0 -> 557 bytes
 testData/results/InvalidMethodSignature.dec   |   2 +-
 testData/results/TestClashName.dec            | 108 ++++++++++++++++++
 testData/results/TestSwitchOnEnum.dec         |  31 +++++
 testData/src/ext/TestClashNameIface.java      |   4 +
 testData/src/ext/TestClashNameParent.java     |   5 +
 testData/src/pkg/TestClashName.java           |  83 ++++++++++++++
 testData/src/pkg/TestSwitchOnEnum.java        |  20 ++++
 24 files changed, 296 insertions(+), 4 deletions(-)
 create mode 100644 testData/classes/ext/TestClashNameIface.class
 create mode 100644 testData/classes/ext/TestClashNameParent.class
 create mode 100644 testData/classes/pkg/NonSharedName.class
 create mode 100644 testData/classes/pkg/SharedName1.class
 create mode 100644 testData/classes/pkg/SharedName2.class
 create mode 100644 testData/classes/pkg/SharedName3.class
 create mode 100644 testData/classes/pkg/SharedName4.class
 create mode 100644 testData/classes/pkg/SharedName5.class
 create mode 100644 testData/classes/pkg/TestClashName.class
 create mode 100644 testData/classes/pkg/TestClashNameIface.class
 create mode 100644 testData/classes/pkg/TestClashNameParent.class
 create mode 100644 testData/classes/pkg/TestSwitchOnEnum$1.class
 create mode 100644 testData/classes/pkg/TestSwitchOnEnum.class
 create mode 100644 testData/results/TestClashName.dec
 create mode 100644 testData/results/TestSwitchOnEnum.dec
 create mode 100644 testData/src/ext/TestClashNameIface.java
 create mode 100644 testData/src/ext/TestClashNameParent.java
 create mode 100644 testData/src/pkg/TestClashName.java
 create mode 100644 testData/src/pkg/TestSwitchOnEnum.java

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 3bc5383..f5cd16d 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -15,10 +15,13 @@
  */
 package org.jetbrains.java.decompiler.main.collectors;
 
+import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
+import org.jetbrains.java.decompiler.struct.StructField;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -28,6 +31,8 @@ public class ImportCollector {
 
   private final Map<String, String> mapSimpleNames = new HashMap<>();
   private final Set<String> setNotImportedNames = new HashSet<>();
+  // set of field names in this class and all its predecessors.
+  private final Set<String> setFieldNames = new HashSet<>();
   private final String currentPackageSlash;
   private final String currentPackagePoint;
 
@@ -43,6 +48,37 @@ public class ImportCollector {
       currentPackageSlash = "";
       currentPackagePoint = "";
     }
+
+    Map<String, ClassNode> mapRootCases =  DecompilerContext.getClassProcessor().getMapRootClasses();
+    for(StructClass sClass = root.classStruct;
+        sClass!=null;
+        ){
+      // all field names for current class ..
+      for(StructField f: sClass.getFields()) {
+        setFieldNames.add(f.getName());
+      }
+
+      // .. and traverse through parent.
+      ClassNode classNode;
+      if(sClass.superClass==null || (classNode = (mapRootCases.get(sClass.superClass.getString())))==null)
+            break;
+      sClass = classNode.classStruct;
+    }
+  }
+
+  /**
+   * Check whether the package-less name ClassName is shaded by variable in a context of
+   * the decompiled class
+   * @param classToName - pkg.name.ClassName - class to find shortname for
+   * @return ClassName if the name is not shaded by local field, pkg.name.ClassName otherwise
+   */
+  public String getShortNameInClassContext(String classToName) {
+    String shortName = getShortName(classToName);
+    if(setFieldNames.contains(shortName)) {
+      return classToName;
+    } else {
+      return shortName;
+    }
   }
 
   public String getShortName(String fullName) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 472823f..6d549b1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -102,7 +102,7 @@ public class FieldExprent extends Exprent {
     if (isStatic) {
       ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
       if (node == null || !classname.equals(node.classStruct.qualifiedName) || isAmbiguous()) {
-        buf.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(classname)));
+        buf.append(DecompilerContext.getImportCollector().getShortNameInClassContext(ExprProcessor.buildJavaClassName(classname)));
         buf.append(".");
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index dd8e26e..f56a805 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -225,7 +225,7 @@ public class InvocationExprent extends Exprent {
 
       ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
       if (node == null || !classname.equals(node.classStruct.qualifiedName)) {
-        buf.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(classname)));
+        buf.append(DecompilerContext.getImportCollector().getShortNameInClassContext(ExprProcessor.buildJavaClassName(classname)));
       }
     }
     else {
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index ba2429f..b4567e0 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -102,6 +102,11 @@ public class SingleClassesTest {
   @Test public void testAccessReplace() { doTest("pkg/TestAccessReplace"); }
   @Test public void testStringLiterals() { doTest("pkg/TestStringLiterals"); }
   @Test public void testPrimitives() { doTest("pkg/TestPrimitives"); }
+  @Test public void testClashName() { doTest("pkg/TestClashName", "pkg/SharedName1",
+          "pkg/SharedName2", "pkg/SharedName3", "pkg/SharedName4", "pkg/NonSharedName",
+          "pkg/TestClashNameParent", "ext/TestClashNameParent","pkg/TestClashNameIface", "ext/TestClashNameIface"); }
+  @Test public void testSwitchOnEnum() { doTest("pkg/TestSwitchOnEnum","pkg/TestSwitchOnEnum$1");}
+
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/ext/TestClashNameIface.class b/testData/classes/ext/TestClashNameIface.class
new file mode 100644
index 0000000000000000000000000000000000000000..6a725cf41f104b9a4d9dc36078905834837f45f6
GIT binary patch
literal 141
zcmX^0Z`VEs1_l!bPId-%b_Nbc2IjQ<d?2Zz8OF%K6`WsMl$`38nUl)MARdxhT;iOQ
zSe)UPn49XEmYAHXmz7wS$jBg;T2Z2pDa*(p0Fu|wNz6;v_fN`7O)g<$U|?im0$K>9
SS%9`Muz*+$tU!{9feip<Iw1c5

literal 0
HcmV?d00001

diff --git a/testData/classes/ext/TestClashNameParent.class b/testData/classes/ext/TestClashNameParent.class
new file mode 100644
index 0000000000000000000000000000000000000000..41877611ba07dd443d5203881b67e93fdc21ca83
GIT binary patch
literal 261
zcmZvW&1%9>5QWbqsnKiv>B?@qDXj~$s7rAZ5DLW>l<seIXd?N6<VJig7b0}w1Nczl
zB<n6_m~-Zv!(4BF7XVW{DmdtMV59G1;9^MVt|DFVcBxZ-C(s9>HH)*@%nA1E+YiAB
z@+}hvpK->^Dh;_<>o5^Vt@5ha@FK3o)0#^YB)W|1q;HAL%w(tc+JlR>hX=F>BR&}a
zACNGtQ9seyum2V9cw_J^Pdf56Ny%|DQJp1DN7M_fW~aty(AYk~IyQ`wu4ISi-VvrN
Hvjy)CYo0P~

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/NonSharedName.class b/testData/classes/pkg/NonSharedName.class
new file mode 100644
index 0000000000000000000000000000000000000000..e3d09dd0fb7af0847b96294e4f9dd062a7664038
GIT binary patch
literal 339
zcmZ9Gy-veG5QJy_n;1iWpa3aIlt6(S%7`XXBqU^tMD%Cpa2y;PIZmF61}KnH<N<gn
z#Mq)C#omtQzMb9gpY0C7ElxaG=(b^^=c4c8SRl`=dx0}d^R&7Xn3q>i0&7&vw4n2l
z<~m$2BVA5al+m#gU5y)xL#<(){f&8(VqM01oYqi(s#n!0Q>%HXmilI)Hp+*KmJb__
zp!fQc1Ywa+=Bm`Q8WD7BD9BWv1dq`|#}zJkrp2?lrXHg*SxlkRraEUAcKiAZ@=hV}
q_&SYwO6&kWb&U=h53oL9yzP+#l86673BWc#VeE&VG3JP$20Fiq#xdOh

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/SharedName1.class b/testData/classes/pkg/SharedName1.class
new file mode 100644
index 0000000000000000000000000000000000000000..fbd917ffe1cb6ec44ef5891e3b5ff96bec0edd21
GIT binary patch
literal 337
zcmZ9Gy-veG5QJy#^Dl;kKnW5hP+%cZMl_KkMM9xSM1OV;$H8%s<M328K!HTT1LUC)
zV~d6qdpnx_c5b&nU*7<3a2!IR8^Fe)hn|NcfjqKC0=J)+d3`Ie&o3SXYOtCaLFX<n
z&3Lm+Of}U>K}Th#9<~&h{C-;et%Z}-rb^8)Z=l}Ptm{Fc*YmMnnyZC=(GfiO5gfQo
zeSXT~$y`@v*37R3-3EyZU1srpvM_0lGajjUG(TyUsB9K9=mb=!?85F`enQ?T1R-Cy
nHGN`xh^QO%r1b#x4(oM?j7aYP3nc)@{(!X`8ZhR7Lkpc>h3qh~

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/SharedName2.class b/testData/classes/pkg/SharedName2.class
new file mode 100644
index 0000000000000000000000000000000000000000..275ab11a87dd7543ef3cba1c57c7c28536fc5ead
GIT binary patch
literal 282
zcmZ9G&1%9>5QWd=S7TbEd%>l;XrOc{-3WqE>_TyW6R#Q@qr}+vk}e7^d;lLxdLnM@
zV(uKy`DX51uBS7AH#9w1c&@@k-9_M{A&>=YByjpkmK5&-v(udktig7!1@(_4)8oS?
z()m<HDV<6`PVb~Q*&gy(50lbwPW8SRq-wt!tBrnHt8eAQMa72=hl_S!%W$$%xt^E#
zs~{+mFjd(y{EXH*F3{#(7VqRI<q(y@;to1hsusJj+r3}NkwW0{b#7)rtoDF1f^Gi5
N_>VR?;4?Jv^alq)EWiK&

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/SharedName3.class b/testData/classes/pkg/SharedName3.class
new file mode 100644
index 0000000000000000000000000000000000000000..f24863d6bdacb885e89b7b5d3cf8192c360d91bb
GIT binary patch
literal 282
zcmZ9Gy>7xl5QJy_3&#8eC1oVaK!FP=5e*Vjq=*!t^k;JcgE7b$-V3FOM8N~_P*KK+
zCMouIH1qA=UVqLP0DUw)Sg4g@qVA&M;z1yvtXF|Eh|@S93e1=Ghrk+b=UPyIi&H&0
zY(kyQRG82y4Wi^udeiM8i}W}y{N_yW^HHMq%Zb|P?n)h%4;LjLHXJV6trx*`sWLq;
z@}8hkAVH$iMerW3bd;mTyDZ+xPl_QbgT)<m%2dzn!ftoIAtwrf$Je=;kHji}P)4xL
PFBt#PCl2@w4OD*t2+b_X

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/SharedName4.class b/testData/classes/pkg/SharedName4.class
new file mode 100644
index 0000000000000000000000000000000000000000..2bfb786b78ae166031b43d3b45d1bc8c986655eb
GIT binary patch
literal 148
zcmX^0Z`VEs1_l!bPId-1b_RBK1`b9BuHgLAqU2P!%$!t42BDDD;u7ba#NrIU#N1T9
zti-ZJMh5<Z>~#I$jKreU6p*M1BZB})LO&-lFJ0e1DJwO(gpolWA(WVxmtT@tl9`{U
a?+9nAF)%PPFaa?$&;=ki3y@@DU<Cjt&L*k=

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/SharedName5.class b/testData/classes/pkg/SharedName5.class
new file mode 100644
index 0000000000000000000000000000000000000000..f975840b91e847e10bc6fc6c06d494721ba23bb0
GIT binary patch
literal 265
zcmZWjO%K6P5S)j$RDHx<B5}b%FI*6pCQc29Htw&y)T=6~*8g&nIQRj6l-SoJo9xc+
zOm=qPpXUp}1T7O~SOyvfnhg3vCNf(xln28tL&Z7o1w+e~iCE{SK%_noVq$8Z3=^K^
zDfNSeKXW5~<95uG(B1@**k$wOKgD2r=RDnsl~f)bUtBXM=GViTpTt->Sg1gwdzWKq
ydk3D1y^^L3?O%WNP@>0GFiKh@)T!$dDn=VU!0v@?P}K{vPfJyrN~pmsu>J)M6*%7j

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestClashName.class b/testData/classes/pkg/TestClashName.class
new file mode 100644
index 0000000000000000000000000000000000000000..73b047dce894050717fe3a79c812d66f650c2f6c
GIT binary patch
literal 1171
zcmZWo+foxj5IsXe!iME8AOutp6;=fU3Acm*M!`Uc6i`01zyb?ogUN>SYy1LV6t}c|
z@B{oP%hMYWLMqkg^z`)f^qk)O`TOfPfH*cI=s{dVHxdHV0y6@$0&^PXkrXebVWH}!
zH7r)WB@N3}?{$QE8OeJSVV>{3mF0@SY8dar$cC||(6wWg-OQO;KF*s3Ytt-Qj;o-u
z3Y|4O*+X;RQfS^jX3Bx&#%fmanpJ`&Y}yI!ly*id&>Y&iLPzfW^l0K%sU+hc>*EQ=
zwQc*zG2Kduw~yR8mq^_S#FA+q38ieucGC)h(XkH-!A$Xhhud<tW92J_J*%{1?wv8h
zZN4+QRdHOqU}c>PyKHk~*>Q@l>Doo7T;Eb$T0K;VY!@q~eQU**LbXzjpO_b>4g=41
z+((~|eu1dKfWRR7!dTZ4lf?sB<a9g~-q7(#IIm+!Hs51h$FO*h1xD~h$5T9GSE66d
zd=z@EPi}4OdYV0T*;mtSyEBHX!ug_eGaCw5n>AS%nWDx=mb=2HyZQC96}0eU=G%#o
z=le_re5MFKQwN_ZfzOn{XG-8RCGeR7_)HCarVKt)3EnkIzX4+i(5K|Y7mR#nOp&*Y
zA5ccXLxVs-ASlo%5Hh|Y?4gOId5DmjJ?Nws53R;ew0USJb$IABl!q>XdtX^q;U#e%
zt;9HjNI=6hS2O6sEZ;rH87Dce6#H4gB+`s5Vu`<1{zG%fu);9L*`xHjK@O6KjPGbl
z5h9levzG<B`Xw}WmyQnX4(@(oQuXS7gy?6{h&AX~M>~u5vQQLxOmHW}yjOm9?7t);
Vo=Bo@ULa}Ii1$yD8!&bI@IUhU(USlG

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestClashNameIface.class b/testData/classes/pkg/TestClashNameIface.class
new file mode 100644
index 0000000000000000000000000000000000000000..eeb153ce5d52081c3c9667bd107c608763146e39
GIT binary patch
literal 134
zcmX^0Z`VEs1_l!bPId-%b_Nbc2F5f-24)S-Fh&Nh;QZ2}<W#rJoK!{zp^((#66c)6
z;tapU+*G}+#Ii(22C;(dbbS;F&$Ps3plSh-ynaq%Ub?=2QdVkm2^#|gBLfrACLqlM
Qw19yH#A09tl1vP201@0CGXMYp

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestClashNameParent.class b/testData/classes/pkg/TestClashNameParent.class
new file mode 100644
index 0000000000000000000000000000000000000000..4c4119d6ae4594b387385006b00eb75faeaff9c4
GIT binary patch
literal 210
zcmX^0Z`VEs1_l!bUM>b^1}=66ZgvJ9Mg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;|
zRKL>Pq|~C2#H1Xc2v=}^X;E^jTPBDj6p~t8;+&IMoZ*+4o2r+USeD4cz{0@F$RJ*j
zovx1}8<1F(npeWeAOKROpOcuEuJ50em6}|_puoTcbO{JB0x?iKkY)q2WPvnDgjH)h
X1LH=pG&_)F0}HAFNe&>7iGdRUtR*T&

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSwitchOnEnum$1.class b/testData/classes/pkg/TestSwitchOnEnum$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..a3f6924427ab5cdb2e3ff4e01e70e4a567a02156
GIT binary patch
literal 618
zcmah{U2oGc6g^Hu-G+<>*v2*(`yfc&3lY-ZK)jSzs@U3x6nNNE>RPQg*O{DT{3M<?
zqzNIkAHa`7T!)8B2!Uk#-eaG8u6*ntKfm1qIKuM)YgliiiH$a8j~v|O*y7mcc*4+$
z(@&}t^ONi%KFcn%xGI&7MQ%i8tu$pkRtx#wsFJ}u9Wb<B3#|ygVQ6#?KQQ>+d@31M
zkCl<bYB7;^oJ}<CtfXZo&Plh%)RG}c^U4a@SMGd$EQ|7Y^O5P9YVpGLC#9YdIxm!&
zoyc;YPdRoto`%@PUWgXjA@*?);u&IwZC8@$%*>Kuo>pSsS5i-V*5;OB<Kldl{MjUa
z$q){Vk+!R|qL2kcv=kXl&ZMBLuKlf)VW(y~hmxg3$<m?bWu_}9dC)mLJ^m;86$4Lu
z-O=!E%CP%?Zf>W_WV&{J5be=>a(Z7DZ8}R_Mlrx$iXovs8k7NBU%_s_2VdY_yV1CT
z?~gvie|JU4^?$$}cvvB7vn~j6k8%$0BgZO8B_inIJ|0l?@sQTXGy@_xDI#k90vtD!
AnE(I)

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSwitchOnEnum.class b/testData/classes/pkg/TestSwitchOnEnum.class
new file mode 100644
index 0000000000000000000000000000000000000000..c377fe7c382803b81ffc793e521f9077c157208a
GIT binary patch
literal 557
zcmaJ-O;5r=5Pe%d3bg_%;1_5#J)kBuCf+n&2u2c=1L(z5DH|-bTT)t$zsVCGH1XgM
z@JAVEi^jwlcQbEhcW2(dnfH&^HvmW2){w$V7HJeUlu%Z&s$xyWI)mO4f(H%PnojwY
zA>}=^M99Ee4Cxa`IN>QnqPBO<kZkw^&X8|Af?q~np9ejw@6wGL@@d%ZG#Pel?U8k7
znNjGtrtJ$m3IZ-dv*&pHinxv?&tf;U?D2&)`6}1CeiYdJ%#mEBp5(fBLi@HOnj-S*
zl2C_+1sxmMR8i4U#TG+xG9H@0vl$Ap0M`;jv(q1On|dk#m1!I@)QtI0q{WbBhSY8R
z=r+D}GblGSkm|q9(IEU_;0Vi&C)UCak~DUJk!6r2R4ArS2z5GD$;-FY{tMWQ0-6nB
zdVWcmL!MBko>Qqpe(MR!!7~!|M>^0dkx2?^#hK(#VvZaV6zixEM->IyATdfszAwdD
O%TUQ{RGB7^Lgo|YFLYo4

literal 0
HcmV?d00001

diff --git a/testData/results/InvalidMethodSignature.dec b/testData/results/InvalidMethodSignature.dec
index e2a15b3..e4b567c 100644
--- a/testData/results/InvalidMethodSignature.dec
+++ b/testData/results/InvalidMethodSignature.dec
@@ -17,7 +17,7 @@ class i implements bg {
 
    public void a(c var1, k var2, boolean var3) {
       File var4 = this.a.b().a(var1);// 2
-      b.a(this.b).add(var4);// 3
+      a.a.a.a.e.f.b.a(this.b).add(var4);// 3
    }// 4
 
    public void a(a.a.a.a.c.b var1) {
diff --git a/testData/results/TestClashName.dec b/testData/results/TestClashName.dec
new file mode 100644
index 0000000..2a9a731
--- /dev/null
+++ b/testData/results/TestClashName.dec
@@ -0,0 +1,108 @@
+package pkg;
+
+@SharedName4
+public class TestClashName extends ext.TestClashNameParent implements TestClashNameIface {
+   int TestClashNameParent = 0;
+   int TestClashNameIface = 0;
+   int SharedName1 = 0;
+   int SharedName4 = 0;
+   int SharedName5 = 0;
+   int i;
+   int j;
+   int k;
+   int l;
+   int m;
+   int n;
+   SharedName1 p;
+   SharedName5<SharedName1> q;
+
+   public TestClashName() {
+      this.i = pkg.SharedName1.f;// 59
+      this.j = NonSharedName.f;// 60
+      this.k = SharedName2.f;// 61
+      this.l = pkg.SharedName3.f;// 62
+      this.m = pkg.SharedName1.getF();// 63
+      this.n = NonSharedName.getF();// 64
+      this.p = null;// 65
+      this.q = null;// 67
+   }
+
+   @SharedName4
+   public int m() {
+      int var1 = this.i;// 73
+      pkg.SharedName1.f = this.j;// 74
+      int var2 = SharedName2.f;// 75
+      NonSharedName.f = this.k;// 76
+      int var3 = NonSharedName.f;// 77
+      return var1 + var2 + var3;// 78
+   }
+
+   public void f() {
+   }// 82
+}
+
+class 'pkg/TestClashName' {
+   method '<init> ()V' {
+      1e      19
+      21      19
+      25      20
+      28      20
+      2c      21
+      2f      21
+      33      22
+      36      22
+      3a      23
+      3d      23
+      41      24
+      44      24
+      48      25
+      49      25
+      4d      26
+      4e      26
+      51      27
+   }
+
+   method 'm ()I' {
+      1      31
+      4      31
+      6      32
+      9      32
+      c      33
+      f      33
+      11      34
+      14      34
+      17      35
+      1a      35
+      1d      36
+      1f      36
+      20      36
+   }
+
+   method 'f ()V' {
+      0      40
+   }
+}
+
+Lines mapping:
+59 <-> 20
+60 <-> 21
+61 <-> 22
+62 <-> 23
+63 <-> 24
+64 <-> 25
+65 <-> 26
+67 <-> 27
+73 <-> 32
+74 <-> 33
+75 <-> 34
+76 <-> 35
+77 <-> 36
+78 <-> 37
+82 <-> 41
+Not mapped:
+52
+53
+54
+55
+56
+57
diff --git a/testData/results/TestSwitchOnEnum.dec b/testData/results/TestSwitchOnEnum.dec
new file mode 100644
index 0000000..4a6d980
--- /dev/null
+++ b/testData/results/TestSwitchOnEnum.dec
@@ -0,0 +1,31 @@
+package pkg;
+
+import java.util.concurrent.TimeUnit;
+
+public class TestSwitchOnEnum {
+   int myInt;
+
+   public void testSOE(TimeUnit var1) {
+      switch(null.$SwitchMap$java$util$concurrent$TimeUnit[var1.ordinal()]) {// 12
+      case 1:
+         return;// 14
+      default:
+      }
+   }// 16
+}
+
+class 'pkg/TestSwitchOnEnum' {
+   method 'testSOE (Ljava/util/concurrent/TimeUnit;)V' {
+      0      8
+      4      8
+      7      8
+      8      8
+      1c      10
+      1d      13
+   }
+}
+
+Lines mapping:
+12 <-> 9
+14 <-> 11
+16 <-> 14
diff --git a/testData/src/ext/TestClashNameIface.java b/testData/src/ext/TestClashNameIface.java
new file mode 100644
index 0000000..9d7630b
--- /dev/null
+++ b/testData/src/ext/TestClashNameIface.java
@@ -0,0 +1,4 @@
+package ext;
+interface TestClashNameIface {
+  public void foo();
+}
diff --git a/testData/src/ext/TestClashNameParent.java b/testData/src/ext/TestClashNameParent.java
new file mode 100644
index 0000000..7691344
--- /dev/null
+++ b/testData/src/ext/TestClashNameParent.java
@@ -0,0 +1,5 @@
+package ext;
+
+public class TestClashNameParent {
+  int SharedName3 = 0;
+}
diff --git a/testData/src/pkg/TestClashName.java b/testData/src/pkg/TestClashName.java
new file mode 100644
index 0000000..3b13448
--- /dev/null
+++ b/testData/src/pkg/TestClashName.java
@@ -0,0 +1,83 @@
+package pkg;
+
+/*
+ * The names SharedName[123] are shared between variables in local|parent class and class names.
+ * Where approprate, the classes have to be referenced by fully qualified names
+ */
+
+class SharedName1 {
+  static int f = 0;
+
+  static int getF() {
+    return f;
+  }
+}
+
+class SharedName2 {
+  static int f = 0;
+}
+
+class SharedName3 {
+  static int f = 0;
+}
+
+class NonSharedName {
+  static int f = 0;
+
+  static int getF() {
+    return f;
+  }
+}
+
+@interface SharedName4 {
+}
+
+class SharedName5<T>{
+}
+
+class TestClashNameParent {
+
+}
+
+interface TestClashNameIface {
+  public void f();
+}
+// *** Legend for first sentence in comments below:
+// (+) or (-) indicate whether 'pkg' prefix is or is not required when referencing *SharedName*.
+//  The sign is optionally followed by decompiler class name that generates the line that is being commented
+// in a call of getShortName()
+
+@SharedName4 // (-)AnnotationExprent. While a variable named SharedName4 does exist in the annotated class,
+             // lookup process for annotation names never includes variable names.
+public class TestClashName extends ext.TestClashNameParent implements /*pkg.*/TestClashNameIface { // (+)(-)TextUtil
+  int TestClashNameParent = 0;
+  int TestClashNameIface = 0;
+  int SharedName1 = 0;
+  int SharedName4 = 0;
+  int SharedName5 = 0;
+
+  int i = pkg.SharedName1.f;     // (+)FieldExprent. SharedName1 class name is shadowed by a variable in this class
+  int j = NonSharedName.f;       // (-)FieldExprent. The NonSharedName is not used for other objects in the current scope
+  int k = SharedName2.f;         // (-)FieldExprent. SharedName2 variable is not the current scope
+  int l = pkg.SharedName3.f;     // (+)FieldExprent. SharedName3 class name is shadowed by a variable in parent class
+  int m = pkg.SharedName1.getF();// (+)InvocationExprent.  SharedName1 class name is shadowed by a variable in this class
+  int n = NonSharedName.getF();  // (-)InvocationExprent. The NonSharedName is not used for other objects in the current scope
+  SharedName1 p = null;          // (-)ExprProcessor. While a variable named SharedName1 in current scope does exist,
+                                 // namespace in type declaration does not include variable names in a scope
+  SharedName5<SharedName1> q = null;//(-)(-)GenericMain (both names).  While a variable named SharedName1 does exist in current scope,
+                                  // lookup for generic parameters never includes variable names
+
+  @SharedName4 // (-)AnnotationExprent. While a variable named SharedName4 does exist in current scope,
+               // lookup process for annotation names never includes variable names.
+  public int m() {
+    int SharedName2 = i;
+    pkg.SharedName1.f = j;       // (+)FieldExprent. SharedName1 class name is shadowed by a variable in this class
+    int x = pkg.SharedName2.f;   // (+)FieldExprent. SharedName2 class name is shadowed by a variable in this method
+    NonSharedName.f = k;         // (-)ExprProcessor. The NonSharedName is not used for other objects in the current scope
+    int y = NonSharedName.f;     // (-)FieldExprent. The NonSharedName is not used for other objects in the current scope
+    return SharedName2 + x + y;
+  }
+
+  @Override
+  public void f() {}
+}
diff --git a/testData/src/pkg/TestSwitchOnEnum.java b/testData/src/pkg/TestSwitchOnEnum.java
new file mode 100644
index 0000000..ec07604
--- /dev/null
+++ b/testData/src/pkg/TestSwitchOnEnum.java
@@ -0,0 +1,20 @@
+package pkg;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This illustrates a bug in fernflower as of 20170421. Decompiled output of this class does not compile back.
+ */
+public class TestSwitchOnEnum {
+
+  int myInt;
+
+  public int testSOE(TimeUnit t) {
+    // This creates anonymous SwitchMap inner class.
+    switch (t) {
+      case SECONDS:
+        return 1;
+    }
+    return 0;
+  }
+}

From d149b53799aa0cbf26a6e107d19a4539a7a3b94b Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 24 Apr 2017 15:11:07 +0300
Subject: [PATCH 105/252] minor cleanup and formatting

---
 .../main/collectors/ImportCollector.java      | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index f5cd16d..ee3933c 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.java.decompiler.main.collectors;
 
-import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.TextBuffer;
@@ -49,20 +48,16 @@ public class ImportCollector {
       currentPackagePoint = "";
     }
 
-    Map<String, ClassNode> mapRootCases =  DecompilerContext.getClassProcessor().getMapRootClasses();
-    for(StructClass sClass = root.classStruct;
-        sClass!=null;
-        ){
-      // all field names for current class ..
-      for(StructField f: sClass.getFields()) {
+    Map<String, StructClass> classes = DecompilerContext.getStructContext().getClasses();
+    StructClass currentClass = root.classStruct;
+    while (currentClass != null) {
+      // all field names for the current class ..
+      for (StructField f : currentClass.getFields()) {
         setFieldNames.add(f.getName());
       }
 
       // .. and traverse through parent.
-      ClassNode classNode;
-      if(sClass.superClass==null || (classNode = (mapRootCases.get(sClass.superClass.getString())))==null)
-            break;
-      sClass = classNode.classStruct;
+      currentClass = currentClass.superClass != null ? classes.get(currentClass.superClass.getString()) : null;
     }
   }
 
@@ -74,9 +69,10 @@ public class ImportCollector {
    */
   public String getShortNameInClassContext(String classToName) {
     String shortName = getShortName(classToName);
-    if(setFieldNames.contains(shortName)) {
+    if (setFieldNames.contains(shortName)) {
       return classToName;
-    } else {
+    }
+    else {
       return shortName;
     }
   }

From dfd90978c960a9741735c8c01e29b9776d0f8a13 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Tue, 18 Apr 2017 22:16:52 +0200
Subject: [PATCH 106/252] Avoid explicit array creation for vararg parameters

---
 .../decompiler/exps/InvocationExprent.java    |  35 +++++-
 .../modules/decompiler/exps/NewExprent.java   |  29 +++++
 .../java/decompiler/SingleClassesTest.java    |   2 +-
 testData/classes/pkg/TestVarArgCalls.class    | Bin 0 -> 1484 bytes
 testData/results/TestVarArgCalls.dec          | 104 ++++++++++++++++++
 testData/src/pkg/TestVarArgCalls.java         |  29 +++++
 6 files changed, 193 insertions(+), 6 deletions(-)
 create mode 100644 testData/classes/pkg/TestVarArgCalls.class
 create mode 100644 testData/results/TestVarArgCalls.dec
 create mode 100644 testData/src/pkg/TestVarArgCalls.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index f56a805..7f6f382 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -343,14 +343,18 @@ public class InvocationExprent extends Exprent {
 
     BitSet setAmbiguousParameters = getAmbiguousParameters();
 
+    // omit 'new Type[] {}' for the last parameter of a vararg method call
+    if (lstParameters.size() == descriptor.params.length && isVarArgCall()) {
+      Exprent lastParam = lstParameters.get(lstParameters.size() - 1);
+      if (lastParam.type == EXPRENT_NEW && lastParam.getExprType().arrayDim >= 1) {
+        ((NewExprent) lastParam).setVarArgParam(true);
+      }
+    }
+
     boolean firstParameter = true;
     int start = isEnum ? 2 : 0;
     for (int i = start; i < lstParameters.size(); i++) {
       if (sigFields == null || sigFields.get(i) == null) {
-        if (!firstParameter) {
-          buf.append(", ");
-        }
-
         TextBuffer buff = new TextBuffer();
         boolean ambiguous = setAmbiguousParameters.get(i);
 
@@ -361,7 +365,14 @@ public class InvocationExprent extends Exprent {
         }
         // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
         ExprProcessor.getCastedExprent(param, descriptor.params[i], buff, indent, true, ambiguous, true, tracer);
-        buf.append(buff);
+
+        // the last "new Object[0]" in the vararg call is not printed
+        if (buff.length() > 0) {
+          if (!firstParameter) {
+            buf.append(", ");
+          }
+          buf.append(buff);
+        }
 
         firstParameter = false;
       }
@@ -372,6 +383,20 @@ public class InvocationExprent extends Exprent {
     return buf;
   }
 
+  private boolean isVarArgCall() {
+    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+    if (cl != null) {
+      StructMethod mt = cl.getMethod(InterpreterUtil.makeUniqueKey(name, stringDescriptor));
+      if (mt != null) {
+        return mt.hasModifier(CodeConstants.ACC_VARARGS);
+      }
+    }
+    else {
+      // TODO: try to check the class on the classpath
+    }
+    return false;
+  }
+
   private boolean isBoxingCall() {
     if (isStatic && "valueOf".equals(name) && lstParameters.size() == 1) {
       int paramType = lstParameters.get(0).getExprType().type;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index f31f3a8..d608be4 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -44,6 +44,7 @@ public class NewExprent extends Exprent {
   private List<Exprent> lstDims = new ArrayList<>();
   private List<Exprent> lstArrayElements = new ArrayList<>();
   private boolean directArrayInit;
+  private boolean isVarArgParam;
   private boolean anonymous;
   private boolean lambda;
   private boolean enumConst;
@@ -349,6 +350,30 @@ public class NewExprent extends Exprent {
         }
       }
     }
+    else if (isVarArgParam) {
+      // just print the array elements
+      VarType leftType = newType.decreaseArrayDim();
+      for (int i = 0; i < lstArrayElements.size(); i++) {
+        if (i > 0) {
+          buf.append(", ");
+        }
+
+        // new String[][]{{"abc"}, {"DEF"}} => new String[]{"abc"}, new String[]{"DEF"}
+        Exprent element = lstArrayElements.get(i);
+        if (element.type == EXPRENT_NEW) {
+          ((NewExprent) element).setDirectArrayInit(false);
+        }
+        ExprProcessor.getCastedExprent(element, leftType, buf, indent, false, tracer);
+      }
+
+      // if there is just one element of Object[] type it needs to be casted to resolve ambiguity
+      if (lstArrayElements.size() == 1) {
+        VarType elementType = lstArrayElements.get(0).getExprType();
+        if (elementType.type == CodeConstants.TYPE_OBJECT && elementType.value.equals("java/lang/Object") && elementType.arrayDim >= 1) {
+          buf.prepend("(Object)");
+        }
+      }
+    }
     else {
       buf.append("new ").append(ExprProcessor.getTypeName(newType));
 
@@ -478,6 +503,10 @@ public class NewExprent extends Exprent {
     this.directArrayInit = directArrayInit;
   }
 
+  public void setVarArgParam(boolean isVarArgParam) {
+    this.isVarArgParam = isVarArgParam;
+  }
+
   public boolean isLambda() {
     return lambda;
   }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index b4567e0..0ce7f87 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -106,7 +106,7 @@ public class SingleClassesTest {
           "pkg/SharedName2", "pkg/SharedName3", "pkg/SharedName4", "pkg/NonSharedName",
           "pkg/TestClashNameParent", "ext/TestClashNameParent","pkg/TestClashNameIface", "ext/TestClashNameIface"); }
   @Test public void testSwitchOnEnum() { doTest("pkg/TestSwitchOnEnum","pkg/TestSwitchOnEnum$1");}
-
+  @Test public void testVarArgCalls() { doTest("pkg/TestVarArgCalls"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestVarArgCalls.class b/testData/classes/pkg/TestVarArgCalls.class
new file mode 100644
index 0000000000000000000000000000000000000000..ac83648354ab36de8a64b4683235c82612398d57
GIT binary patch
literal 1484
zcmb7EOH<QO6#g!0NeF>L%2QD51MCARDuO&jk%yoKbi&|t7#ArGC73o$35<*@*8U6E
zY;=JPGdeDG<BxJYHwkTE>Wp@goAaITobTN4-t^b+vu^-Kup*-g0}=*B49Vy~TEeh|
zyAtk6xG$ogV<QqCNEj6{CPTnO3F9&*Fezb5!Xpu}22A6zj3<~8@sy!{$}E}AG=mUN
ztTTjW?YzMd$(SW$Wxtp+%4>SgB1FyDo4U2GmrWk~V941v_ZZqUyKf8WHDk}A{7ktp
zt6SFIB=yeQTG832u6f<j8KN7R9sNL0TY9OGUd`<on+~z0-LhG7W-N;#9uE*Shw#E=
zu*Qe@pu$$s;Zs!``bm=A)ysO3=DMI)Nh_}2tX<r-jCTx)TAF_mZQH1kV30L?zr1NI
znB1tgOFj(o2^Dmri+tcYhL+1iE4YE1<OEMo#QJD-LC<Y6G@S#nK@XjqUr=xdafU`e
zwK4pL?=%o`u7?J6Jhv6hVy>!_7csA30ne&Rd0#2KXjqmlVo|{oo{M;)AcJKRs&Uff
z_?BHR>a?@*T4n~$$UpQ%0IHlzYt@ydl4BH%GJ|-aTl>c97DGpTDOlw*==uaUsU7Y)
zMv=_3_i2`PPsFs-FZl%{9YZftLDbc`2$Pa~E36XL)!0K~oldBOK0f{nf$`&{XE#M@
zS{be3<QK3{^iqc_^sIM50X_7tcm(v~Dn$&}&Wl+B4a5h2Ce=FOD})n-l4>|aZ&^XD
z*W6GHpNH9yDtQ<uH=ICDs*OZ$$O@Gb$`h(k%>^_Y@)?rG8LnE>DVkra5lS>=g_ifH
zXwh7xm5M8ftI1)Hrm9-T9gqkqj~-5aN0c+Fn;&(Z3PUCvx*=kawmC-8G8$o1?hwuR
zfCxUK6~|C<hA4iZ%{8mTGsHLRnCh=1My4I{Z-iFv`78Qo6KIWmMq6sYlRrUwbpY9I
v(n&I1Zqt}Y_nT57ZsE3jDiQRdpV&wIv--dGJ=DJUAKE9VJwuY_twZV$;7&K~

literal 0
HcmV?d00001

diff --git a/testData/results/TestVarArgCalls.dec b/testData/results/TestVarArgCalls.dec
new file mode 100644
index 0000000..736585f
--- /dev/null
+++ b/testData/results/TestVarArgCalls.dec
@@ -0,0 +1,104 @@
+package pkg;
+
+public class TestVarArgCalls {
+   public void doSmth() {
+      this.printAll("Test");// 5
+      this.printAll("Test: %s", "abc");// 6
+      this.printAll("Test: %s - %s", "abc", "DEF");// 7
+      this.printComplex("Test");// 9
+      this.printComplex("Test: %[0]s", new String[]{"abc"});// 10
+      this.printComplex("Test: %[0]s - %[0]s", new String[]{"abc"}, new String[]{"DEF"});// 11
+      String.format("Test", new Object[0]);// 13
+      String.format("Test: %d", new Object[]{Integer.valueOf(123)});// 14
+      String.format("Test: %d - %s", new Object[]{Integer.valueOf(123), "DEF"});// 15
+      Object[] data = new Object[]{"Hello"};// 17
+      String.format("Test: %s", new Object[]{data});// 18
+      String.format("Test: %s", (Object[])data);// 19
+   }// 20
+
+   public void printAll(String fmt, String... params) {
+      System.out.println(String.format(fmt, (Object[])params));// 23
+   }// 24
+
+   public void printComplex(String fmt, String[]... params) {
+      System.out.println(String.format(fmt, (Object[])params));// 27
+   }// 28
+}
+
+class 'pkg/TestVarArgCalls' {
+   method 'doSmth ()V' {
+      1      4
+      7      4
+      b      5
+      13      5
+      16      5
+      1a      6
+      22      6
+      27      6
+      2a      6
+      2e      7
+      34      7
+      38      8
+      46      8
+      4a      8
+      4e      9
+      5c      9
+      68      9
+      6c      9
+      6f      10
+      71      10
+      75      10
+      79      11
+      81      11
+      83      11
+      87      11
+      8b      12
+      93      12
+      95      12
+      9b      12
+      9e      12
+      a8      13
+      ab      13
+      ac      14
+      b6      14
+      ba      15
+      bd      15
+      c0      15
+      c4      16
+   }
+
+   method 'printAll (Ljava/lang/String;[Ljava/lang/String;)V' {
+      0      19
+      5      19
+      8      19
+      b      19
+      e      20
+   }
+
+   method 'printComplex (Ljava/lang/String;[[Ljava/lang/String;)V' {
+      0      23
+      5      23
+      8      23
+      b      23
+      e      24
+   }
+}
+
+Lines mapping:
+5 <-> 5
+6 <-> 6
+7 <-> 7
+9 <-> 8
+10 <-> 9
+11 <-> 10
+13 <-> 11
+14 <-> 12
+15 <-> 13
+17 <-> 14
+18 <-> 15
+19 <-> 16
+20 <-> 17
+23 <-> 20
+24 <-> 21
+27 <-> 24
+28 <-> 25
diff --git a/testData/src/pkg/TestVarArgCalls.java b/testData/src/pkg/TestVarArgCalls.java
new file mode 100644
index 0000000..61c199c
--- /dev/null
+++ b/testData/src/pkg/TestVarArgCalls.java
@@ -0,0 +1,29 @@
+package pkg;
+
+public class TestVarArgCalls {
+  public void doSmth() {
+    printAll("Test");
+    printAll("Test: %s", "abc");
+    printAll("Test: %s - %s", "abc", "DEF");
+
+    printComplex("Test");
+    printComplex("Test: %[0]s", new String[] { "abc" });
+    printComplex("Test: %[0]s - %[0]s", new String[] { "abc" }, new String[] { "DEF" });
+
+    String.format("Test");
+    String.format("Test: %d", 123);
+    String.format("Test: %d - %s", 123, "DEF");
+
+    Object[] data = { "Hello" };
+    String.format("Test: %s", (Object) data);
+    String.format("Test: %s", (Object[]) data);
+  }
+
+  public void printAll(String fmt, String... params) {
+    System.out.println(String.format(fmt, (Object[]) params));
+  }
+
+  public void printComplex(String fmt, String[]... params) {
+    System.out.println(String.format(fmt, (Object[]) params));
+  }
+}

From 94198aa8a5b37092cdfde47488c087bc713a228d Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Tue, 18 Apr 2017 23:34:08 +0200
Subject: [PATCH 107/252] Detect external vararg methods too (if available on
 the classpath)

---
 .../modules/decompiler/ClasspathHelper.java   | 70 +++++++++++++++++++
 .../decompiler/exps/InvocationExprent.java    |  6 +-
 testData/results/TestClassLambda.dec          |  2 +-
 testData/results/TestVarArgCalls.dec          |  9 ++-
 4 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
new file mode 100644
index 0000000..b8ceb06
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
@@ -0,0 +1,70 @@
+package org.jetbrains.java.decompiler.modules.decompiler;
+
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+import org.jetbrains.java.decompiler.struct.gen.VarType;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClasspathHelper {
+
+  private static final Map<String, Method> METHOD_CACHE = Collections.synchronizedMap(new HashMap<>());
+
+  public static Method findMethod(String classname, String methodName, MethodDescriptor descriptor) {
+    String targetClass = classname.replace('/', '.');
+    String methodSignature = buildMethodSignature(targetClass + '.' + methodName, descriptor);
+
+    Method method;
+    if (METHOD_CACHE.containsKey(methodSignature)) {
+      method = METHOD_CACHE.get(methodSignature);
+    }
+    else {
+      method = findMethodOnClasspath(targetClass, methodSignature);
+      METHOD_CACHE.put(methodSignature, method);
+    }
+
+    return method;
+  }
+
+  private static Method findMethodOnClasspath(String targetClass, String methodSignature) {
+    try {
+      Class cls = Class.forName(targetClass);
+      for (Method mtd : cls.getMethods()) {
+        // use contains() to ignore access modifiers and thrown exceptions
+        if (mtd.toString().contains(methodSignature)) {
+          return mtd;
+        }
+      }
+    }
+    catch (Exception e) {
+      // ignore
+    }
+    return null;
+  }
+
+  private static String buildMethodSignature(String name, MethodDescriptor md) {
+    StringBuilder sb = new StringBuilder();
+
+    appendType(sb, md.ret);
+    sb.append(' ').append(name).append('(');
+    for (VarType param : md.params) {
+      appendType(sb, param);
+      sb.append(',');
+    }
+    if (sb.charAt(sb.length() - 1) == ',') {
+      sb.setLength(sb.length() - 1);
+    }
+    sb.append(')');
+
+    return sb.toString();
+  }
+
+  private static void appendType(StringBuilder sb, VarType type) {
+    sb.append(type.value.replace('/', '.'));
+    for (int i = 0; i < type.arrayDim; i++) {
+      sb.append("[]");
+    }
+  }
+}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 7f6f382..5f3c197 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.ClasspathHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
@@ -39,6 +40,7 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
+import java.lang.reflect.Method;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -392,7 +394,9 @@ public class InvocationExprent extends Exprent {
       }
     }
     else {
-      // TODO: try to check the class on the classpath
+      // try to check the class on the classpath
+      Method mtd = ClasspathHelper.findMethod(classname, name, descriptor);
+      return mtd != null && mtd.isVarArgs();
     }
     return false;
   }
diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index 751537c..609928c 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -15,7 +15,7 @@ public class TestClassLambda {
    public int field = 0;
 
    public void testLambda() {
-      List var1 = Arrays.asList(new Integer[]{Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), Integer.valueOf(6), Integer.valueOf(7)});// 29
+      List var1 = Arrays.asList(Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), Integer.valueOf(6), Integer.valueOf(7));// 29
       int var2 = (int)Math.random();// 30
       var1.forEach((var2x) -> {// 32
          int var3 = 2 * var2x.intValue();// 33
diff --git a/testData/results/TestVarArgCalls.dec b/testData/results/TestVarArgCalls.dec
index 736585f..1ccd16a 100644
--- a/testData/results/TestVarArgCalls.dec
+++ b/testData/results/TestVarArgCalls.dec
@@ -8,11 +8,11 @@ public class TestVarArgCalls {
       this.printComplex("Test");// 9
       this.printComplex("Test: %[0]s", new String[]{"abc"});// 10
       this.printComplex("Test: %[0]s - %[0]s", new String[]{"abc"}, new String[]{"DEF"});// 11
-      String.format("Test", new Object[0]);// 13
-      String.format("Test: %d", new Object[]{Integer.valueOf(123)});// 14
-      String.format("Test: %d - %s", new Object[]{Integer.valueOf(123), "DEF"});// 15
+      String.format("Test");// 13
+      String.format("Test: %d", Integer.valueOf(123));// 14
+      String.format("Test: %d - %s", Integer.valueOf(123), "DEF");// 15
       Object[] data = new Object[]{"Hello"};// 17
-      String.format("Test: %s", new Object[]{data});// 18
+      String.format("Test: %s", (Object)data);// 18
       String.format("Test: %s", (Object[])data);// 19
    }// 20
 
@@ -46,7 +46,6 @@ class 'pkg/TestVarArgCalls' {
       68      9
       6c      9
       6f      10
-      71      10
       75      10
       79      11
       81      11

From 592a24cd8517000362c240b8185169c20755a72c Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Wed, 19 Apr 2017 22:19:45 +0200
Subject: [PATCH 108/252] Fixed tests after rebasing to the latest master

---
 testData/results/TestPrimitives.dec | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 63f2f64..de8a420 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -10,39 +10,39 @@ public class TestPrimitives {
       this.printFloat(1.23F);// 11
       this.printDouble(1.23D);// 12
       this.printChar('Z');// 13
-      System.out.println(String.format("%b, %d, %d, %d", new Object[]{this.getBoolean(), this.getByte(), this.getShort(), this.getInt()}));// 15
+      System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 15
    }// 16
 
    public void printBoolean(boolean b) {
-      System.out.println(String.format("%b", new Object[]{b}));// 19
+      System.out.println(String.format("%b", b));// 19
    }// 20
 
    public void printByte(byte b) {
-      System.out.println(String.format("%d", new Object[]{b}));// 23
+      System.out.println(String.format("%d", b));// 23
    }// 24
 
    public void printShort(short s) {
-      System.out.println(String.format("%d", new Object[]{s}));// 27
+      System.out.println(String.format("%d", s));// 27
    }// 28
 
    public void printInt(int i) {
-      System.out.println(String.format("%d", new Object[]{i}));// 31
+      System.out.println(String.format("%d", i));// 31
    }// 32
 
    public void printLong(long l) {
-      System.out.println(String.format("%d", new Object[]{l}));// 35
+      System.out.println(String.format("%d", l));// 35
    }// 36
 
    public void printFloat(float f) {
-      System.out.println(String.format("%f", new Object[]{f}));// 39
+      System.out.println(String.format("%f", f));// 39
    }// 40
 
    public void printDouble(double d) {
-      System.out.println(String.format("%f", new Object[]{d}));// 43
+      System.out.println(String.format("%f", d));// 43
    }// 44
 
    public void printChar(char c) {
-      System.out.println(String.format("%c", new Object[]{c}));// 47
+      System.out.println(String.format("%c", c));// 47
    }// 48
 
    public boolean getBoolean() {

From 5de2e5b11bea3d8643a65d7499fca1fe15ac31f2 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Fri, 21 Apr 2017 21:35:03 +0200
Subject: [PATCH 109/252] Use bootstrap classloader to only provide access to
 JRE classes

---
 .../java/decompiler/modules/decompiler/ClasspathHelper.java    | 3 ++-
 .../decompiler/modules/decompiler/exps/InvocationExprent.java  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
index b8ceb06..83ad121 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
@@ -30,7 +30,8 @@ public class ClasspathHelper {
 
   private static Method findMethodOnClasspath(String targetClass, String methodSignature) {
     try {
-      Class cls = Class.forName(targetClass);
+      // use bootstrap classloader to only provide access to JRE classes
+      Class cls = new ClassLoader(null) {}.loadClass(targetClass);
       for (Method mtd : cls.getMethods()) {
         // use contains() to ignore access modifiers and thrown exceptions
         if (mtd.toString().contains(methodSignature)) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 5f3c197..8d53711 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -394,6 +394,8 @@ public class InvocationExprent extends Exprent {
       }
     }
     else {
+      // TODO: tap into IDEA indices to access libraries methods details
+
       // try to check the class on the classpath
       Method mtd = ClasspathHelper.findMethod(classname, name, descriptor);
       return mtd != null && mtd.isVarArgs();

From 2fab291fe12d2fc474c6b5120c720069d99790bb Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 24 Apr 2017 19:26:32 +0300
Subject: [PATCH 110/252] minor cleanup: avoid creating empty arrays and
 unneeded boxing

---
 .../java/decompiler/struct/StructMethod.java  | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index 64ee869..c86ea02 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -141,26 +141,26 @@ public class StructMethod extends StructMember {
       List<Integer> operands = new ArrayList<>();
 
       if (opcode >= opc_iconst_m1 && opcode <= opc_iconst_5) {
-        operands.add(new Integer(opr_iconst[opcode - opc_iconst_m1]));
+        operands.add(opr_iconst[opcode - opc_iconst_m1]);
         opcode = opc_bipush;
       }
       else if (opcode >= opc_iload_0 && opcode <= opc_aload_3) {
-        operands.add(new Integer(opr_loadstore[opcode - opc_iload_0]));
+        operands.add(opr_loadstore[opcode - opc_iload_0]);
         opcode = opcs_load[(opcode - opc_iload_0) / 4];
       }
       else if (opcode >= opc_istore_0 && opcode <= opc_astore_3) {
-        operands.add(new Integer(opr_loadstore[opcode - opc_istore_0]));
+        operands.add(opr_loadstore[opcode - opc_istore_0]);
         opcode = opcs_store[(opcode - opc_istore_0) / 4];
       }
       else {
         switch (opcode) {
           case opc_bipush:
-            operands.add(new Integer(in.readByte()));
+            operands.add(Integer.valueOf(in.readByte()));
             i++;
             break;
           case opc_ldc:
           case opc_newarray:
-            operands.add(new Integer(in.readUnsignedByte()));
+            operands.add(Integer.valueOf(in.readUnsignedByte()));
             i++;
             break;
           case opc_sipush:
@@ -185,7 +185,7 @@ public class StructMethod extends StructMember {
             if (opcode != opc_sipush) {
               group = GROUP_JUMP;
             }
-            operands.add(new Integer(in.readShort()));
+            operands.add(Integer.valueOf(in.readShort()));
             i += 2;
             break;
           case opc_ldc_w:
@@ -201,7 +201,7 @@ public class StructMethod extends StructMember {
           case opc_anewarray:
           case opc_checkcast:
           case opc_instanceof:
-            operands.add(new Integer(in.readUnsignedShort()));
+            operands.add(in.readUnsignedShort());
             i += 2;
             if (opcode >= opc_getstatic && opcode <= opc_putfield) {
               group = GROUP_FIELDACCESS;
@@ -212,7 +212,7 @@ public class StructMethod extends StructMember {
             break;
           case opc_invokedynamic:
             if (classStruct.isVersionGE_1_7()) { // instruction unused in Java 6 and before
-              operands.add(new Integer(in.readUnsignedShort()));
+              operands.add(in.readUnsignedShort());
               in.discard(2);
               group = GROUP_INVOCATION;
               i += 4;
@@ -230,11 +230,11 @@ public class StructMethod extends StructMember {
           case opc_astore:
           case opc_ret:
             if (wide) {
-              operands.add(new Integer(in.readUnsignedShort()));
+              operands.add(in.readUnsignedShort());
               i += 2;
             }
             else {
-              operands.add(new Integer(in.readUnsignedByte()));
+              operands.add(in.readUnsignedByte());
               i++;
             }
             if (opcode == opc_ret) {
@@ -243,49 +243,49 @@ public class StructMethod extends StructMember {
             break;
           case opc_iinc:
             if (wide) {
-              operands.add(new Integer(in.readUnsignedShort()));
-              operands.add(new Integer(in.readShort()));
+              operands.add(in.readUnsignedShort());
+              operands.add(Integer.valueOf(in.readShort()));
               i += 4;
             }
             else {
-              operands.add(new Integer(in.readUnsignedByte()));
-              operands.add(new Integer(in.readByte()));
+              operands.add(in.readUnsignedByte());
+              operands.add(Integer.valueOf(in.readByte()));
               i += 2;
             }
             break;
           case opc_goto_w:
           case opc_jsr_w:
             opcode = opcode == opc_jsr_w ? opc_jsr : opc_goto;
-            operands.add(new Integer(in.readInt()));
+            operands.add(in.readInt());
             group = GROUP_JUMP;
             i += 4;
             break;
           case opc_invokeinterface:
-            operands.add(new Integer(in.readUnsignedShort()));
-            operands.add(new Integer(in.readUnsignedByte()));
+            operands.add(in.readUnsignedShort());
+            operands.add(in.readUnsignedByte());
             in.discard(1);
             group = GROUP_INVOCATION;
             i += 4;
             break;
           case opc_multianewarray:
-            operands.add(new Integer(in.readUnsignedShort()));
-            operands.add(new Integer(in.readUnsignedByte()));
+            operands.add(in.readUnsignedShort());
+            operands.add(in.readUnsignedByte());
             i += 3;
             break;
           case opc_tableswitch:
             in.discard((4 - (i + 1) % 4) % 4);
             i += ((4 - (i + 1) % 4) % 4); // padding
-            operands.add(new Integer(in.readInt()));
+            operands.add(in.readInt());
             i += 4;
             int low = in.readInt();
-            operands.add(new Integer(low));
+            operands.add(low);
             i += 4;
             int high = in.readInt();
-            operands.add(new Integer(high));
+            operands.add(high);
             i += 4;
 
             for (int j = 0; j < high - low + 1; j++) {
-              operands.add(new Integer(in.readInt()));
+              operands.add(in.readInt());
               i += 4;
             }
             group = GROUP_SWITCH;
@@ -294,16 +294,16 @@ public class StructMethod extends StructMember {
           case opc_lookupswitch:
             in.discard((4 - (i + 1) % 4) % 4);
             i += ((4 - (i + 1) % 4) % 4); // padding
-            operands.add(new Integer(in.readInt()));
+            operands.add(in.readInt());
             i += 4;
             int npairs = in.readInt();
-            operands.add(new Integer(npairs));
+            operands.add(npairs);
             i += 4;
 
             for (int j = 0; j < npairs; j++) {
-              operands.add(new Integer(in.readInt()));
+              operands.add(in.readInt());
               i += 4;
-              operands.add(new Integer(in.readInt()));
+              operands.add(in.readInt());
               i += 4;
             }
             group = GROUP_SWITCH;
@@ -319,14 +319,17 @@ public class StructMethod extends StructMember {
         }
       }
 
-      int[] ops = new int[operands.size()];
-      for (int j = 0; j < operands.size(); j++) {
-        ops[j] = operands.get(j).intValue();
+      int[] ops = null;
+      if (!operands.isEmpty()) {
+        ops = new int[operands.size()];
+        for (int j = 0; j < operands.size(); j++) {
+          ops[j] = operands.get(j).intValue();
+        }
       }
 
       Instruction instr = ConstantsUtil.getInstructionInstance(opcode, wide, group, bytecode_version, ops);
 
-      instructions.addWithKey(instr, new Integer(offset));
+      instructions.addWithKey(instr, offset);
 
       i++;
     }

From 5b634ecb4d7066d054db956822585fb768bfe38a Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 24 Apr 2017 19:45:23 +0300
Subject: [PATCH 111/252] do not collect field names into a separate set

---
 .../java/decompiler/main/rels/ClassWrapper.java       | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 5ae532a..acc2849 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -27,7 +27,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
-import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
@@ -56,12 +55,6 @@ public class ClassWrapper {
     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_WRAPPER, this);
     DecompilerContext.getLogger().startClass(classStruct.qualifiedName);
 
-    // collect field names
-    Set<String> setFieldNames = new HashSet<>();
-    for (StructField fd : classStruct.getFields()) {
-      setFieldNames.add(fd.getName());
-    }
-
     int maxSec = Integer.parseInt(DecompilerContext.getProperty(IFernflowerPreferences.MAX_PROCESSING_METHOD).toString());
     boolean testMode = DecompilerContext.getOption(IFernflowerPreferences.UNIT_TEST_MODE);
 
@@ -160,7 +153,9 @@ public class ClassWrapper {
 
       if (!isError) {
         // rename vars so that no one has the same name as a field
-        varProc.refreshVarNames(new VarNamesCollector(setFieldNames));
+        VarNamesCollector namesCollector = new VarNamesCollector();
+        classStruct.getFields().forEach(f -> namesCollector.addName(f.getName()));
+        varProc.refreshVarNames(namesCollector);
 
         // if debug information present and should be used
         if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {

From cba10744d83690c8c6f5c5b52e6390a6b7bdf99a Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 24 Apr 2017 19:58:58 +0300
Subject: [PATCH 112/252] toString for debugging

---
 .../jetbrains/java/decompiler/main/rels/ClassWrapper.java  | 5 +++++
 .../jetbrains/java/decompiler/main/rels/MethodWrapper.java | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index acc2849..fdabfde 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -217,4 +217,9 @@ public class ClassWrapper {
   public VBStyleCollection<Exprent, String> getDynamicFieldInitializers() {
     return dynamicFieldInitializers;
   }
+
+  @Override
+  public String toString() {
+    return classStruct.qualifiedName;
+  }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
index 3060c73..8fc8fe2 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,4 +50,9 @@ public class MethodWrapper {
     }
     return graph;
   }
+
+  @Override
+  public String toString() {
+    return methodStruct.getName();
+  }
 }
\ No newline at end of file

From 538418e84a856caa3135e7e13786e3553531af15 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Mon, 24 Apr 2017 20:16:57 +0300
Subject: [PATCH 113/252] headexprent is always single-element

---
 .../java/decompiler/modules/decompiler/stats/IfStatement.java | 4 ++--
 .../decompiler/modules/decompiler/stats/SwitchStatement.java  | 4 ++--
 .../modules/decompiler/stats/SynchronizedStatement.java       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index 9cb7ddb..9639e18 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public class IfStatement extends Statement {
 
   private boolean iffflag;
 
-  private final List<Exprent> headexprent = new ArrayList<>(); // contains IfExprent
+  private final List<Exprent> headexprent = new ArrayList<>(1); // contains IfExprent
 
   // *****************************************************************************
   // constructors
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
index d3cc7f2..dd92238 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public class SwitchStatement extends Statement {
 
   private StatEdge default_edge;
 
-  private final List<Exprent> headexprent = new ArrayList<>();
+  private final List<Exprent> headexprent = new ArrayList<>(1);
 
   // *****************************************************************************
   // constructors
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
index 04b03fe..e097571 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public class SynchronizedStatement extends Statement {
 
   private Statement body;
 
-  private final List<Exprent> headexprent = new ArrayList<>();
+  private final List<Exprent> headexprent = new ArrayList<>(1);
 
   // *****************************************************************************
   // constructors

From 2e9dfd2437d92ebf9901fc45cd58a02f998cd8b5 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 25 Apr 2017 16:51:46 +0300
Subject: [PATCH 114/252] copyright

---
 .../modules/decompiler/ClasspathHelper.java       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
index 83ad121..df73c29 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;

From a62cc3f70953ca957ee0b93bc38f7e75dfbfda1a Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 25 Apr 2017 17:39:52 +0300
Subject: [PATCH 115/252] IDEA-127499 Decompiler doesn't support switch over
 enums

---
 .../modules/decompiler/SwitchHelper.java      |  94 ++++++++++++++++++
 .../modules/decompiler/exps/ConstExprent.java |   7 ++
 .../decompiler/exps/SwitchExprent.java        |  14 +--
 .../decompiler/stats/SwitchStatement.java     |  38 ++++---
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 testData/classes/pkg/TestSwitchOnEnum$1.class | Bin 618 -> 700 bytes
 testData/classes/pkg/TestSwitchOnEnum.class   | Bin 557 -> 711 bytes
 .../classes/pkg/TestSwitchOnStrings.class     | Bin 0 -> 672 bytes
 testData/results/TestSwitchOnEnum.dec         |  33 +++---
 testData/results/TestSwitchOnStrings.dec      |  13 +++
 testData/src/pkg/TestSwitchOnEnum.java        |   2 +
 testData/src/pkg/TestSwitchOnStrings.java     |  13 +++
 12 files changed, 183 insertions(+), 34 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
 create mode 100644 testData/classes/pkg/TestSwitchOnStrings.class
 create mode 100644 testData/results/TestSwitchOnStrings.dec
 create mode 100644 testData/src/pkg/TestSwitchOnStrings.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
new file mode 100644
index 0000000..01d56e2
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.java.decompiler.modules.decompiler;
+
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.main.ClassesProcessor;
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
+import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
+import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SwitchHelper {
+  public static void simplify(SwitchStatement switchStatement) {
+    SwitchExprent switchExprent = (SwitchExprent)switchStatement.getHeadexprent();
+    Exprent value = switchExprent.getValue();
+    if (isEnumArray(value)) {
+      List<List<Exprent>> caseValues = switchStatement.getCaseValues();
+      Map<Exprent, Exprent> mapping = new HashMap<>(caseValues.size());
+      ArrayExprent array = (ArrayExprent)value;
+      ClassesProcessor.ClassNode classNode =
+        DecompilerContext.getClassProcessor().getMapRootClasses().get(((FieldExprent)array.getArray()).getClassname());
+      if (classNode != null) {
+        MethodWrapper wrapper = classNode.getWrapper().getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
+        if (wrapper != null) {
+          wrapper.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
+            @Override
+            public int processExprent(Exprent exprent) {
+              if (exprent instanceof AssignmentExprent) {
+                AssignmentExprent assignment = (AssignmentExprent)exprent;
+                Exprent left = assignment.getLeft();
+                if (isEnumArray(left)) {
+                  mapping.put(assignment.getRight(), ((InvocationExprent)((ArrayExprent)left).getIndex()).getInstance());
+                }
+              }
+              return 0;
+            }
+          });
+        }
+      }
+
+      List<List<Exprent>> realCaseValues = new ArrayList<>(caseValues.size());
+      for (List<Exprent> caseValue : caseValues) {
+        List<Exprent> values = new ArrayList<>(caseValue.size());
+        realCaseValues.add(values);
+        for (Exprent exprent : caseValue) {
+          if (exprent == null) {
+            values.add(null);
+          }
+          else {
+            Exprent realConst = mapping.get(exprent);
+            if (realConst == null) {
+              DecompilerContext.getLogger()
+                .writeMessage("Unable to simplify switch on enum: " + exprent + " not found, available: " + mapping,
+                              IFernflowerLogger.Severity.ERROR);
+              return;
+            }
+            values.add(realConst.copy());
+          }
+        }
+      }
+      caseValues.clear();
+      caseValues.addAll(realCaseValues);
+      switchExprent.replaceExprent(value, ((InvocationExprent)array.getIndex()).getInstance().copy());
+    }
+  }
+
+  private static boolean isEnumArray(Exprent exprent) {
+    if (exprent instanceof ArrayExprent) {
+      Exprent field = ((ArrayExprent)exprent).getArray();
+      return field instanceof FieldExprent && ((FieldExprent)field).getName().startsWith("$SwitchMap");
+    }
+    return false;
+  }
+}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 962bb77..d4ed0c3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -300,6 +300,13 @@ public class ConstExprent extends Exprent {
            InterpreterUtil.equalObjects(value, cn.getValue());
   }
 
+  @Override
+  public int hashCode() {
+    int result = constType != null ? constType.hashCode() : 0;
+    result = 31 * result + (value != null ? value.hashCode() : 0);
+    return result;
+  }
+
   public boolean hasBooleanValue() {
     switch (constType.type) {
       case CodeConstants.TYPE_BOOLEAN:
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
index 27730a9..cadf94f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import java.util.Set;
 public class SwitchExprent extends Exprent {
 
   private Exprent value;
-  private List<List<ConstExprent>> caseValues = new ArrayList<>();
+  private List<List<Exprent>> caseValues = new ArrayList<>();
 
   public SwitchExprent(Exprent value, Set<Integer> bytecodeOffsets) {
     super(EXPRENT_SWITCH);
@@ -41,8 +41,8 @@ public class SwitchExprent extends Exprent {
   public Exprent copy() {
     SwitchExprent swExpr = new SwitchExprent(value.copy(), bytecode);
 
-    List<List<ConstExprent>> lstCaseValues = new ArrayList<>();
-    for (List<ConstExprent> lst : caseValues) {
+    List<List<Exprent>> lstCaseValues = new ArrayList<>();
+    for (List<Exprent> lst : caseValues) {
       lstCaseValues.add(new ArrayList<>(lst));
     }
     swExpr.setCaseValues(lstCaseValues);
@@ -63,8 +63,8 @@ public class SwitchExprent extends Exprent {
     result.addMaxTypeExprent(value, VarType.VARTYPE_INT);
 
     VarType valType = value.getExprType();
-    for (List<ConstExprent> lst : caseValues) {
-      for (ConstExprent expr : lst) {
+    for (List<Exprent> lst : caseValues) {
+      for (Exprent expr : lst) {
         if (expr != null) {
           VarType caseType = expr.getExprType();
           if (!caseType.equals(valType)) {
@@ -116,7 +116,7 @@ public class SwitchExprent extends Exprent {
     return value;
   }
 
-  public void setCaseValues(List<List<ConstExprent>> caseValues) {
+  public void setCaseValues(List<List<Exprent>> caseValues) {
     this.caseValues = caseValues;
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
index dd92238..bcef5fe 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
@@ -24,8 +24,10 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+import org.jetbrains.java.decompiler.modules.decompiler.SwitchHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
@@ -41,7 +43,7 @@ public class SwitchStatement extends Statement {
 
   private List<List<StatEdge>> caseEdges = new ArrayList<>();
 
-  private List<List<ConstExprent>> caseValues = new ArrayList<>();
+  private List<List<Exprent>> caseValues = new ArrayList<>();
 
   private StatEdge default_edge;
 
@@ -108,6 +110,8 @@ public class SwitchStatement extends Statement {
   }
 
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+    SwitchHelper.simplify(this);
+
     TextBuffer buf = new TextBuffer();
     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
     buf.append(first.toJava(indent, tracer));
@@ -126,7 +130,7 @@ public class SwitchStatement extends Statement {
 
       Statement stat = caseStatements.get(i);
       List<StatEdge> edges = caseEdges.get(i);
-      List<ConstExprent> values = caseValues.get(i);
+      List<Exprent> values = caseValues.get(i);
 
       for (int j = 0; j < edges.size(); j++) {
         if (edges.get(j) == default_edge) {
@@ -134,10 +138,20 @@ public class SwitchStatement extends Statement {
           tracer.incrementCurrentSourceLine();
         }
         else {
-          ConstExprent value = (ConstExprent)values.get(j).copy();
-          value.setConstType(switch_type);
+          buf.appendIndent(indent).append("case ");
+          Exprent value = values.get(j);
+          if (value instanceof ConstExprent) {
+            value = value.copy();
+            ((ConstExprent)value).setConstType(switch_type);
+          }
+          if (value instanceof FieldExprent && ((FieldExprent)value).isStatic()) { // enum values
+            buf.append(((FieldExprent)value).getName());
+          }
+          else {
+            buf.append(value.toJava(indent, tracer));
+          }
 
-          buf.appendIndent(indent).append("case ").append(value.toJava(indent, tracer)).append(":").appendLineSeparator();
+          buf.append(":").appendLineSeparator();
           tracer.incrementCurrentSourceLine();
         }
       }
@@ -211,8 +225,8 @@ public class SwitchStatement extends Statement {
     BasicBlockStatement bbstat = (BasicBlockStatement)first;
     int[] values = ((SwitchInstruction)bbstat.getBlock().getLastInstruction()).getValues();
 
-    List<Statement> nodes = new ArrayList<>();
-    List<List<Integer>> edges = new ArrayList<>();
+    List<Statement> nodes = new ArrayList<>(stats.size() - 1);
+    List<List<Integer>> edges = new ArrayList<>(stats.size() - 1);
 
     // collect regular edges
     for (int i = 1; i < stats.size(); i++) {
@@ -293,12 +307,12 @@ public class SwitchStatement extends Statement {
     }
 
     // translate indices back into edges
-    List<List<StatEdge>> lstEdges = new ArrayList<>();
-    List<List<ConstExprent>> lstValues = new ArrayList<>();
+    List<List<StatEdge>> lstEdges = new ArrayList<>(edges.size());
+    List<List<Exprent>> lstValues = new ArrayList<>(edges.size());
 
     for (List<Integer> lst : edges) {
-      List<StatEdge> lste = new ArrayList<>();
-      List<ConstExprent> lstv = new ArrayList<>();
+      List<StatEdge> lste = new ArrayList<>(lst.size());
+      List<Exprent> lstv = new ArrayList<>(lst.size());
 
       List<StatEdge> lstSuccs = first.getSuccessorEdges(STATEDGE_DIRECT_ALL);
       for (Integer in : lst) {
@@ -362,7 +376,7 @@ public class SwitchStatement extends Statement {
     return default_edge;
   }
 
-  public List<List<ConstExprent>> getCaseValues() {
+  public List<List<Exprent>> getCaseValues() {
     return caseValues;
   }
 }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 0ce7f87..505fe81 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -105,7 +105,8 @@ public class SingleClassesTest {
   @Test public void testClashName() { doTest("pkg/TestClashName", "pkg/SharedName1",
           "pkg/SharedName2", "pkg/SharedName3", "pkg/SharedName4", "pkg/NonSharedName",
           "pkg/TestClashNameParent", "ext/TestClashNameParent","pkg/TestClashNameIface", "ext/TestClashNameIface"); }
-  @Test public void testSwitchOnEnum() { doTest("pkg/TestSwitchOnEnum","pkg/TestSwitchOnEnum$1");}
+  @Test public void testSwitchOnEnum() { doTest("pkg/TestSwitchOnEnum");}
+  //@Test public void TestSwitchOnStrings() { doTest("pkg/TestSwitchOnStrings");}
   @Test public void testVarArgCalls() { doTest("pkg/TestVarArgCalls"); }
 
   private void doTest(String testFile, String... companionFiles) {
diff --git a/testData/classes/pkg/TestSwitchOnEnum$1.class b/testData/classes/pkg/TestSwitchOnEnum$1.class
index a3f6924427ab5cdb2e3ff4e01e70e4a567a02156..aebc1c568ce9e3d2e92dc364bfca59486d4c7ff1 100644
GIT binary patch
delta 363
zcmW-b%}T>S6ot>UNv4U@8f)#Jf7RL_LFmR!5kaUGMB9K7-MATJ(bixks9PVvRf(@4
zu2m3`(g*NSd<gMQVD7o+8}2>aUu~>!{QP}S0BmC2LKZm_9C?#mL1B?&Ucmy#BFFNm
zc2-Rv4n66g$e=IJ{ob(>hNOEZz3Yy=jhL23&&}-;$BMuz$^s@Vfi+YFs;Ds(2l7ES
ze0g)(=nma`?`p5#^Do*#Fbo9hs4!&19hM0T?8y+F{nn8azOd#a19#gkr@QOgB|0-f
zXEQsm!j&VQf}oxx8X!&%sDFV?#?}X7@9M=rp=r)5w1Wr@LOsGa#3(0&9CYMSrZaU)
sNKt|j<)ko;Ezl5PQweCN95d)Bp}{o$#V|_&fQC8JB`S+nId#~He>)jB<^TWy

delta 248
zcmW-by-osA5QV?HT=uf-MHl>AR22M)4W$h)U}KDhCN?%Jq0+*_-e=hG1~hagYGRBb
z^zbM?gnBN?WX?I6GiPR6{jsNu-|rc4#!1Qsn+Y*niP(0KxufOSaqN}7yGH%`xfncL
z7Ed?D{o_!h^0lA09s8aGI-VMdr^}(|h~x6FJ?fgVaih8EzhoWdI^8i@9(;ibQ&xmt
z>YR!gw7xL2Y5GC*9;)(*wO14D#hb><zo-&Xmo;84cvi(7(XC?*rDT#34VpsBy83Rg
Kr*g*<WVL?<eja)N

diff --git a/testData/classes/pkg/TestSwitchOnEnum.class b/testData/classes/pkg/TestSwitchOnEnum.class
index c377fe7c382803b81ffc793e521f9077c157208a..3117de8c4e21e479f4230977e7c9643f5d5f107e 100644
GIT binary patch
delta 338
zcmXX<%Syvg6r7W18)L0i<Et-g5UJ2EbXT`s2tg5x`&fc4tyOG_OTQuLUl<p<P;lW&
z5c~!IMVzF)aL>$~Gt4||-+Jxm@8c7|0bC0@*0M0LZeatPCW<CXCdyH*y<hOIyZ-Rp
zzwP@M!=RH4ffn}qV}aw{3@)3UU>u&^^}}xOWYiu_u3Ayh$Q}tK6jZ#2Qz=O+dOVz~
zplV{vMh)B1@7H}3w6I^Vze8R~6wGrP=`w>Hxji*t0eLFHA_|-~`GjtTSbv4G_Xf4`
zM8Q|(PxeW0amLGfti@_frKSx9XynH^xQyLl<Sv%eI%gU=t7ABpcoD47u0wT2XmHZh
NRhUGJM}vrb<{zR>D{24$

delta 210
zcmXAhOAf(c6otRPub-;6Xgyn!4iO_UGL=|??N~!&Y6oIa0}=xxiNt2?K-|_nx#yny
zIxqWdW$*9(0W6ug*mUYRL@qI1O;6L;4DxJ~ALnY9f7Xp5BTeFwGCr)-bDyFFU{7zT
zLWH6z?EHtqK7p_&vn_@I#utp)6?1WtMk1ChEy|3F(!;1cd`!_EiFl-h0<bWWa^I@1
O+5}pJE3b}J!rBk5{}iME

diff --git a/testData/classes/pkg/TestSwitchOnStrings.class b/testData/classes/pkg/TestSwitchOnStrings.class
new file mode 100644
index 0000000000000000000000000000000000000000..cd0e56e475bbb38b72506a05a32a56168d071f23
GIT binary patch
literal 672
zcmZ`$OKTHR6#h=;m5!4dr?romR{K~qZD=;Siew`SLTVN%MT-bG<B&`nCv7s(<fr%x
zT$qg@6<qiO+_~__xKRA=OhJlz;GV~K&*MAye*N|N3xK=WcHv;z#R^vQC~12ukFtX`
z2kQd+eiTPZLtyMwjs)g|!OKu^y&1*flkuxgI6PFHJ`uk;2vq+_4I>?2f@ac-MuOGm
z*=e_S7><(mn<xo-t+<^GqqsY&3!Fs5t%rh}JIxdITGje0?$)w|dgZY|*unq%N>FGg
zDmXn*XX!Ktw*_u{FdhcsqexR)`Nzb4J;FmCbIkW}2OHdMGMRYT#1`G@bShZ>4_!g=
z55rdHBn*-(P)1si@2OEQdnmpdSFpqLvFdY=D?4T#>Xl<`z~&!l$${mVqjnk9Xoc3=
z{RH`tUSFfOQ_z4%-^&tEz&s=V42smc_#>N{v@iA!a*gT*a_<>X?(uNUw+U?-^8Fd@
zZq+v~V7|qI(RhdXs&A!{Wj5B*s`a#nic;dyq{`OJoEbBE1~e-_oo3-FS2^Yi&xvY=
jOPod)mkhOcgSmnQqD9z0vF%_{3T{b$5ak;Y&td5|&dq`)

literal 0
HcmV?d00001

diff --git a/testData/results/TestSwitchOnEnum.dec b/testData/results/TestSwitchOnEnum.dec
index 4a6d980..33b0464 100644
--- a/testData/results/TestSwitchOnEnum.dec
+++ b/testData/results/TestSwitchOnEnum.dec
@@ -5,27 +5,32 @@ import java.util.concurrent.TimeUnit;
 public class TestSwitchOnEnum {
    int myInt;
 
-   public void testSOE(TimeUnit var1) {
-      switch(null.$SwitchMap$java$util$concurrent$TimeUnit[var1.ordinal()]) {// 12
-      case 1:
-         return;// 14
+   public int testSOE(TimeUnit t) {
+      switch(t) {// 14
+      case MICROSECONDS:
+         return 2;// 16
+      case SECONDS:
+         return 1;// 18
       default:
+         return 0;// 20
       }
-   }// 16
+   }
 }
 
 class 'pkg/TestSwitchOnEnum' {
-   method 'testSOE (Ljava/util/concurrent/TimeUnit;)V' {
-      0      8
-      4      8
-      7      8
+   method 'testSOE (Ljava/util/concurrent/TimeUnit;)I' {
       8      8
-      1c      10
-      1d      13
+      24      10
+      25      10
+      26      12
+      27      12
+      28      14
+      29      14
    }
 }
 
 Lines mapping:
-12 <-> 9
-14 <-> 11
-16 <-> 14
+14 <-> 9
+16 <-> 11
+18 <-> 13
+20 <-> 15
diff --git a/testData/results/TestSwitchOnStrings.dec b/testData/results/TestSwitchOnStrings.dec
new file mode 100644
index 0000000..cd120e8
--- /dev/null
+++ b/testData/results/TestSwitchOnStrings.dec
@@ -0,0 +1,13 @@
+package pkg;
+
+public class TestSwitchOnStrings {
+  public int testSOE(String s) {
+    switch (s) {
+      case "xxx":
+        return 2;
+      case "yyy":
+        return 1;
+    }
+    return 0;
+  }
+}
diff --git a/testData/src/pkg/TestSwitchOnEnum.java b/testData/src/pkg/TestSwitchOnEnum.java
index ec07604..e26d407 100644
--- a/testData/src/pkg/TestSwitchOnEnum.java
+++ b/testData/src/pkg/TestSwitchOnEnum.java
@@ -12,6 +12,8 @@ public class TestSwitchOnEnum {
   public int testSOE(TimeUnit t) {
     // This creates anonymous SwitchMap inner class.
     switch (t) {
+      case MICROSECONDS:
+        return 2;
       case SECONDS:
         return 1;
     }
diff --git a/testData/src/pkg/TestSwitchOnStrings.java b/testData/src/pkg/TestSwitchOnStrings.java
new file mode 100644
index 0000000..cd120e8
--- /dev/null
+++ b/testData/src/pkg/TestSwitchOnStrings.java
@@ -0,0 +1,13 @@
+package pkg;
+
+public class TestSwitchOnStrings {
+  public int testSOE(String s) {
+    switch (s) {
+      case "xxx":
+        return 2;
+      case "yyy":
+        return 1;
+    }
+    return 0;
+  }
+}

From 7575bb57de1020a16eb85138a024a71f05e0fdd2 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 25 Apr 2017 19:15:59 +0300
Subject: [PATCH 116/252] removed unneeded boxing

---
 .../decompiler/code/cfg/ControlFlowGraph.java |  4 +--
 .../modules/decompiler/ExprProcessor.java     | 12 ++++-----
 .../modules/decompiler/IfHelper.java          |  4 +--
 .../decompiler/SecondaryFunctionsHelper.java  | 12 ++++-----
 .../DominatorTreeExceptionFilter.java         |  6 ++---
 .../modules/decompiler/exps/ConstExprent.java | 26 +++++++++----------
 .../sforms/SSAConstructorSparseEx.java        |  6 ++---
 .../sforms/SSAUConstructorSparseEx.java       |  6 ++---
 .../decompiler/vars/VarDefinitionHelper.java  |  8 +++---
 .../modules/decompiler/vars/VarProcessor.java |  2 +-
 .../struct/consts/ConstantPool.java           | 10 +++----
 .../decompiler/util/VBStyleCollection.java    | 10 +++----
 12 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 4706bf6..da6e145 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -256,7 +256,7 @@ public class ControlFlowGraph implements CodeConstants {
     for (int i = 0; i < len; i++) {
 
       // exception blocks
-      if (excSet.contains(new Integer(i))) {
+      if (excSet.contains(i)) {
         inststates[i] = 1;
       }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index f6005ba..04e3c26 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -313,16 +313,16 @@ public class ExprProcessor implements CodeConstants {
           break;
         case opc_lconst_0:
         case opc_lconst_1:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_LONG, new Long(instr.opcode - opc_lconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_LONG, Long.valueOf(instr.opcode - opc_lconst_0), bytecode_offsets));
           break;
         case opc_fconst_0:
         case opc_fconst_1:
         case opc_fconst_2:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_FLOAT, new Float(instr.opcode - opc_fconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_FLOAT, Float.valueOf(instr.opcode - opc_fconst_0), bytecode_offsets));
           break;
         case opc_dconst_0:
         case opc_dconst_1:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(instr.opcode - opc_dconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_DOUBLE, Double.valueOf(instr.opcode - opc_dconst_0), bytecode_offsets));
           break;
         case opc_ldc:
         case opc_ldc_w:
@@ -840,13 +840,13 @@ public class ExprProcessor implements CodeConstants {
       defaultVal = new ConstExprent(VarType.VARTYPE_NULL, null, null);
     }
     else if (arrType.type == CodeConstants.TYPE_FLOAT) {
-      defaultVal = new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_FLOAT, Float.valueOf(0), null);
     }
     else if (arrType.type == CodeConstants.TYPE_LONG) {
-      defaultVal = new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_LONG, Long.valueOf(0), null);
     }
     else if (arrType.type == CodeConstants.TYPE_DOUBLE) {
-      defaultVal = new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_DOUBLE, Double.valueOf(0), null);
     }
     else { // integer types
       defaultVal = new ConstExprent(0, true, null);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index 3a88aca..0b5d14e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -744,7 +744,7 @@ public class IfHelper {
 
     public void addChild(IfNode child, int type) {
       succs.add(child);
-      edgetypes.add(new Integer(type));
+      edgetypes.add(type);
     }
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
index f95d2c3..4c5abe7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -262,10 +262,10 @@ public class SecondaryFunctionsHelper {
             if (lstOperands.get(0).type == Exprent.EXPRENT_CONST) {
               int val = ((ConstExprent)lstOperands.get(0)).getIntValue();
               if (val == 0) {
-                return new ConstExprent(VarType.VARTYPE_BOOLEAN, new Integer(1), fexpr.bytecode);
+                return new ConstExprent(VarType.VARTYPE_BOOLEAN, Integer.valueOf(1), fexpr.bytecode);
               }
               else {
-                return new ConstExprent(VarType.VARTYPE_BOOLEAN, new Integer(0), fexpr.bytecode);
+                return new ConstExprent(VarType.VARTYPE_BOOLEAN, Integer.valueOf(0), fexpr.bytecode);
               }
             }
             break;
@@ -300,8 +300,8 @@ public class SecondaryFunctionsHelper {
             FunctionExprent iff = new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
               new FunctionExprent(FunctionExprent.FUNCTION_LT, Arrays.asList(new VarExprent(var, type, varProc),
                 ConstExprent.getZeroConstant(type.type)), null),
-              new ConstExprent(VarType.VARTYPE_INT, new Integer(-1), null),
-              new ConstExprent(VarType.VARTYPE_INT, new Integer(1), null)), null);
+              new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(-1), null),
+              new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(1), null)), null);
 
             FunctionExprent head = new FunctionExprent(FunctionExprent.FUNCTION_EQ, Arrays.asList(
               new AssignmentExprent(new VarExprent(var, type, varProc),
@@ -312,7 +312,7 @@ public class SecondaryFunctionsHelper {
             varProc.setVarType(new VarVersionPair(var, 0), type);
 
             return new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
-              head, new ConstExprent(VarType.VARTYPE_INT, new Integer(0), null), iff), fexpr.bytecode);
+              head, new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(0), null), iff), fexpr.bytecode);
         }
         break;
       case Exprent.EXPRENT_ASSIGNMENT: // check for conditional assignment
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
index 59b6b15..0cee74c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -157,14 +157,14 @@ public class DominatorTreeExceptionFilter {
 
           if (range.contains(id)) {
 
-            Integer exit = null;
+            Integer exit;
 
             if (!range.contains(childid)) {
               exit = childid;
             }
             else {
               // exit = map.containsKey(handler)?-1:mapChild.get(handler); FIXME: Eclipse bug?
-              exit = map.containsKey(handler) ? new Integer(-1) : mapChild.get(handler);
+              exit = map.containsKey(handler) ? -1 : mapChild.get(handler);
             }
 
             if (exit != null) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index d4ed0c3..f649d80 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -36,14 +36,14 @@ public class ConstExprent extends Exprent {
   private static final Map<Integer, String> CHAR_ESCAPES;
   static {
     CHAR_ESCAPES = new HashMap<>();
-    CHAR_ESCAPES.put(new Integer(0x8), "\\b");   /* \u0008: backspace BS */
-    CHAR_ESCAPES.put(new Integer(0x9), "\\t");   /* \u0009: horizontal tab HT */
-    CHAR_ESCAPES.put(new Integer(0xA), "\\n");   /* \u000a: linefeed LF */
-    CHAR_ESCAPES.put(new Integer(0xC), "\\f");   /* \u000c: form feed FF */
-    CHAR_ESCAPES.put(new Integer(0xD), "\\r");   /* \u000d: carriage return CR */
-    //CHAR_ESCAPES.put(new Integer(0x22), "\\\""); /* \u0022: double quote " */
-    CHAR_ESCAPES.put(new Integer(0x27), "\\\'"); /* \u0027: single quote ' */
-    CHAR_ESCAPES.put(new Integer(0x5C), "\\\\"); /* \u005c: backslash \ */
+    CHAR_ESCAPES.put(0x8, "\\b");   /* \u0008: backspace BS */
+    CHAR_ESCAPES.put(0x9, "\\t");   /* \u0009: horizontal tab HT */
+    CHAR_ESCAPES.put(0xA, "\\n");   /* \u000a: linefeed LF */
+    CHAR_ESCAPES.put(0xC, "\\f");   /* \u000c: form feed FF */
+    CHAR_ESCAPES.put(0xD, "\\r");   /* \u000d: carriage return CR */
+    //CHAR_ESCAPES.put(0x22, "\\\""); /* \u0022: double quote " */
+    CHAR_ESCAPES.put(0x27, "\\\'"); /* \u0027: single quote ' */
+    CHAR_ESCAPES.put(0x5C, "\\\\"); /* \u005c: backslash \ */
   }
 
   private VarType constType;
@@ -51,7 +51,7 @@ public class ConstExprent extends Exprent {
   private final boolean boolPermitted;
 
   public ConstExprent(int val, boolean boolPermitted, Set<Integer> bytecodeOffsets) {
-    this(guessType(val, boolPermitted), new Integer(val), boolPermitted, bytecodeOffsets);
+    this(guessType(val, boolPermitted), Integer.valueOf(val), boolPermitted, bytecodeOffsets);
   }
 
   public ConstExprent(VarType constType, Object value, Set<Integer> bytecodeOffsets) {
@@ -347,13 +347,13 @@ public class ConstExprent extends Exprent {
   public static ConstExprent getZeroConstant(int type) {
     switch (type) {
       case CodeConstants.TYPE_INT:
-        return new ConstExprent(VarType.VARTYPE_INT, new Integer(0), null);
+        return new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(0), null);
       case CodeConstants.TYPE_LONG:
-        return new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
+        return new ConstExprent(VarType.VARTYPE_LONG, Long.valueOf(0), null);
       case CodeConstants.TYPE_DOUBLE:
-        return new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
+        return new ConstExprent(VarType.VARTYPE_DOUBLE, Double.valueOf(0), null);
       case CodeConstants.TYPE_FLOAT:
-        return new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
+        return new ConstExprent(VarType.VARTYPE_FLOAT, Float.valueOf(0), null);
     }
 
     throw new RuntimeException("Invalid argument: " + type);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
index 7aff2d2..19ef39a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -288,10 +288,10 @@ public class SSAConstructorSparseEx {
   private Integer getNextFreeVersion(Integer var) {
     Integer nextver = lastversion.get(var);
     if (nextver == null) {
-      nextver = new Integer(1);
+      nextver = 1;
     }
     else {
-      nextver = new Integer(nextver.intValue() + 1);
+      nextver++;
     }
     lastversion.put(var, nextver);
     return nextver;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
index 5beb232..fe22e61 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -501,10 +501,10 @@ public class SSAUConstructorSparseEx {
     Integer nextver = lastversion.get(var);
 
     if (nextver == null) {
-      nextver = new Integer(1);
+      nextver = 1;
     }
     else {
-      nextver = new Integer(nextver.intValue() + 1);
+      nextver++;
     }
     lastversion.put(var, nextver);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
index a0a14cb..0cad643 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -289,9 +289,9 @@ public class VarDefinitionHelper {
       for (Integer index : childVars) {
         Integer count = mapCount.get(index);
         if (count == null) {
-          count = new Integer(0);
+          count = 0;
         }
-        mapCount.put(index, new Integer(count.intValue() + 1));
+        mapCount.put(index, count + 1);
       }
 
       condlst = getAllVars(currVars);
@@ -302,7 +302,7 @@ public class VarDefinitionHelper {
 
     // this statement
     for (VarExprent var : condlst) {
-      mapCount.put(new Integer(var.getIndex()), new Integer(2));
+      mapCount.put(var.getIndex(), 2);
     }
 
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 728addf..bfcd894 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -74,7 +74,7 @@ public class VarProcessor {
       }
 
       Integer counter = mapNames.get(name);
-      mapNames.put(name, counter == null ? counter = new Integer(0) : ++counter);
+      mapNames.put(name, counter == null ? counter = 0 : ++counter);
 
       if (counter > 0) {
         name += String.valueOf(counter);
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index 8f07b4c..68dffc6 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,21 +56,21 @@ public class ConstantPool implements NewClassNameBuilder {
           break;
 
         case CodeConstants.CONSTANT_Integer:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Integer, new Integer(in.readInt())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Integer, Integer.valueOf(in.readInt())));
           break;
 
         case CodeConstants.CONSTANT_Float:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Float, new Float(in.readFloat())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Float, Float.valueOf(in.readFloat())));
           break;
 
         case CodeConstants.CONSTANT_Long:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Long, new Long(in.readLong())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Long, Long.valueOf(in.readLong())));
           pool.add(null);
           i++;
           break;
 
         case CodeConstants.CONSTANT_Double:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Double, new Double(in.readDouble())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Double, Double.valueOf(in.readDouble())));
           pool.add(null);
           i++;
           break;
diff --git a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
index 000581d..f4d6d5a 100644
--- a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
+++ b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
 
   public void addWithKeyAndIndex(int index, E element, K key) {
     addToListIndex(index, 1);
-    map.put(key, new Integer(index));
+    map.put(key, index);
     super.add(index, element);
     lstKeys.add(index, key);
   }
@@ -164,12 +164,12 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
 
     K key = lstKeys.get(index1);
     if (key != null) {
-      map.put(key, new Integer(index1));
+      map.put(key, index1);
     }
 
     key = lstKeys.get(index2);
     if (key != null) {
-      map.put(key, new Integer(index2));
+      map.put(key, index2);
     }
   }
 
@@ -197,7 +197,7 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     for (int i = lstKeys.size() - 1; i >= index; i--) {
       K obj = lstKeys.get(i);
       if (obj != null) {
-        map.put(obj, new Integer(i + diff));
+        map.put(obj, i + diff);
       }
     }
   }

From 8c440e281c8c454bee8aa4779fe042051c996f14 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 26 Apr 2017 13:26:10 +0300
Subject: [PATCH 117/252] fixed incorrect constructor method reference

---
 .../java/decompiler/main/ClassWriter.java     |   4 +--
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../pkg/TestConstructorReference.class        | Bin 0 -> 898 bytes
 testData/results/TestConstructorReference.dec |  16 ++++++++++++
 .../src/pkg/TestConstructorReference.java     |  24 ++++++++++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 testData/classes/pkg/TestConstructorReference.class
 create mode 100644 testData/results/TestConstructorReference.dec
 create mode 100644 testData/src/pkg/TestConstructorReference.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 6233efe..b7b8fb4 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -98,8 +98,8 @@ public class ClassWriter {
           buffer.append(ExprProcessor.getCastTypeName(new VarType(node.lambdaInformation.content_class_name, true)));
         }
 
-        buffer.append("::");
-        buffer.append(node.lambdaInformation.content_method_name);
+        buffer.append("::")
+          .append(CodeConstants.INIT_NAME.equals(node.lambdaInformation.content_method_name) ? "new" : node.lambdaInformation.content_method_name);
       }
       else {
         // lambda method
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 505fe81..fdaa6d0 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -86,6 +86,7 @@ public class SingleClassesTest {
   @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
   @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
+  @Test public void testConstructorReference() { doTest("pkg/TestConstructorReference"); }
   @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
   @Test public void testMoreAnnotations() { doTest("pkg/MoreAnnotations"); }
   @Test public void testTypeAnnotations() { doTest("pkg/TypeAnnotations"); }
diff --git a/testData/classes/pkg/TestConstructorReference.class b/testData/classes/pkg/TestConstructorReference.class
new file mode 100644
index 0000000000000000000000000000000000000000..c5ba7dfb1e29dfb6e0c2cfc1f1f95f7ed075ed56
GIT binary patch
literal 898
zcmbVKTTc@~6#j;mE-tGrrIw2Vf?SFZ_CeojG_i@%WW|Iwyw7eAu&|wJW@j<{ET2qx
z@CO)wlkp5&)2hIOFLUOc`7US9%=e#H-vGQs%SRatb>25UEO}TKsJu#4VqXiCTKh)=
z<*pu(Ks8Jh9puA^OkYMRSL&gTWqKq{;_`8^Y)_L+U^VPhX1iKt*5t9(=8%rbkcz3p
zx{=nbD-Y<iKqEYp7qXp7b<#e}m2z5)@q0QqF}+Ki)7ouf&mA|wEGh!Ew_01alcSGh
zPxT<HR<Ke-r8<Yz0FUrkVEHy3W>32K6rE9QeXL>KM+pnuu*sD`v$cOyuO2o6Ji)fW
z)<h#w7y6vqp&Uj7$^FP<>85ZgFh87R9(H-$q1Na5NFey26q#-+vy6CzKU!06W4+>L
z@1+`~lx-Kp&J?U?O`=YwD}NCCmm~VW!@}}z?(}rVwq2Q~y~I+-!=Av-Kl8ciJ_74^
z<FLuEQsy5E%s{xu=hfrv1xLYg_Ssj6FW1L&y!s3S>P%V0J>CTci0kv5x%{`l8$NMZ
y@5+VnZ;2)Ym#!t61#B$g==bq}*Al8spFs^zIr?1L#16Kw!uEynB4ZkOh{i7n8{@D5

literal 0
HcmV?d00001

diff --git a/testData/results/TestConstructorReference.dec b/testData/results/TestConstructorReference.dec
new file mode 100644
index 0000000..ee2a50d
--- /dev/null
+++ b/testData/results/TestConstructorReference.dec
@@ -0,0 +1,16 @@
+public class TestConstructorReference {
+   void boo() {
+      Runnable aNew = TestConstructorReference::new;// 22
+   }// 23
+}
+
+class 'TestConstructorReference' {
+   method 'boo ()V' {
+      5      2
+      6      3
+   }
+}
+
+Lines mapping:
+22 <-> 3
+23 <-> 4
diff --git a/testData/src/pkg/TestConstructorReference.java b/testData/src/pkg/TestConstructorReference.java
new file mode 100644
index 0000000..fd8b483
--- /dev/null
+++ b/testData/src/pkg/TestConstructorReference.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class TestConstructorReference {
+  public TestConstructorReference() {
+  }
+
+  void boo() {
+    Runnable aNew = TestConstructorReference::new;
+  }
+}

From d40f67368984b107a8e57d90e75e1f36d4ead6e9 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 26 Apr 2017 15:54:26 +0300
Subject: [PATCH 118/252] test for class extending a class with a private
 constructor

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestInner2$1.class       | Bin 0 -> 186 bytes
 testData/classes/pkg/TestInner2$Another.class | Bin 0 -> 454 bytes
 .../classes/pkg/TestInner2$Another2.class     | Bin 0 -> 463 bytes
 .../pkg/TestInner2$AnotherStatic.class        | Bin 0 -> 395 bytes
 .../pkg/TestInner2$AnotherStatic2.class       | Bin 0 -> 400 bytes
 testData/classes/pkg/TestInner2.class         | Bin 0 -> 862 bytes
 testData/results/TestInner2.dec               |  89 ++++++++++++++++++
 testData/src/pkg/TestInner2.java              |  28 ++++++
 9 files changed, 118 insertions(+)
 create mode 100644 testData/classes/pkg/TestInner2$1.class
 create mode 100644 testData/classes/pkg/TestInner2$Another.class
 create mode 100644 testData/classes/pkg/TestInner2$Another2.class
 create mode 100644 testData/classes/pkg/TestInner2$AnotherStatic.class
 create mode 100644 testData/classes/pkg/TestInner2$AnotherStatic2.class
 create mode 100644 testData/classes/pkg/TestInner2.class
 create mode 100644 testData/results/TestInner2.dec
 create mode 100644 testData/src/pkg/TestInner2.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index fdaa6d0..0423ec6 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -66,6 +66,7 @@ public class SingleClassesTest {
   @Test public void testAnonymousClassConstructor() { doTest("pkg/TestAnonymousClassConstructor"); }
   @Test public void testInnerClassConstructor() { doTest("pkg/TestInnerClassConstructor"); }
   @Test public void testInnerClassConstructor11() { doTest("v11/TestInnerClassConstructor"); }
+  //@Test public void testInnerClassConstructor2() { doTest("pkg/TestInner2"); } //TODO: fix
   @Test public void testTryCatchFinally() { doTest("pkg/TestTryCatchFinally"); }
   @Test public void testAmbiguousCall() { doTest("pkg/TestAmbiguousCall"); }
   @Test public void testAmbiguousCallWithDebugInfo() { doTest("pkg/TestAmbiguousCallWithDebugInfo"); }
diff --git a/testData/classes/pkg/TestInner2$1.class b/testData/classes/pkg/TestInner2$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..1f346fae15a7c3748f1454d8506261477cdfb621
GIT binary patch
literal 186
zcmX^0Z`VEs1_l!bZgvKCb_PyH2Cm@z(xT*4x6GVWMh5<n)Z!A)yu8#RBfYG|vP7VW
zYhH3resN}Ax^HSpMt%xA0~aHMKtXo8K0>LAAtM71SeJ87VsUY5F;E3aw|-7yUb?=2
yQdVkm2_pj^swM#i21W)Zpj$wI83-AGJQfC4AkD(S1|&Ivm<y<e5lAx#Z~y>>^C`Lj

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInner2$Another.class b/testData/classes/pkg/TestInner2$Another.class
new file mode 100644
index 0000000000000000000000000000000000000000..bd046056a6a6a6b2176b8b873930b37e72d256fe
GIT binary patch
literal 454
zcmZ8d!AiqG5PcJ4H%(&`Qyc5eLk?O&t$3>l5)g#o#nO9P7aNU9NmBpIg9sk{06$8c
zjTK2)W@p~K*?BYj_5JY);2e8xY``_4qbIN<&?mIYMO^r&1SecRJ)BHrQQoAf%+JQm
zUBqczUJ`l-P4aL`(1Yw=66`Qe<?ZTuCi6)&OE}|(**r?7Q64M2PU=dCAg<D^T*#bY
zRXRZu6@_GC(2(%gg*=COm#y--ypC0K`+vma$LJ-pu!)uhfn9=EU*WF>p<5>e284cd
zDStFpYdQ5=e}sMhHJv|@97l<%h)uv?-{vTQ#s}yOkKRB-dWZJPP=m?0Sy2Z2Had*G
f-%?nx8S$g4C2`haq+uIf_AW<Cbc<t;4UX{xX|Y}P

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInner2$Another2.class b/testData/classes/pkg/TestInner2$Another2.class
new file mode 100644
index 0000000000000000000000000000000000000000..ff02baadb29b7a3067dcbe9a622c581203722427
GIT binary patch
literal 463
zcmZ8d%T9w(5IuvmP{e{zsol9?QQJhVaaUtvni!i9H#XhVdSg)p1JwU=VN6{30e+Nm
zF1`Ybxp!vHoH;Y|@%i=+-~_!EHsBag;cDn;*da8FRh0Wj1Uq=Vzdf9ZyqG45$d1R1
zokmGioDtl99o(N2)Jb|H2v!g!;%fb{5ZNqT#GG-0bQ#9;FpFgTlT@V;K|fE@V#WOl
zW+^m@!#o#^^lBRZZzWG+T&L@7DJ~+}-ufT%;4XX$O*GInp`lCYR+sqeL1<SI4Z8%d
zKdp<7#&R{gTI`Ro$Cp$2h-BMRPI_z_bpBiHT{5olZw`hpph1IPp*(Y}z~HydDBv*D
k#U?szfcISw6Bb9zEc+5?ZH^RdGfQ%mQhAGgj}5l|1rMxW82|tP

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInner2$AnotherStatic.class b/testData/classes/pkg/TestInner2$AnotherStatic.class
new file mode 100644
index 0000000000000000000000000000000000000000..1dec610b9f9bab5b8b5b584019ed4526fd1951ee
GIT binary patch
literal 395
zcmaKo&q~8U5XQf0V^U-O8SPEPLl4!1Qt7Qlkb)otFD<=q<6>81BAadBt0%#O58y+I
zvsI9IaA9Y@`R2zAyC0u#?*NAA`e-Beka*Z9xMNi+b46(PPv-<@Qr$~JoT*aYt)3TB
z&%~l&C(Wu{6my}Kt$$3%ELBYiugl6TrJfpLR89zP%Tnq|A?jLk`#5`fdbpU$+HC#H
zUIQNy{Asn)xx7(!QTz*@KZ>;o;NXC8^xq6Z)NFe=By{_K7Y|1EjY*U34RC@M|A{@s
z*TD{Fm(`Gc>$qq13fi!0!Q<$2214c{bXW!76n0rzCfvpddz@3Q?R1~XlxrlNFaJAL
Ao&W#<

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInner2$AnotherStatic2.class b/testData/classes/pkg/TestInner2$AnotherStatic2.class
new file mode 100644
index 0000000000000000000000000000000000000000..3e4547a712fa72ea02fb7ee8afa6ce75f3115d44
GIT binary patch
literal 400
zcmaKo&q~8U5XQf0({7EiiSZ98h#q>V9+Vb6RRk#rh2W*7_ibG4YD~&z>w9?;Joo@U
zlsH=ji3b;U=bLYS%<S&R=i57gbL{x2BNT`PHVMs3oojnVsCSR21aDZ}DMFa&T-`38
zX39+DEMq55id1G(X|&6KOwZ1BNoZf^g`F!iw$kdfPY6bNuFNo#WvRG+m@FRe&nBw0
zE5F~V@&kfDE|w-$H`<K~f63Da`78r?*diSK+k|gXtqW`ucDtj$vwH*g&Zr7^dN@Lj
z|HUoh?V-W3$?Ae#=ZKRAy@Fm?)*$%wIRbkO?W4si_{Olt$}t<OvyF9*G3Tzm&t%Lw
GqShDYC03&V

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInner2.class b/testData/classes/pkg/TestInner2.class
new file mode 100644
index 0000000000000000000000000000000000000000..6b45de1934b4163e2ede885cc7e2e29dddf8751e
GIT binary patch
literal 862
zcmZ`&O;6iE6rATIb_ju_e1x`v^3eb$2Lcfn1gcblkRnCx0mOY1R$!Vs$To<-#R-W6
zKY$;Fn2jxvQ&*OE_RV{5cKlX;d3|~Yu!m*|d90dct%L&B9DH}saIh{YcYI$5M*|gx
zI&`ohnEvSxqbnVpMk@09Z3mlzV!|<U1yiXC2U`Lsp#=7!=X=o)LC)Pe7vztI7g|v1
zdcOX3`?sfqGu0cAnduJuYH+Rs&%_CtkFLB>Q0?CQxon;3FdDgQA5h2b7&%dVJA!$4
ztfaAfVDi@ej*(8cGbgCIoqy@LWmix-9o`0gec~Bwm5-CRuhpF@qlyKyeByM{()4O7
zS_9=@wtn}nbw47Nu4zzzX^cuuuq{}~&NH)^or!OUpOu})3NO3B%Lmai*1@?jY7vE4
zXg(tMz>S4juJ(w`V~+cBT!4AhMtOcb8PmK^w1}C_g;8@YE=ZbLiqH50se&H9X2@9M
z9&-PYsbevbSxRJ%c~p*W>}LHDlC856SG?P?Q8#u>7rs%^;<L=i;=mkYlZI^~sznqz
Tx(Tl4znLUeCQdP)CRTtq;_jIW

literal 0
HcmV?d00001

diff --git a/testData/results/TestInner2.dec b/testData/results/TestInner2.dec
new file mode 100644
index 0000000..2bc40f9
--- /dev/null
+++ b/testData/results/TestInner2.dec
@@ -0,0 +1,89 @@
+package pkg;
+
+class TestInner2 {
+   private TestInner2() {
+   }// 4
+
+   private TestInner2(int a) {
+   }// 5
+
+   static class AnotherStatic2 extends TestInner2 {
+      AnotherStatic2() {
+         super(2);// 25
+      }// 26
+   }
+
+   class Another2 extends TestInner2 {
+      Another2() {
+         super(2);// 19
+      }// 20
+   }
+
+   static class AnotherStatic extends TestInner2 {
+      AnotherStatic() {
+      }// 14
+   }
+
+   class Another extends TestInner2 {
+      Another() {
+      }// 9
+   }
+}
+
+class 'pkg/TestInner2' {
+   method '<init> ()V' {
+      4      4
+   }
+
+   method '<init> (I)V' {
+      4      7
+   }
+}
+
+class 'pkg/TestInner2$AnotherStatic2' {
+   method '<init> ()V' {
+      1      11
+      2      11
+      3      11
+      6      12
+   }
+}
+
+class 'pkg/TestInner2$Another2' {
+   method '<init> (Lpkg/TestInner2;)V' {
+      6      17
+      7      17
+      8      17
+      b      18
+   }
+}
+
+class 'pkg/TestInner2$AnotherStatic' {
+   method '<init> ()V' {
+      1      23
+      2      23
+      5      24
+   }
+}
+
+class 'pkg/TestInner2$Another' {
+   method '<init> (Lpkg/TestInner2;)V' {
+      6      29
+      7      29
+      a      30
+   }
+}
+
+Lines mapping:
+4 <-> 5
+5 <-> 8
+8 <-> 30
+9 <-> 31
+13 <-> 24
+14 <-> 25
+19 <-> 18
+20 <-> 19
+25 <-> 12
+26 <-> 13
+Not mapped:
+18
diff --git a/testData/src/pkg/TestInner2.java b/testData/src/pkg/TestInner2.java
new file mode 100644
index 0000000..da402b9
--- /dev/null
+++ b/testData/src/pkg/TestInner2.java
@@ -0,0 +1,28 @@
+package pkg;
+
+class TestInner2 {
+  private TestInner2() {}
+  private TestInner2(int a) {}
+
+  class Another extends TestInner2 {
+    Another() {
+    }
+  }
+
+  static class AnotherStatic extends TestInner2 {
+    AnotherStatic() {
+    }
+  }
+
+  class Another2 extends TestInner2 {
+    Another2() {
+      super(2);
+    }
+  }
+
+  static class AnotherStatic2 extends TestInner2 {
+    AnotherStatic2() {
+      super(2);
+    }
+  }
+}

From 6a7763922be81fe59f52f8ffec9850112066ebd0 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 26 Apr 2017 19:58:55 +0300
Subject: [PATCH 119/252] fixed lambda parameter names already used in the
 context

---
 .../main/collectors/VarNamesCollector.java    |   5 +-
 .../main/rels/NestedClassProcessor.java       |  18 ++++---
 .../modules/decompiler/vars/VarProcessor.java |   4 ++
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestLambdaParams.class   | Bin 0 -> 1348 bytes
 testData/results/TestLambdaParams.dec         |  48 ++++++++++++++++++
 testData/src/pkg/TestLambdaParams.java        |  28 ++++++++++
 7 files changed, 96 insertions(+), 8 deletions(-)
 create mode 100644 testData/classes/pkg/TestLambdaParams.class
 create mode 100644 testData/results/TestLambdaParams.dec
 create mode 100644 testData/src/pkg/TestLambdaParams.java

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
index 05aac72..c7ae714 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.java.decompiler.main.collectors;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -24,7 +25,7 @@ public class VarNamesCollector {
 
   public VarNamesCollector() { }
 
-  public VarNamesCollector(Set<String> setNames) {
+  public VarNamesCollector(Collection<String> setNames) {
     usedNames.addAll(setNames);
   }
 
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 974c057..0858c68 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -142,19 +142,25 @@ public class NestedClassProcessor {
           if (expr.type == Exprent.EXPRENT_NEW) {
             NewExprent new_expr = (NewExprent)expr;
 
+            VarNamesCollector enclosingCollector = new VarNamesCollector(enclosingMethod.varproc.getVarNames());
+
             if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
               InvocationExprent inv_dynamic = new_expr.getConstructor();
 
               int param_index = is_static_lambda_content ? 0 : 1;
               int varIndex = is_static_lambda_content ? 0 : 1;
 
-              for (int i = 0; i < vars_count; ++i) {
-                Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
+              for (int i = 0; i < md_content.params.length; ++i) {
+                VarVersionPair varVersion = new VarVersionPair(varIndex, 0);
+                if (i < vars_count) {
+                  Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
 
-                if (param.type == Exprent.EXPRENT_VAR) {
-                  VarVersionPair pair = new VarVersionPair((VarExprent)param);
-                  String name = enclosingMethod.varproc.getVarName(pair);
-                  mapNewNames.put(new VarVersionPair(varIndex, 0), name);
+                  if (param.type == Exprent.EXPRENT_VAR) {
+                    mapNewNames.put(varVersion, enclosingMethod.varproc.getVarName(new VarVersionPair((VarExprent)param)));
+                  }
+                }
+                else {
+                  mapNewNames.put(varVersion, enclosingCollector.getFreeName(method.varproc.getVarName(varVersion)));
                 }
 
                 varIndex += md_content.params[i].stackSize;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index bfcd894..5f21ff2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -115,6 +115,10 @@ public class VarProcessor {
     mapVarNames.put(pair, name);
   }
 
+  public Collection<String> getVarNames() {
+    return mapVarNames != null ? mapVarNames.values() : Collections.emptySet();
+  }
+
   public int getVarFinal(VarVersionPair pair) {
     return varVersions == null ? VarTypeProcessor.VAR_FINAL : varVersions.getVarFinal(pair);
   }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 0423ec6..8c770d5 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -110,6 +110,7 @@ public class SingleClassesTest {
   @Test public void testSwitchOnEnum() { doTest("pkg/TestSwitchOnEnum");}
   //@Test public void TestSwitchOnStrings() { doTest("pkg/TestSwitchOnStrings");}
   @Test public void testVarArgCalls() { doTest("pkg/TestVarArgCalls"); }
+  @Test public void testLambdaParams() { doTest("pkg/TestLambdaParams"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestLambdaParams.class b/testData/classes/pkg/TestLambdaParams.class
new file mode 100644
index 0000000000000000000000000000000000000000..8989c667f6d183039a362cc40fc79b205fdb3025
GIT binary patch
literal 1348
zcmbVMZEw<06n^doRJ%G5$LN@Ql}%u}!hD$#V~ixrOxQGm`27NR*iqW1Elc*V^pgo6
z`~k+_WIPudse^5aA9~NZr_b}8d(J)W&)>rz0G{JeMFN>L`MES09;Pvebp;y=HW?Cc
zOxq0JGRzl>pBZ8`rz04Wb<-B7gMLeRP2RF7q6JRPu`JOJOvh%(6zb>vf*TgMyT-@X
zImN4zpRstq)#3RlI)A{hI}1N8ag9KQ;V>#tv$*e9r|HG%&^3x>hF4L=u!L#;Oi8uj
z47|2DGG%8nP2mUiQQ4ok$NT=i?2HBlcNkLd9VhSukGm%#_~LZ@WCB|$ERxyQ@CbQw
zcBHdQ&SU8m7?#{#*SM-mT30)+qKJ};IQAIg+;y!>hRTep!WssFX&Gk&dvt}yQRq~q
zz!QdYlsIni?YyT98-<%;3idS^c&6b#(i)OTX}E_)hV4l?rhVb`gfVU+HHx3{cHnqa
z&O(2(Q}BZ3weC2*flCAV!M24rI;ij&enpQT>Wy1|%<YaP{QQ_0otj4AnRYiC`G?rN
zbjAO@9H+dQ8y&1LZH-%2!wf`K!Apjnss7BWhhhC@9Jc6w6ZG+eER$17>s{Kdk!3Pk
z`VRJu90rxv#3+~{$O1I-CG;KHI9Z+5OGEm5;AC%zdEj)281OnaVK0wxS;FYVTtNys
zWU-o3<(-FWIkGbGT<I&V(X2Vb(SSs7lxqfVg>W=Yx8ig<<O8XIB^;1diBYCMVuen&
VO#4lGpQT5qy&ih2f4w#6e*h!RO<({3

literal 0
HcmV?d00001

diff --git a/testData/results/TestLambdaParams.dec b/testData/results/TestLambdaParams.dec
new file mode 100644
index 0000000..0048941
--- /dev/null
+++ b/testData/results/TestLambdaParams.dec
@@ -0,0 +1,48 @@
+package pkg;
+
+import java.util.function.Function;
+
+public class TestLambdaParams {
+   public static void toCollection(Object var0) {
+      Object var1 = null;// 23
+      Function var2 = (var1x) -> {
+         return var0;
+      };// 24
+      Function var3 = (var1x) -> {
+         return var1;
+      };// 25
+      Function var4 = (var0x) -> {
+         return var0x;
+      };// 26
+   }// 27
+}
+
+class 'pkg/TestLambdaParams' {
+   method 'lambda$toCollection$0 (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;' {
+      1      8
+   }
+
+   method 'lambda$toCollection$1 (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object;' {
+      1      11
+   }
+
+   method 'lambda$toCollection$2 (Ljava/lang/Object;)Ljava/lang/Object;' {
+      1      14
+   }
+
+   method 'toCollection (Ljava/lang/Object;)V' {
+      0      6
+      1      6
+      8      9
+      f      12
+      15      15
+      17      16
+   }
+}
+
+Lines mapping:
+23 <-> 7
+24 <-> 10
+25 <-> 13
+26 <-> 16
+27 <-> 17
diff --git a/testData/src/pkg/TestLambdaParams.java b/testData/src/pkg/TestLambdaParams.java
new file mode 100644
index 0000000..bdb9279
--- /dev/null
+++ b/testData/src/pkg/TestLambdaParams.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+
+public class TestLambdaParams {
+  public static void toCollection(Object collectionFactory) {
+    Class a = null;
+    Function f = r1 -> collectionFactory;
+    Function f1 = r1 -> a;
+    Function f2 = r1 -> r1;
+  }
+}

From 478e6896e952183eeb5510759e2847e1b162f0f6 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 26 Apr 2017 20:14:23 +0300
Subject: [PATCH 120/252] fixed static interface methods

---
 .../java/decompiler/main/ClassWriter.java     |   2 +-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestInterfaceMethods.class    | Bin 0 -> 340 bytes
 testData/results/TestInterfaceMethods.dec     |  23 ++++++++++++++++++
 testData/src/pkg/TestInterfaceMethods.java    |   6 +++++
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 testData/classes/pkg/TestInterfaceMethods.class
 create mode 100644 testData/results/TestInterfaceMethods.dec
 create mode 100644 testData/src/pkg/TestInterfaceMethods.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index b7b8fb4..5646407 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -624,7 +624,7 @@ public class ClassWriter {
 
       appendModifiers(buffer, flags, METHOD_ALLOWED, isInterface, METHOD_EXCLUDED);
 
-      if (isInterface && mt.containsCode()) {
+      if (isInterface && !mt.hasModifier(CodeConstants.ACC_STATIC) && mt.containsCode()) {
         // 'default' modifier (Java 8)
         buffer.append("default ");
       }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 8c770d5..fe54ecb 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -111,6 +111,7 @@ public class SingleClassesTest {
   //@Test public void TestSwitchOnStrings() { doTest("pkg/TestSwitchOnStrings");}
   @Test public void testVarArgCalls() { doTest("pkg/TestVarArgCalls"); }
   @Test public void testLambdaParams() { doTest("pkg/TestLambdaParams"); }
+  @Test public void testInterfaceMethods() { doTest("pkg/TestInterfaceMethods"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestInterfaceMethods.class b/testData/classes/pkg/TestInterfaceMethods.class
new file mode 100644
index 0000000000000000000000000000000000000000..1cc7d69cb9bc5adb0f5ee97e8556e13f6b04cf3b
GIT binary patch
literal 340
zcmZ{fJx;?w5QX13jt#*fh>CCm5E5?aD3Oqm3=~A^$LmS5!Pv-Nb1zy74#1&M#!EmH
z(7gG1-#lqPKHuH}TwoGo9Alr5w2qxMx8hcHK^UBz&I#dFT?k>4*-GxZr(BvD=cR7O
zg)F!$-8X)i)rQMCH@5e;Q0P{+B^+nZkIQr>t-Gn5Gz&KJb=F=IMh|t@7`e86>hv$@
ze9bRRIQlPyaL^NJ$<;Ew&(~sHL?8tEA5?cSK&bOjr>Wlo^r{UZQjN621Mv@b=G`q8
U{KAIVQ7iE$q{$->?x_YyHs#Mqwg3PC

literal 0
HcmV?d00001

diff --git a/testData/results/TestInterfaceMethods.dec b/testData/results/TestInterfaceMethods.dec
new file mode 100644
index 0000000..d27a839
--- /dev/null
+++ b/testData/results/TestInterfaceMethods.dec
@@ -0,0 +1,23 @@
+package pkg;
+
+public interface TestInterfaceMethods {
+   static void staticMethod() {
+   }// 4
+
+   default void defaultMethod() {
+   }// 5
+}
+
+class 'pkg/TestInterfaceMethods' {
+   method 'staticMethod ()V' {
+      0      4
+   }
+
+   method 'defaultMethod ()V' {
+      0      7
+   }
+}
+
+Lines mapping:
+4 <-> 5
+5 <-> 8
diff --git a/testData/src/pkg/TestInterfaceMethods.java b/testData/src/pkg/TestInterfaceMethods.java
new file mode 100644
index 0000000..26f7d76
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceMethods.java
@@ -0,0 +1,6 @@
+package pkg;
+
+public interface TestInterfaceMethods {
+  static void staticMethod() {}
+  default void defaultMethod() {}
+}
\ No newline at end of file

From 195dabf6e6556b9266b7b6e109b777784c9253d9 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 26 Apr 2017 20:29:15 +0300
Subject: [PATCH 121/252] test for union types

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestUnionType.class      | Bin 0 -> 1805 bytes
 testData/results/TestUnionType.dec            |  28 ++++++++++++++++++
 testData/src/pkg/TestUnionType.java           |  10 +++++++
 4 files changed, 39 insertions(+)
 create mode 100644 testData/classes/pkg/TestUnionType.class
 create mode 100644 testData/results/TestUnionType.dec
 create mode 100644 testData/src/pkg/TestUnionType.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index fe54ecb..3a213c4 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -112,6 +112,7 @@ public class SingleClassesTest {
   @Test public void testVarArgCalls() { doTest("pkg/TestVarArgCalls"); }
   @Test public void testLambdaParams() { doTest("pkg/TestLambdaParams"); }
   @Test public void testInterfaceMethods() { doTest("pkg/TestInterfaceMethods"); }
+  //@Test public void testUnionType() { doTest("pkg/TestUnionType"); } //TODO: fix
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestUnionType.class b/testData/classes/pkg/TestUnionType.class
new file mode 100644
index 0000000000000000000000000000000000000000..b29915843360b37486595da31aae6720565bdcf1
GIT binary patch
literal 1805
zcma)5&v(>R6#m{!o1`JM({x%uE4DP14iyG!E#lBBjI9hz3p%9=i25e;It|SvV<uC@
zKfpapcJ6h-s-6SqAZs_S_*Xc`g&yxqQk#~_A?Li@`|iE(yTAYV=kZejv#6Uy&Z;=4
zVn)Y%nAPz<<}^%5dR|ICkiQF>R3C{YA8IH`;YAIWr1KgUB>hOm#~Lo_7{X;03o6PC
zhV8f7JaD{b#S0mZP8F*6_!cjAL&q(aBOMR@pv2Hq_8Wp>pz3&HrQ52DV3pThk_=f5
z(Gh{eUFSzp<*j;yTMXx?Vj!1$&7$LN`J19x+p%iIW~IbgWOKcKPuL+jGONDL-8BkI
z;wMfNHv(pucnw&F!?lpxo6Ec%Jy-Dw!|@owN+)csug}iS&79@dIfj$zh?8hi&JszX
z!jQ4a+<aLlH8Tu)&F==bSaM`_%vI3|Z+edJt=?~oGqSi0xy!yEcEW(SmqobYH#!3f
z7IUzOEM=+Tz48YGB^+bOM-6fO|H>DaJr?illZsCbTtS60HgFZ!3{<gfU`2A*Q891>
z6u%nRKp6N;%08E}!S-gexF=QvHK{lexsO^@ab3~m?xmpFZ3!=2{J|FOkTRp<R=h3h
ze`72z^4RV~aA{y*6*npEU8uO4dqlNRj-ie<d~paP_>y6K*ZzMdh~jRFu+nO~aUoZD
zi)x<Vnc^tw7?%c1+u)szc#5-AvX6@RuFKsH!|(yEFWlY_e$DY33~!RdrLJeoytqqS
zBZ75qi?Yi*gfw=rHXYsMt4wN6)8k<`pe&3evjll0xyDc_JLRI|IpM;-ERw7XYbtIT
zxQ(w3On~+>)y|}*@h%c9r#xua?=$psH%tjsd`rcu`u=9OO>tE`PXtj^f-?RoUAqJ_
zj`0fj8m{PA@xxMTUy|Tbl06UQrj+iav^%?(5+x7H+;wYCC`u}5uO?p_n1dpraecL&
z!f5`E$Q48ueK?9^V0eRW7E$>bk0tXAnP<p8qB~6m{gp_o<#deVE#l>iKM6rD^Mg~{
z=&5Grr?=7j3*ATQu)EK{e?fF`+ElioKBTpuAC*e_zM&KQ0`l}$%PBu&k(fSH-^QVb
zxInyN9*+3a#P^#65kF3R&K!*RVdBk1-WP@Z=m~~ynfc!^{5v_wrovWmoFqo%^a0++
z7~RI{^rPo*jH)=n^!#7AO3Bd}CCSYZ&5%u|=U4epp=lA?NUX&q-XXoTI7u8Mzf;kz
efV)I>lH8$$zoIgqqI-_+)9A&!I8EmaivI%LcheXE

literal 0
HcmV?d00001

diff --git a/testData/results/TestUnionType.dec b/testData/results/TestUnionType.dec
new file mode 100644
index 0000000..1b541d8
--- /dev/null
+++ b/testData/results/TestUnionType.dec
@@ -0,0 +1,28 @@
+package pkg;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+public interface TestUnionType {
+   static Comparator comparingInt() {
+      return (Comparator & Serializable)((c1, c2) -> {// 8
+         return 1;
+      }));
+   }
+}
+
+class 'pkg/TestUnionType' {
+   method 'lambda$comparingInt$ff46620a$1 (Ljava/lang/Object;Ljava/lang/Object;)I' {
+      0      8
+      1      8
+   }
+
+   method 'comparingInt ()Ljava/util/Comparator;' {
+      5      7
+      8      7
+      b      7
+   }
+}
+
+Lines mapping:
+8 <-> 8
diff --git a/testData/src/pkg/TestUnionType.java b/testData/src/pkg/TestUnionType.java
new file mode 100644
index 0000000..13c2bf7
--- /dev/null
+++ b/testData/src/pkg/TestUnionType.java
@@ -0,0 +1,10 @@
+package pkg;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+public interface TestUnionType {
+  public static Comparator comparingInt() {
+    return (Comparator & Serializable)(c1, c2) -> 1;
+  }
+}

From e44ba9905e410be06b69152fff5950094c6651bf Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 26 Apr 2017 21:11:10 +0300
Subject: [PATCH 122/252] IDEA-127533 int field is displayed as char

---
 .../java/decompiler/main/ClassWriter.java     |   5 +
 .../modules/decompiler/ExprProcessor.java     |   4 +
 .../decompiler/exps/AssignmentExprent.java    |   6 +-
 .../modules/decompiler/exps/ConstExprent.java |  15 +
 .../decompiler/exps/FunctionExprent.java      |  13 +
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestConstType.class      | Bin 0 -> 2120 bytes
 testData/results/TestClassLoop.dec            |   4 +-
 testData/results/TestConstType.dec            | 337 ++++++++++++++++++
 testData/src/pkg/TestConstType.java           | 106 ++++++
 10 files changed, 488 insertions(+), 3 deletions(-)
 create mode 100644 testData/classes/pkg/TestConstType.class
 create mode 100644 testData/results/TestConstType.dec
 create mode 100644 testData/src/pkg/TestConstType.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 5646407..59b744c 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -442,6 +442,11 @@ public class ClassWriter {
       }
       else {
         buffer.append(" = ");
+
+        if (initializer.type == Exprent.EXPRENT_CONST) {
+          ((ConstExprent) initializer).adjustConstType(fieldType);
+        }
+
         // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction.
         buffer.append(initializer.toJava(indent, tracer));
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 04e3c26..5d41ff5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -885,6 +885,10 @@ public class ExprProcessor implements CodeConstants {
 
     if (quote) buffer.append('(');
 
+    if (exprent.type == Exprent.EXPRENT_CONST) {
+      ((ConstExprent) exprent).adjustConstType(leftType);
+    }
+
     buffer.append(exprent.toJava(indent, tracer));
 
     if (quote) buffer.append(')');
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
index 957f3f5..4374ff8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,6 +138,10 @@ public class AssignmentExprent extends Exprent {
       buffer.append(left.toJava(indent, tracer));
     }
 
+    if (right.type == EXPRENT_CONST) {
+      ((ConstExprent) right).adjustConstType(leftType);
+    }
+
     TextBuffer res = right.toJava(indent, tracer);
 
     if (condType == CONDITION_NONE &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index f649d80..9e89f6c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -367,6 +367,21 @@ public class ConstExprent extends Exprent {
     this.constType = constType;
   }
 
+  public void adjustConstType(VarType expectedType) {
+    // BYTECHAR and SHORTCHAR => CHAR in the CHAR context
+    if (expectedType.equals(VarType.VARTYPE_CHAR) &&
+            (constType.equals(VarType.VARTYPE_BYTECHAR) || constType.equals(VarType.VARTYPE_SHORTCHAR))) {
+      if (getIntValue() != 0) {
+        setConstType(VarType.VARTYPE_CHAR);
+      }
+    }
+    // CHAR => INT in the INT context
+    else if (expectedType.equals(VarType.VARTYPE_INT) &&
+            constType.equals(VarType.VARTYPE_CHAR)) {
+      setConstType(VarType.VARTYPE_INT);
+    }
+  }
+
   public Object getValue() {
     return value;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index 6662965..0cc0025 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -459,7 +459,20 @@ public class FunctionExprent extends Exprent {
         .append(wrapOperandString(lstOperands.get(1), true, indent, tracer));
     }
 
+      // try to determine more accurate type for 'char' literals
     if (funcType >= FUNCTION_EQ) {
+      if (funcType <= FUNCTION_LE) {
+        Exprent left = lstOperands.get(0);
+        Exprent right = lstOperands.get(1);
+
+        if (right.type == EXPRENT_CONST) {
+          ((ConstExprent) right).adjustConstType(left.getExprType());
+        }
+        else if (left.type == EXPRENT_CONST) {
+          ((ConstExprent) left).adjustConstType(right.getExprType());
+        }
+      }
+
       return wrapOperandString(lstOperands.get(0), false, indent, tracer)
         .append(OPERATORS[funcType - FUNCTION_EQ + 11])
         .append(wrapOperandString(lstOperands.get(1), true, indent, tracer));
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 3a213c4..51521b4 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -113,6 +113,7 @@ public class SingleClassesTest {
   @Test public void testLambdaParams() { doTest("pkg/TestLambdaParams"); }
   @Test public void testInterfaceMethods() { doTest("pkg/TestInterfaceMethods"); }
   //@Test public void testUnionType() { doTest("pkg/TestUnionType"); } //TODO: fix
+  @Test public void testConstType() { doTest("pkg/TestConstType"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestConstType.class b/testData/classes/pkg/TestConstType.class
new file mode 100644
index 0000000000000000000000000000000000000000..57d4fec11e4920937a29e6a9143552ed071e4635
GIT binary patch
literal 2120
zcmZuyO-vkR7=DIjciCm2vrD0+P(j3&p9*McZTV?|1=<xTP$+*@(_tB5%d$&%2MTHe
z-s;h#Hw}lzbQ7(ns5LPfFY3*sM|(0R-aM#L@p)%HmTlThzUTS=-}imqcV>S4@8Q<~
z+VN@-^@s%U9Qp+Yf`q{!F5$93G=Nty6vQw_1g?01J6{mK8}mT>1ML02DbOnr7q}&`
zBXCdPGl8!>Fd&=15y<un3<wMgTq68-gYdVk{`)K8<L?REGThtqW7M;?Cp_lIxQ0L?
zp0xVXmbt7!i)bi((@Li__`2fBxP3u`r=f9*vys$-rQy&pH(yy>nYYrD=6r%P;o(%w
zOiY>SxQx|gp}iE(Xeb+AU0!URv@&)imCV?ao2yo*20dfha*eWC*bor|1t}gVnXt{+
z@`$;*e~<V;8?jV!-Adch<bsv7O*@`SYB<p_eA8SvTN7q-v30^u$CHbljZaR|b=%sI
zOP;nCSmim}Or*FWu()PrGU6o9G(;Pzg=gJNP?abHU$h+mN6d{WGqL7ui8OMdXystW
zcFqPTQfuj$H5hl~c`W)C@mNO#8g)F66FN=`w4%+At2!pop<@!){Fu@)jTt{?b<Ckn
z;JSv;LAcSRZ7o`9&OITp2IFAg==@D9#?bPnT&0-b*piv<<(fZjttQMEBdTbKM4qZ(
z{_)L>ZLLt5)Edv0yPC#Rtz)7i@3zbprnt;;;qhr&a>PzBcOvf;p5?1i&zGiv57lsb
z6ol-DCL$4=IO^lNMmCy0ht^~SAE2Pg^8lXv&WUDXsgyQbA)g?;IK`3fp1})f;Ybse
z)qQU{7J*Y$_qYPbMge(^t%~h7TYZyJLOXX6a1Dwr55!gl?+1!dO-pqsrst)c4>>j~
zcr))+Hl_C><I(UEXT9)L7kN22oeS)Y3e4YR+}=guK|Dd{p2P5=JTDf1E|zwjQL)U?
zE3sML?Ae9a2z&s&*$5c5yYLM+f5HXVX;+}5bh#2`3{nJgoh{EfTaL4MSvkwEQ5n1E
z_FdK9R<1t!6n?|pMUim8Wm*o%uvhVh%b~45_d9>Nop4Zbv0`0uiQ-blhZGx%LyE(S
z%M>40T&}o6@e##G6;~=grnpLRwc_K7pCKP)VI9XQQw?)n%kOO+j<8;9Sg|LW^ET%7
zJbS&Y(<oIMXBEw|4opfLr=+)7b(^fYcewLiR>6C$f%lpE5BZDuh}pYOvA?9;-%{fr
zc+*elz|ZK!FX+n4_@i9L&vV^<8y+$flJRj*)eiJ3V`~RKV<u~C=MDR^A;`F-DzvpH
z>$BO=Hu5JXvf&!%K)6=cBUvMw%~eYa%Nn>y>|t^D;TR&6Vu0ZdGOWvVG0N2;KKzAY
zG_RV*bJaA?V7gQ_`Qa@sHH=aYyK%vdLn|iBTRW@X!U^`}&FW+8V2iMgu*v)&+YH-j
zwpq3whSz-;HO3aPGF(F}W27WKTubzY>$<BC;yH^F9=b;9rz!UgJ)5H&*O|Q6(2v*o
zU%tUuOvVypA{Y1#euF!goVczs{paZDMMhJ=Q~SOCTyH4X8_)H`P4~kiy&mTyFwOJs
ZE%G_g;cxeOy*}?hDBv%KzQ~8L?|;a8d<p;n

literal 0
HcmV?d00001

diff --git a/testData/results/TestClassLoop.dec b/testData/results/TestClassLoop.dec
index ba29595..55e369b 100644
--- a/testData/results/TestClassLoop.dec
+++ b/testData/results/TestClassLoop.dec
@@ -51,10 +51,10 @@ public class TestClassLoop {
 
       for(boolean var8 = false; var2 < var1; ++var2) {// 70 73 90
          char var6 = var0.charAt(var2);// 74
-         if (var6 == 48) {// 75
+         if (var6 == '0') {// 75
             ++var7;// 76
          } else {
-            if (var6 != 46) {// 77
+            if (var6 != '.') {// 77
                break;
             }
 
diff --git a/testData/results/TestConstType.dec b/testData/results/TestConstType.dec
new file mode 100644
index 0000000..9dd1b50
--- /dev/null
+++ b/testData/results/TestConstType.dec
@@ -0,0 +1,337 @@
+package pkg;
+
+public class TestConstType {
+   private char lineBreak = '\n';
+   private char zero = 0;
+
+   public void setLineBreak(char os) {
+      switch(os) {// 8
+      case 'u':
+         this.lineBreak = '\r';// 10
+         break;// 11
+      case 'w':
+         this.lineBreak = '\n';// 14
+      }
+
+   }// 17
+
+   public void init() {
+      this.setLineBreak('w');// 20
+   }// 21
+
+   public String convertIndentation(String text) {
+      if (text.charAt(0) == '\t') {// 24
+         text = text.replace('\t', ' ');// 25
+      }
+
+      return text;// 27
+   }
+
+   public void printalot() {
+      System.out.println('a');// 31
+      System.out.println('\t');// 32
+      System.out.println(0);// 34
+      System.out.println(65);// 35
+      System.out.println(120);// 36
+      System.out.println(32760);// 37
+      System.out.println(32761);// 38
+      System.out.println(35000);// 39
+      System.out.println(50000);// 40
+      System.out.println(128000);// 41
+      System.out.println(60793);// 42
+      System.out.println(60737);// 43
+      System.out.println(60777);// 44
+      System.out.println(60785);// 45
+      System.out.println(60835);// 46
+      System.out.println(60843);// 47
+      System.out.println(60851);// 48
+      System.out.println(60859);// 49
+      System.out.println(1048576);// 50
+      System.out.println(49152);// 51
+      System.out.println(44100);// 52
+      System.out.println(44101);// 53
+      System.out.println(44102);// 54
+      System.out.println(44103);// 55
+      System.out.println(60000);// 56
+      System.out.println(64000);// 57
+      System.out.println(65000);// 58
+      System.out.println(45000);// 59
+   }// 60
+
+   public char guessType(int val) {
+      if (0 <= val && val <= 127) {// 63
+         return 'X';// 64
+      } else if (-128 <= val && val <= 127) {// 66
+         return 'B';// 67
+      } else if (128 <= val && val <= 32767) {// 69
+         return 'Y';// 70
+      } else if (-32768 <= val && val <= 32767) {// 72
+         return 'S';// 73
+      } else {
+         return (char)(32768 <= val && val <= 65535 ? 'C' : 'I');// 75 76 79
+      }
+   }
+
+   public int getTypeMaxValue(char type) {
+      int maxValue;
+      switch(type) {// 85
+      case 'B':
+         maxValue = 127;// 90
+         break;// 91
+      case 'C':
+         maxValue = 65535;// 99
+         break;// 100
+      case 'S':
+         maxValue = 32767;// 96
+         break;// 97
+      case 'X':
+         maxValue = 128;// 87
+         break;// 88
+      case 'Y':
+         maxValue = 32768;// 93
+         break;// 94
+      default:
+         maxValue = 2147483647;// 102
+      }
+
+      return maxValue;// 104
+   }
+}
+
+class 'pkg/TestConstType' {
+   method 'setLineBreak (C)V' {
+      1      7
+      1d      9
+      1f      9
+      22      10
+      26      12
+      28      12
+      2b      15
+   }
+
+   method 'init ()V' {
+      1      18
+      3      18
+      6      19
+   }
+
+   method 'convertIndentation (Ljava/lang/String;)Ljava/lang/String;' {
+      1      22
+      2      22
+      5      22
+      7      22
+      b      23
+      d      23
+      f      23
+      12      23
+      14      26
+   }
+
+   method 'printalot ()V' {
+      0      30
+      3      30
+      5      30
+      8      31
+      b      31
+      d      31
+      10      32
+      13      32
+      14      32
+      17      33
+      1a      33
+      1c      33
+      1f      34
+      22      34
+      24      34
+      27      35
+      2a      35
+      2d      35
+      30      36
+      33      36
+      36      36
+      39      37
+      3c      37
+      3e      37
+      41      38
+      44      38
+      46      38
+      49      39
+      4c      39
+      4e      39
+      51      40
+      54      40
+      56      40
+      59      41
+      5c      41
+      5e      41
+      61      42
+      64      42
+      66      42
+      69      43
+      6c      43
+      6e      43
+      71      44
+      74      44
+      76      44
+      79      45
+      7c      45
+      7e      45
+      81      46
+      84      46
+      86      46
+      89      47
+      8c      47
+      8e      47
+      91      48
+      94      48
+      96      48
+      99      49
+      9c      49
+      9e      49
+      a1      50
+      a4      50
+      a6      50
+      a9      51
+      ac      51
+      ae      51
+      b1      52
+      b4      52
+      b6      52
+      b9      53
+      bc      53
+      be      53
+      c1      54
+      c4      54
+      c6      54
+      c9      55
+      cc      55
+      ce      55
+      d1      56
+      d4      56
+      d6      56
+      d9      57
+      dc      57
+      de      57
+      e1      58
+   }
+
+   method 'guessType (I)C' {
+      0      61
+      2      61
+      6      61
+      8      61
+      b      62
+      d      62
+      e      63
+      11      63
+      15      63
+      17      63
+      1a      64
+      1c      64
+      1d      65
+      21      65
+      25      65
+      28      65
+      2b      66
+      2d      66
+      2e      67
+      32      67
+      36      67
+      39      67
+      3c      68
+      3e      68
+      3f      70
+      42      70
+      46      70
+      48      70
+      4b      70
+      4e      70
+   }
+
+   method 'getTypeMaxValue (C)I' {
+      1      76
+      34      87
+      37      87
+      38      88
+      3b      78
+      3d      78
+      3e      79
+      41      90
+      43      90
+      44      91
+      47      84
+      4a      84
+      4b      85
+      4e      81
+      50      81
+      51      82
+      54      93
+      56      93
+      58      96
+   }
+}
+
+Lines mapping:
+8 <-> 8
+10 <-> 10
+11 <-> 11
+14 <-> 13
+17 <-> 16
+20 <-> 19
+21 <-> 20
+24 <-> 23
+25 <-> 24
+27 <-> 27
+31 <-> 31
+32 <-> 32
+34 <-> 33
+35 <-> 34
+36 <-> 35
+37 <-> 36
+38 <-> 37
+39 <-> 38
+40 <-> 39
+41 <-> 40
+42 <-> 41
+43 <-> 42
+44 <-> 43
+45 <-> 44
+46 <-> 45
+47 <-> 46
+48 <-> 47
+49 <-> 48
+50 <-> 49
+51 <-> 50
+52 <-> 51
+53 <-> 52
+54 <-> 53
+55 <-> 54
+56 <-> 55
+57 <-> 56
+58 <-> 57
+59 <-> 58
+60 <-> 59
+63 <-> 62
+64 <-> 63
+66 <-> 64
+67 <-> 65
+69 <-> 66
+70 <-> 67
+72 <-> 68
+73 <-> 69
+75 <-> 71
+76 <-> 71
+79 <-> 71
+85 <-> 77
+87 <-> 88
+88 <-> 89
+90 <-> 79
+91 <-> 80
+93 <-> 91
+94 <-> 92
+96 <-> 85
+97 <-> 86
+99 <-> 82
+100 <-> 83
+102 <-> 94
+104 <-> 97
diff --git a/testData/src/pkg/TestConstType.java b/testData/src/pkg/TestConstType.java
new file mode 100644
index 0000000..d4c0192
--- /dev/null
+++ b/testData/src/pkg/TestConstType.java
@@ -0,0 +1,106 @@
+package pkg;
+
+public class TestConstType {
+    private char lineBreak = '\n';
+    private char zero = 0;
+
+    public void setLineBreak(char os) {
+        switch (os) {
+            case 'u':
+                lineBreak = '\r';
+                break;
+
+            case 'w':
+                lineBreak = '\n';
+                break;
+        }
+    }
+
+    public void init() {
+        setLineBreak('w');
+    }
+
+    public String convertIndentation(String text) {
+        if (text.charAt(0) == '\t') {
+            text = text.replace('\t', ' ');
+        }
+        return text;
+    }
+
+    public void printalot() {
+        System.out.println('a');
+        System.out.println('\t');
+
+        System.out.println(0);
+        System.out.println(65);
+        System.out.println(120);
+        System.out.println(32760);
+        System.out.println(32761);
+        System.out.println(35000);
+        System.out.println(50000);
+        System.out.println(128000);
+        System.out.println(60793);
+        System.out.println(60737);
+        System.out.println(60777);
+        System.out.println(60785);
+        System.out.println(60835);
+        System.out.println(60843);
+        System.out.println(60851);
+        System.out.println(60859);
+        System.out.println(1048576);
+        System.out.println(49152);
+        System.out.println(44100);
+        System.out.println(44101);
+        System.out.println(44102);
+        System.out.println(44103);
+        System.out.println(60000);
+        System.out.println(64000);
+        System.out.println(65000);
+        System.out.println(45000);
+    }
+
+    public char guessType(int val) {
+        if (0 <= val && val <= 127) {
+            return 'X';
+        }
+        else if (-128 <= val && val <= 127) {
+            return 'B';
+        }
+        else if (128 <= val && val <= 32767) {
+            return 'Y';
+        }
+        else if (-32768 <= val && val <= 32767) {
+            return 'S';
+        }
+        else if (32768 <= val && val <= 0xFFFF) {
+            return 'C';
+        }
+        else {
+            return 'I';
+        }
+    }
+
+    public int getTypeMaxValue(char type) {
+        int maxValue;
+        switch (type) {
+            case 'X':
+                maxValue = 128;
+                break;
+            case 'B':
+                maxValue = 127;
+                break;
+            case 'Y':
+                maxValue = 32768;
+                break;
+            case 'S':
+                maxValue = 32767;
+                break;
+            case 'C':
+                maxValue = 0xFFFF;
+                break;
+            default:
+                maxValue = Integer.MAX_VALUE;
+        }
+        return maxValue;
+    }
+}

From 997a7747d65bf4f76ef95ca43f3c89a8020480e1 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 27 Apr 2017 13:33:24 +0300
Subject: [PATCH 123/252] more tests (disabled for now)

---
 .../java/decompiler/SingleClassesTest.java        |   9 ++++++---
 testData/classes/pkg/package-info.class           | Bin 0 -> 166 bytes
 testData/results/package-info.dec                 |   2 ++
 testData/src/pkg/package-info.java                |   2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 testData/classes/pkg/package-info.class
 create mode 100644 testData/results/package-info.dec
 create mode 100644 testData/src/pkg/package-info.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 51521b4..64edeed 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -66,7 +66,6 @@ public class SingleClassesTest {
   @Test public void testAnonymousClassConstructor() { doTest("pkg/TestAnonymousClassConstructor"); }
   @Test public void testInnerClassConstructor() { doTest("pkg/TestInnerClassConstructor"); }
   @Test public void testInnerClassConstructor11() { doTest("v11/TestInnerClassConstructor"); }
-  //@Test public void testInnerClassConstructor2() { doTest("pkg/TestInner2"); } //TODO: fix
   @Test public void testTryCatchFinally() { doTest("pkg/TestTryCatchFinally"); }
   @Test public void testAmbiguousCall() { doTest("pkg/TestAmbiguousCall"); }
   @Test public void testAmbiguousCallWithDebugInfo() { doTest("pkg/TestAmbiguousCallWithDebugInfo"); }
@@ -108,13 +107,17 @@ public class SingleClassesTest {
           "pkg/SharedName2", "pkg/SharedName3", "pkg/SharedName4", "pkg/NonSharedName",
           "pkg/TestClashNameParent", "ext/TestClashNameParent","pkg/TestClashNameIface", "ext/TestClashNameIface"); }
   @Test public void testSwitchOnEnum() { doTest("pkg/TestSwitchOnEnum");}
-  //@Test public void TestSwitchOnStrings() { doTest("pkg/TestSwitchOnStrings");}
   @Test public void testVarArgCalls() { doTest("pkg/TestVarArgCalls"); }
   @Test public void testLambdaParams() { doTest("pkg/TestLambdaParams"); }
   @Test public void testInterfaceMethods() { doTest("pkg/TestInterfaceMethods"); }
-  //@Test public void testUnionType() { doTest("pkg/TestUnionType"); } //TODO: fix
   @Test public void testConstType() { doTest("pkg/TestConstType"); }
 
+  // TODO: fix all below
+  //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
+  //@Test public void testSwitchOnStrings() { doTest("pkg/TestSwitchOnStrings");}
+  //@Test public void testUnionType() { doTest("pkg/TestUnionType"); }
+  //@Test public void testInnerClassConstructor2() { doTest("pkg/TestInner2"); }
+
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
 
diff --git a/testData/classes/pkg/package-info.class b/testData/classes/pkg/package-info.class
new file mode 100644
index 0000000000000000000000000000000000000000..eee29394a7d0983ed45f01bfd0318a0809373ab2
GIT binary patch
literal 166
zcmX^0Z`VEs1_l!bPId-%b_Nbc2Cm@z(xT*4x6GVWMh3xx#N_P6^i<u<ytI71ti-ZJ
zMh3~C(!7$)+|;nl;>@I+RL8u${F20y%>2A!Mg~5gtdwkh*NTGtqLS1UYeoivg6wpC
vWJ7>LAY=4%67$ma{gbj%lS{-H7#JCtfUW=mCI)6O$-=-2q}hNnYzzzl15hd`

literal 0
HcmV?d00001

diff --git a/testData/results/package-info.dec b/testData/results/package-info.dec
new file mode 100644
index 0000000..f19fbea
--- /dev/null
+++ b/testData/results/package-info.dec
@@ -0,0 +1,2 @@
+@jdk.Exported
+package pkg;
\ No newline at end of file
diff --git a/testData/src/pkg/package-info.java b/testData/src/pkg/package-info.java
new file mode 100644
index 0000000..d665652
--- /dev/null
+++ b/testData/src/pkg/package-info.java
@@ -0,0 +1,2 @@
+@jdk.Exported
+package pkg;

From 4de826363f1747e03011681ada0ecf82d0c4333f Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 27 Apr 2017 15:21:44 +0300
Subject: [PATCH 124/252] (byte) type cast in constructor calls

---
 .../modules/decompiler/exps/NewExprent.java   |   2 +-
 testData/classes/pkg/TestPrimitives.class     | Bin 2731 -> 2825 bytes
 testData/results/TestPrimitives.dec           |  11 +++++++++++
 testData/src/pkg/TestPrimitives.java          |   4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index d608be4..d43388c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -340,7 +340,7 @@ public class NewExprent extends Exprent {
                 buf.append(", ");
               }
 
-              ExprProcessor.getCastedExprent(expr, leftType, buf, indent, true, tracer);
+              ExprProcessor.getCastedExprent(expr, leftType, buf, indent, true, false, true, tracer);
 
               firstParam = false;
             }
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index a2e23ba7c71e119a3f73fa320e5092fb1e1cba65..74260de28c361a904942339b0eedadf93023d8b4 100644
GIT binary patch
literal 2825
zcmaKt`&S!P5XZkuLN+W51QH%f6)GTUN=a2zDp*<`sUQLxq(XfyVS%L~i_3;e@qzF6
zqt>_9pZw9&bM%KaN00si{ullY{_b(+X0t4hZO+N=otZnIJ9qBf*}wn${VxE0_(?%M
z78KlzOZ<42AJ6gQ`AV|$Z-=E9f<repe&*4Op`m|o#;*Qz;U-HOKNhQy!BQByjAfQr
z6s*GF(VBuzT;@?$!8&q0G8Js#B?T5X71+p!u@%M@1utVejH?QE@QQ+0@md(KE7-*w
zGTvm$TQc635E?XchJ98-Abw&_LU6=f(k0YQ8aaI`zrLtjv)W>oG!2txM$67=mcg>4
z4BD&4ri9q!#^sgdtiEZ_SjM_x8(aG3fQ0adW#sJh*{lRr42MlKt7|!0CBDFmNsIJf
zkWf{!Zrij@Fg`3y!x9vsPOqAl&HA*^({fU}%pT7P%eb%@WEn5RCe7RmJ52}^MIcR-
zfvK#i3AdE6Et4%Jp;|09YUagmgYi*eTq5IWnK`nmS<D;}rVN=zh`FNM?!G98v>lmM
zVlyPuKEfnByC4MxA0mYaokWVbMl3z0S(bT4rxmL+W^U8A@)_Ht^^~-kw=#Ol;8Te1
zPjc^?wxy})MqEV_r&T<FJ{1q)VHJ;HK*d=MsTjtHiWDxWn84#Q-cj)`-jh(<wb;|%
zwN(B~h%hXf)p9Gz>BTiYW2>0Lw2b#ve1H#C%-~5LeWc<kq-A`}!Y3+b@wALjS@=xG
z=PIt@3mMl{e2K3lRCLi1S9C4O_?l;Y!@{zRZ&~<G#`paGft48<KeBLx0^5s&v&h@)
zqxw5sV*5f)Z*SWAI+d}Rr^9WW6cEEq&TtK;ZA;hIsU+(?>~b;6TUs`+Pg5N<QCXH8
zMHZZ6CATOQrPn}Vk+yCR<{WQ~iqtbtX!oy5$F8sFbgWJBaqm<|Pm?{zKw%qP#-U}?
zTIZTQ6Zg`Eb>NamRXVo;FSx|uJsgn{s#Q^YS-O*rN3gljJ;zbHR8hKAo;6vyKN-#i
zi^Wskc|yB?f92cONVm;HEUDd)#aZy((=s+^u7xh3XSQn@z;SAZ^`gZ_An~oB=LwRN
z^p@ydnYab%R~l3xLC=s-25^$bYH0#`aEc@ey{>c7nYWe*7EqCh>=Y14)JswUK_OHo
zVh9xwPBc^%ppZ~qKusdDP(bZ(sB4JGf1-XqkSL&`h-i8~NTXO0jp_MH8Z{NsoSqNS
zsHKQI(nZ`^K<i$F2`D1YO30{27!9aG3+dWO>Y|u?P=otX2Lln$F4o*#P*0$}a0;er
z7Zvnw=9rEJMNF+6(7`1YF)fNF#00Xb<mMm=fct1k&L{Pnqu_VB@J1haGr?PY;SUNp
z^|0H+n|<J|1V82j@5dPdr`~vb_~DZ%rKOGF?LP29JSyPSb6vQMKso15TH1=Z+b8l4
zf_M7B&*8j)Q!jVno&#+w<-DVab{}{*!Q(#gQH%*VeIs1BCvpegUBq!8_(_8I_`n~-
zxPa5Q$Ax<$zsIeX4j*`u;HQ1ylXybF={x1XdxT6kJn#!;-h0pc1fz7%E8H7GA2rAG
zl;atQ>>hOO_qYaJSNaM%uDy<HuznW@eFr_hLD!c)nunH69CSVBaot;X&h1QNv_EcZ
z(FFI8YuuN3aGg5SUJI!eB{)irV~pBI%7cu$(Oh(q{WP1A${*;Q58gu8#XVB#3XBtJ
O!b4G9$}=M2^Zx?}Jm~)b

delta 1270
zcmZ{jSx*yD6vzM5f!=a+1F{Gvm}o+wmBm2;MMXhGa2F9#+{;#Fvnry1THM85N8Ek$
z4T2#gn)u)c-~;&Llb^vSUySG6Htp18=HcA)pPt`6({ulKDt~5abn)-E?*OXtULqTZ
zCHy$Tp_9W=4#(2zcYY>V9Z#$O82QB632*)HxxDdTEpx0+ayXTN(+K&{CD6^fN1_*f
zoP{OM;4EkT5(60IY)E3*!a0cu&P!atMIT0dxFj)(%RXF@7{j>41g`pUP2xJD0+aJ!
zrVYE(Q&d%q5`_w^R#=0zioU-_p%xny>aba%0b3QCuw7vXb_(23xQSc#XHQ9V5B3V&
zR=9(^3j45M;2w+n3avOGFva45LK_YWJY?}m;IYCJJQaAR@Ek7;c#69?^a$8o@sdTK
zz%+|j0<U>}!!Nr9-m-XSASW^qw%U8`usNEQ*&iAWS%abBu+=y=(!21}oH1JcG=6@v
zV1WJ{#Q-UbR)f~`(yuV)De)jk(W_sYSVg&t6`&MlqzshDVEae<gb}pcyjEedsy|Uh
zqodk@{lOco;T<LI4CEpod3x7;tqbDyKmmP9B@qVCTa$lM$O0mlxsp|yq(jnVhj8{R
zByzb6xen_!Nhhnxg%olHkt<!ujo73~vV$g<_?$h9i1fRVTTrh_@{lHnQpf<2K^L+S
z+cZhW)8t|bSw>{J3)zeoO_EzR8OR7mlc!=4S?NOV!fs8HubHGXEZ3TxV$PCs`lVX$
z5%Y^D;RLz_ak3&#noA~U5lv-l9juvP>CVJib`u*lEqfCG_pNiVX$h9DSe#AvElr|D
mF^@Mm*ks@KxW^;XZ}FTmVNz^D22DN(%?>6v(eIF+M#n$OO@>_n

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index de8a420..03026fa 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -65,6 +65,10 @@ public class TestPrimitives {
       this.printByte((byte)this.getInt());// 68
       this.printShort((short)this.getInt());// 69
    }// 70
+
+   public void constructor() {
+      new Byte((byte)1);// 73
+   }// 74
 }
 
 class 'pkg/TestPrimitives' {
@@ -201,6 +205,11 @@ class 'pkg/TestPrimitives' {
       f      65
       12      66
    }
+
+   method 'constructor ()V' {
+      4      69
+      9      70
+   }
 }
 
 Lines mapping:
@@ -237,3 +246,5 @@ Lines mapping:
 68 <-> 65
 69 <-> 66
 70 <-> 67
+73 <-> 70
+74 <-> 71
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 1ecb5e7..68b6c44 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -68,4 +68,8 @@ public class TestPrimitives {
     printByte((byte)getInt());
     printShort((short)getInt());
   }
+
+  public void constructor() {
+    new Byte((byte)1);
+  }
 }

From 645b38d638685e576464f0159bfed1019633d497 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 27 Apr 2017 20:11:24 +0300
Subject: [PATCH 125/252] test for already used var

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestInUse.class          | Bin 0 -> 535 bytes
 testData/results/TestInUse.dec                |  53 ++++++++++++++++++
 testData/src/pkg/TestInUse.java               |  18 ++++++
 4 files changed, 72 insertions(+)
 create mode 100644 testData/classes/pkg/TestInUse.class
 create mode 100644 testData/results/TestInUse.dec
 create mode 100644 testData/src/pkg/TestInUse.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 64edeed..fd71584 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -117,6 +117,7 @@ public class SingleClassesTest {
   //@Test public void testSwitchOnStrings() { doTest("pkg/TestSwitchOnStrings");}
   //@Test public void testUnionType() { doTest("pkg/TestUnionType"); }
   //@Test public void testInnerClassConstructor2() { doTest("pkg/TestInner2"); }
+  //@Test public void testInUse() { doTest("pkg/TestInUse"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestInUse.class b/testData/classes/pkg/TestInUse.class
new file mode 100644
index 0000000000000000000000000000000000000000..5f0474f830b0f79a9903c41155f25c6c3d9a7afd
GIT binary patch
literal 535
zcmY*W%T5A85Ukl<7F?bpBBC6;DT#9NCU7w^AwfNW+!vVO0xo19egQw?-HR7ZJoo|r
zjX!|aEQDY-)7{lmRo#>QUVeT7xJ224fuaQ+2XU0*I217Jj_U+X0sZu>CtzI9hEgEg
zc3gQEKJ}&7wfj?c^6lBcp7w0dQFz@nf=9<!?D=F=>q<Xpxeva)qU%Vq4kFi<K+Kb&
zPZQzr5Q`xxp7g^hDd|pN4<@(vd~IrVW}!EbH;x*c*|=Ve?PoiM7|aw>NK^N3s6b8;
zYE#=C)$aRaIS6pVhZ=l1n7IT@#yC-pSun?{9}sUWG$a_+wW97Yrd9-4ND>J(kx_}y
znIm4V`bxMhjcrNwwbVdnBVCZK_9^Riy`eX&@6Z~R<6(0l#8J+A`TeOVM?G4m%ymFN
zgFYt5C+U*qS3)kDQe8Q%r)cbFdBY!wB6eA6R27hCrDKmy35X?3A=L5(Vh#I$=;%%3

literal 0
HcmV?d00001

diff --git a/testData/results/TestInUse.dec b/testData/results/TestInUse.dec
new file mode 100644
index 0000000..c3fe83c
--- /dev/null
+++ b/testData/results/TestInUse.dec
@@ -0,0 +1,53 @@
+package pkg;
+
+public class TestInUse {
+   public int getInt() {
+      return 42;// 5
+   }
+
+   protected int reuse() {
+      int i = 0;// 9
+      int d = 0;
+      int result = 0;// 10
+
+      do {
+         d = this.getInt();// 12
+         result -= d;// 13
+         ++i;// 15
+      } while(i < 10);
+
+      return result;// 16
+   }
+}
+
+class 'pkg/TestInUse' {
+   method 'getInt ()I' {
+      0      4
+      2      4
+   }
+
+   method 'reuse ()I' {
+      0      8
+      1      8
+      2      9
+      3      9
+      4      10
+      5      10
+      7      13
+      a      13
+      e      14
+      f      15
+      13      16
+      15      16
+      19      18
+   }
+}
+
+Lines mapping:
+5 <-> 5
+9 <-> 9
+10 <-> 11
+12 <-> 14
+13 <-> 15
+15 <-> 16
+16 <-> 19
diff --git a/testData/src/pkg/TestInUse.java b/testData/src/pkg/TestInUse.java
new file mode 100644
index 0000000..115274d
--- /dev/null
+++ b/testData/src/pkg/TestInUse.java
@@ -0,0 +1,18 @@
+package pkg;
+
+public class TestInUse {
+  public int getInt() {
+    return 42;
+  }
+
+  protected int reuse() {
+    int i = 0, d = 0;
+    int result = 0;
+    do {
+      d = getInt();
+      result -= d;
+    }
+    while (++i < 10);
+    return result;
+  }
+}

From 790027c779b603e5ab6ac6ba97231203d3ebb94d Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 28 Apr 2017 12:17:52 +0300
Subject: [PATCH 126/252] test for super default method call

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestInterfaceSuper$Impl.class | Bin 0 -> 456 bytes
 testData/classes/pkg/TestInterfaceSuper.class | Bin 0 -> 351 bytes
 testData/results/TestInterfaceSuper.dec       |  30 ++++++++++++++++++
 testData/src/pkg/TestInterfaceSuper.java      |  11 +++++++
 5 files changed, 42 insertions(+)
 create mode 100644 testData/classes/pkg/TestInterfaceSuper$Impl.class
 create mode 100644 testData/classes/pkg/TestInterfaceSuper.class
 create mode 100644 testData/results/TestInterfaceSuper.dec
 create mode 100644 testData/src/pkg/TestInterfaceSuper.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index fd71584..fd48f0d 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -118,6 +118,7 @@ public class SingleClassesTest {
   //@Test public void testUnionType() { doTest("pkg/TestUnionType"); }
   //@Test public void testInnerClassConstructor2() { doTest("pkg/TestInner2"); }
   //@Test public void testInUse() { doTest("pkg/TestInUse"); }
+  //@Test public void testInterfaceSuper() { doTest("pkg/TestInterfaceSuper"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestInterfaceSuper$Impl.class b/testData/classes/pkg/TestInterfaceSuper$Impl.class
new file mode 100644
index 0000000000000000000000000000000000000000..c9be440681e4c058e446b729ce372fc8975035a9
GIT binary patch
literal 456
zcmaJ-O;5s55S%Tgl~M#z;b1(Ncu)`Ypf`;d5)%^C1BCl)yFjtDq<!^&c{1_f5Aa7B
zxA=9Cc-eU~yEFT;Z|^U!04~sVV4__|6}vX}Z0y_U5Ui^xiS#w0a&kH$nEf<lLUR};
zd{-=e&c@1*MQIPyK*bZ4MJ4|dO+AltF%6chnBWeQgtLCE@|;CI9IhT_-k5VeNHk|t
z74WE7aduozUlJN2PgN1?Th{Y5BsinA$O68J%5~kpzTQGTDi;=P7fslNgMab~t#aIp
zRWkGL{RIb_(AjLj5h`*TlFI;wpsbL(CCn2f!RpyF=xN=qNwwCZ1xMcQ=K$*17AB|r
jF`o<jHXFZYM|MEcP1H677-&h?zz!OMjs#TXUoL7N$8}k~

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInterfaceSuper.class b/testData/classes/pkg/TestInterfaceSuper.class
new file mode 100644
index 0000000000000000000000000000000000000000..1c4504ae8c2019a65ff40356187e4679188ff2c5
GIT binary patch
literal 351
zcmZutyH3ME5S&enO-w=_1t8H<fRJ!QM;Qspk|9N+^k;jMI9$%w`OJUOQt$zM6k=`B
zk>X}&XGSCKegAxZ0eHkLz&OApz?9&{he{KMu`z7tTGchzgi+2L)oAy^Zdc}n{_Wjb
zvhy-$!Z;}mzcz=I?MkIulvz?{O0ShI+Wk-T+^&$StE76{Mk}seY#iH-%6QpSY@Z0>
zvTSU|&qdpD`9JcoSMQ2&alC*qY5hnmvyB$%o-;?dKAyd4uk;Cop8No05_|-Lr?TC5
kil`q#dKd`$VgVjP!C}V<XTn;4)ZsZ!WQOAP<#`zV0+Mr4x&QzG

literal 0
HcmV?d00001

diff --git a/testData/results/TestInterfaceSuper.dec b/testData/results/TestInterfaceSuper.dec
new file mode 100644
index 0000000..a5567e2
--- /dev/null
+++ b/testData/results/TestInterfaceSuper.dec
@@ -0,0 +1,30 @@
+package pkg;
+
+public interface TestInterfaceSuper {
+   default void defaultMethod() {
+   }// 4
+
+   public static class Impl implements TestInterfaceSuper {
+      public void defaultMethod() {
+         TestInterfaceSuper.super.defaultMethod();// 8
+      }// 9
+   }
+}
+
+class 'pkg/TestInterfaceSuper' {
+   method 'defaultMethod ()V' {
+      0      4
+   }
+}
+
+class 'pkg/TestInterfaceSuper$Impl' {
+   method 'defaultMethod ()V' {
+      1      8
+      4      9
+   }
+}
+
+Lines mapping:
+4 <-> 5
+8 <-> 9
+9 <-> 10
diff --git a/testData/src/pkg/TestInterfaceSuper.java b/testData/src/pkg/TestInterfaceSuper.java
new file mode 100644
index 0000000..02f7527
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceSuper.java
@@ -0,0 +1,11 @@
+package pkg;
+
+public interface TestInterfaceSuper {
+  default void defaultMethod() {}
+
+  class Impl implements TestInterfaceSuper {
+    public void defaultMethod() {
+      TestInterfaceSuper.super.defaultMethod();
+    }
+  }
+}
\ No newline at end of file

From af80a017ae3c81a328f92ded8176a5a5eaee677c Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 28 Apr 2017 15:41:15 +0300
Subject: [PATCH 127/252] minor cleanup

---
 .../modules/decompiler/vars/VarVersionsProcessor.java       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
index 4544004..6300289 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
@@ -130,8 +130,7 @@ public class VarVersionsProcessor {
     Map<VarVersionPair, VarType> mapExprentMaxTypes = typeProcessor.getMapExprentMaxTypes();
     Map<VarVersionPair, VarType> mapExprentMinTypes = typeProcessor.getMapExprentMinTypes();
 
-    Set<VarVersionPair> set = new HashSet<>(mapExprentMinTypes.keySet());
-    for (VarVersionPair paar : set) {
+    for (VarVersionPair paar : new ArrayList<>(mapExprentMinTypes.keySet())) {
       VarType type = mapExprentMinTypes.get(paar);
       VarType maxType = mapExprentMaxTypes.get(paar);
 
@@ -238,8 +237,7 @@ public class VarVersionsProcessor {
     Map<Integer, Integer> mapOriginalVarIndices = new HashMap<>();
 
     // map var-version pairs on new var indexes
-    Set<VarVersionPair> set = new HashSet<>(mapExprentMinTypes.keySet());
-    for (VarVersionPair pair : set) {
+    for (VarVersionPair pair : new ArrayList<>(mapExprentMinTypes.keySet())) {
 
       if (pair.version >= 0) {
         int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);

From 6354fc121177d6e1b4138e7af0a4eba3ea50ac9f Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 28 Apr 2017 19:14:11 +0300
Subject: [PATCH 128/252] create less trash objects

---
 .../modules/decompiler/exps/Exprent.java      | 21 +++++++++++--------
 .../decompiler/vars/VarTypeProcessor.java     | 20 ++++++++++--------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index a530915..a786423 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,11 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.Set;
 
 public class Exprent implements IMatchable {
   public static final int MULTIPLE_USES = 1;
@@ -72,19 +75,19 @@ public class Exprent implements IMatchable {
   }
 
   public CheckTypesResult checkExprTypeBounds() {
-    return new CheckTypesResult();
+    return null;
   }
 
   public boolean containsExprent(Exprent exprent) {
-    List<Exprent> listTemp = new ArrayList<>(getAllExprents(true));
-    listTemp.add(this);
-
-    for (Exprent lstExpr : listTemp) {
-      if (lstExpr.equals(exprent)) {
+    if (equals(exprent)) {
+      return true;
+    }
+    List<Exprent> lst = getAllExprents();
+    for (int i = lst.size() - 1; i >= 0; i--) {
+      if (lst.get(i).containsExprent(exprent)) {
         return true;
       }
     }
-
     return false;
   }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
index a142eee..a96fc1b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -155,15 +155,17 @@ public class VarTypeProcessor {
 
     CheckTypesResult result = exprent.checkExprTypeBounds();
 
-    for (CheckTypesResult.ExprentTypePair entry : result.getLstMaxTypeExprents()) {
-      if (entry.type.typeFamily != CodeConstants.TYPE_FAMILY_OBJECT) {
-        changeExprentType(entry.exprent, entry.type, 1);
-      }
-    }
-
     boolean res = true;
-    for (CheckTypesResult.ExprentTypePair entry : result.getLstMinTypeExprents()) {
-      res &= changeExprentType(entry.exprent, entry.type, 0);
+    if (result != null) {
+      for (CheckTypesResult.ExprentTypePair entry : result.getLstMaxTypeExprents()) {
+        if (entry.type.typeFamily != CodeConstants.TYPE_FAMILY_OBJECT) {
+          changeExprentType(entry.exprent, entry.type, 1);
+        }
+      }
+
+      for (CheckTypesResult.ExprentTypePair entry : result.getLstMinTypeExprents()) {
+        res &= changeExprentType(entry.exprent, entry.type, 0);
+      }
     }
 
     return res;

From 601cae8cf876421fb4e010a4d7f1a955e3bea1a2 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 3 May 2017 15:22:20 +0300
Subject: [PATCH 129/252] IDEA-149077 Default decompiler is chosen for several
 classes instead of Fernflower - fixes for IDEA-CR-20517

---
 src/org/jetbrains/java/decompiler/main/ClassWriter.java  | 9 +++++++--
 .../decompiler/main/decompiler/PrintStreamLogger.java    | 8 ++++----
 .../java/decompiler/main/extern/IFernflowerLogger.java   | 8 ++++++--
 .../java/decompiler/main/rels/ClassWrapper.java          | 4 +++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 59b744c..764b4d4 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -529,7 +529,9 @@ public class ClassWriter {
             buffer.append(root.toJava(indent, tracer));
           }
           catch (Throwable ex) {
-            DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.", ex);
+            DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.",
+                                                       IFernflowerLogger.Severity.WARN,
+                                                       ex);
             methodWrapper.decompiledWithErrors = true;
           }
         }
@@ -832,7 +834,10 @@ public class ClassWriter {
             buffer.append(code);
           }
           catch (Throwable ex) {
-            DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.", ex);
+            DecompilerContext.getLogger()
+              .writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.",
+                            IFernflowerLogger.Severity.WARN,
+                            ex);
             methodWrapper.decompiledWithErrors = true;
           }
         }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
index a201000..5ed82ed 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,9 @@ public class PrintStreamLogger extends IFernflowerLogger {
   }
 
   @Override
-  public void writeMessage(String message, Throwable t) {
-    if (accepts(Severity.ERROR)) {
-      writeMessage(message, Severity.ERROR);
+  public void writeMessage(String message, Severity severity, Throwable t) {
+    if (accepts(severity)) {
+      writeMessage(message, severity);
       t.printStackTrace(stream);
     }
   }
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
index db76c77..23d5c63 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,11 @@ public abstract class IFernflowerLogger {
 
   public abstract void writeMessage(String message, Severity severity);
 
-  public abstract void writeMessage(String message, Throwable t);
+  public abstract void writeMessage(String message, Severity severity, Throwable t);
+
+  public void writeMessage(String message, Throwable t) {
+    writeMessage(message, Severity.ERROR, t);
+  }
 
   public void startReadingClass(String className) { }
 
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index fdabfde..3a3346e 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -142,7 +142,9 @@ public class ClassWrapper {
         }
       }
       catch (Throwable ex) {
-        DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.", ex);
+        DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.",
+                                                   IFernflowerLogger.Severity.WARN,
+                                                   ex);
         isError = true;
       }
 

From e9ab081201669bd708e169d7b57c91ae9d306647 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 3 May 2017 19:19:38 +0300
Subject: [PATCH 130/252] speedup: cache zip files in fixture

---
 .../decompiler/DecompilerTestFixture.java     | 52 ++++++++++++++++---
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index df27781..2dbcce6 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -32,7 +32,7 @@ public class DecompilerTestFixture {
   private File testDataDir;
   private File tempDir;
   private File targetDir;
-  private ConsoleDecompiler decompiler;
+  private TestConsoleDecompiler decompiler;
 
   public void setUp(String... optionPairs) throws IOException {
     assertThat(optionPairs.length % 2).isEqualTo(0);
@@ -62,13 +62,14 @@ public class DecompilerTestFixture {
     for (int i = 0; i < optionPairs.length; i += 2) {
       options.put(optionPairs[i], optionPairs[i + 1]);
     }
-    decompiler = new ConsoleDecompiler(targetDir, options);
+    decompiler = new TestConsoleDecompiler(targetDir, options);
   }
 
   public void tearDown() {
     if (tempDir != null) {
       delete(tempDir);
     }
+    decompiler.close();
   }
 
   public File getTestDataDir() {
@@ -122,4 +123,43 @@ public class DecompilerTestFixture {
       throw new RuntimeException(e);
     }
   }
+
+  // cache zip files
+  private static class TestConsoleDecompiler extends ConsoleDecompiler {
+    private final HashMap<String, ZipFile> zipFiles = new HashMap<>();
+
+    public TestConsoleDecompiler(File destination, Map<String, Object> options) {
+      super(destination, options);
+    }
+
+    @Override
+    public byte[] getBytecode(String externalPath, String internalPath) throws IOException {
+      File file = new File(externalPath);
+      if (internalPath == null) {
+        return InterpreterUtil.getBytes(file);
+      }
+      else {
+        ZipFile archive = zipFiles.get(file.getName());
+        if (archive == null) {
+          archive = new ZipFile(file);
+          zipFiles.put(file.getName(), archive);
+        }
+        ZipEntry entry = archive.getEntry(internalPath);
+        if (entry == null) throw new IOException("Entry not found: " + internalPath);
+        return InterpreterUtil.getBytes(archive, entry);
+      }
+    }
+
+    void close() {
+      for (ZipFile file : zipFiles.values()) {
+        try {
+          file.close();
+        }
+        catch (IOException e) {
+          e.printStackTrace();
+        }
+      }
+      zipFiles.clear();
+    }
+  }
 }
\ No newline at end of file

From 1c0cad79c6b61b406635c6a09fad8877b8db4075 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 3 May 2017 19:28:21 +0300
Subject: [PATCH 131/252] minor optimization

---
 .../decompose/FastExtendedPostdominanceHelper.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
index f37aedc..9a4e046 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,8 +65,9 @@ public class FastExtendedPostdominanceHelper {
 
     filterOnDominance(filter);
 
-    HashMap<Integer, Set<Integer>> res = new HashMap<>();
-    for (Entry<Integer, FastFixedSet<Integer>> entry : mapExtPostdominators.entrySet()) {
+    Set<Entry<Integer, FastFixedSet<Integer>>> entries = mapExtPostdominators.entrySet();
+    HashMap<Integer, Set<Integer>> res = new HashMap<>(entries.size());
+    for (Entry<Integer, FastFixedSet<Integer>> entry : entries) {
       res.put(entry.getKey(), entry.getValue().toPlainSet());
     }
 
@@ -173,7 +174,7 @@ public class FastExtendedPostdominanceHelper {
           lstPredSets.add(setPred);
         }
 
-        for (Integer id : setReachability.toPlainSet()) {
+        for (Integer id : setReachability) {
 
           FastFixedSet<Integer> setReachabilityCopy = setReachability.getCopy();
 
@@ -245,7 +246,7 @@ public class FastExtendedPostdominanceHelper {
         Integer nodeid = node.id;
         FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
 
-        for (Integer id : setReachability.toPlainSet()) {
+        for (Integer id : setReachability) {
           mapExtPostdominators.get(id).add(nodeid);
         }
 

From 844177d33eca9995d492f76b57c022880c4624cb Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 4 May 2017 12:52:28 +0300
Subject: [PATCH 132/252] IDEA-127533 int field is displayed as char - show
 only reasonable ascii as chars

---
 .../modules/decompiler/exps/ConstExprent.java |  11 +++--
 testData/classes/pkg/TestPrimitives.class     | Bin 2825 -> 3083 bytes
 testData/results/TestPrimitives.dec           |  43 ++++++++++++++++++
 testData/src/pkg/TestPrimitives.java          |  11 +++++
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 9e89f6c..0f0e141 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -133,7 +133,7 @@ public class ConstExprent extends Exprent {
         String ret = CHAR_ESCAPES.get(val);
         if (ret == null) {
           char c = (char)val.intValue();
-          if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
+          if (isPrintableAscii(c) || !ascii && TextUtil.isPrintableUnicode(c)) {
             ret = String.valueOf(c);
           }
           else {
@@ -278,7 +278,7 @@ public class ConstExprent extends Exprent {
         //  buffer.append("\\\'");
         //  break;
         default:
-          if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
+          if (isPrintableAscii(c) || !ascii && TextUtil.isPrintableUnicode(c)) {
             buffer.append(c);
           }
           else {
@@ -371,7 +371,7 @@ public class ConstExprent extends Exprent {
     // BYTECHAR and SHORTCHAR => CHAR in the CHAR context
     if (expectedType.equals(VarType.VARTYPE_CHAR) &&
             (constType.equals(VarType.VARTYPE_BYTECHAR) || constType.equals(VarType.VARTYPE_SHORTCHAR))) {
-      if (getIntValue() != 0) {
+      if (isPrintableAscii(getIntValue())) {
         setConstType(VarType.VARTYPE_CHAR);
       }
     }
@@ -382,6 +382,11 @@ public class ConstExprent extends Exprent {
     }
   }
 
+  private static boolean isPrintableAscii(int c) {
+    return c >= 32 && c < 127;
+  }
+
+
   public Object getValue() {
     return value;
   }
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 74260de28c361a904942339b0eedadf93023d8b4..8ed2ef7df9feb5797be2caf784f8d49e36c09577 100644
GIT binary patch
delta 615
zcmYk2T}xC^6o#LD&KdV{dy)n!BD;{t$Si~?>Lwg2sEe$0Cd#qWGvm?HQO9wzw2$e#
z%*tx|F6~R`CX5ie=%ODG^dtHW-A1(+k-FKu`+3(|d+)^>Uoo+=^zHYTufP`G8sZ!`
ztfNDuQzR70#B5&HS#epfX(~S>)K$^+b9UL-k3F;EB9ZP&dN|>8QqwEG&yb^EXuz<R
zL7}{1h=S0tp}37xh7nF1&M@jT=F2bVIPY`8P~xKD5|@3h7_M?nb6uXfp}G0#^E*|i
zvxEKlun;M{^}FiR3bzmqE0!dSVYaV1%%{RkE-D{(S}Vo_ZZT2*=rojW2i)Oqz(HDs
zCIebYYVL`-ACTgZ=7E^9=3&4i9&4TiJms0fsmq9TX`V~P3o+fAmtv+g({jF&U{>>5
z%o{~@Z#WV*=E8xV#+{?ZXs*rO>ZthKWNau_ayUX8ih4WU?>M;jOx8FvXzx9qyQ5}$
zp1g(N(r^){7jbEU<NTR7t3TLhT{c)<gKxE&D)zIS=m52L4jXA<yPd*rl9p05*pk|R
vz1Z9)>ugu-v)7cpxR*4WZLjS%x{B(`g!+ZA63T-4zpE0;)*iJL4#)li@+fc(

delta 357
zcmWlV%PvDf7=XWXs5zaS2#JUXz{a8*V%fyTwr+_#M{iVBOWj(u?&?n6sSWEU(xeLu
z58wgpJ%hdIKZ|d^Z|2V|=C~=>nECqq_ypQ{(bO}nX=Ow(Di{-tyDImx(oz%E-a`CM
zY_i7tTWm=EbQh%@!IT?60gIp_BpudFGb0w!G&3s})yxqSo7coUNoW>W)FfH5ShiTv
ztg>d2(xh3}Y_MsO(PY_DY|Aq{irx3}tC7!|zM4IoeGc;9W?SaaCdZMDj~=mOn_l`9
zClaSN{R}A1B+eBVHkVu}@;2Ap7?>?nf`H;yChjCcihGF%#iQ&`a_Cn)OB4)hBhIqp
fi8`^cr)w=4EM==YOrx$;b|qYHgTcy=nGF2{ir7e+

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 03026fa..d6fcbc4 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -69,6 +69,17 @@ public class TestPrimitives {
    public void constructor() {
       new Byte((byte)1);// 73
    }// 74
+
+   private boolean compare(char c) {
+      boolean res = c > -1;// 77
+      res = c > 0;// 78
+      res = c > 1;// 79
+      res = c > 'a';// 80
+      res = c > 'Z';// 81
+      res = c > 127;// 82
+      res = c > 255;// 83
+      return res;// 84
+   }
 }
 
 class 'pkg/TestPrimitives' {
@@ -210,6 +221,30 @@ class 'pkg/TestPrimitives' {
       4      69
       9      70
    }
+
+   method 'compare (C)Z' {
+      1      73
+      2      73
+      a      73
+      c      74
+      14      74
+      16      75
+      17      75
+      1f      75
+      21      76
+      23      76
+      2b      76
+      2d      77
+      2f      77
+      37      77
+      39      78
+      3b      78
+      43      78
+      45      79
+      48      79
+      50      79
+      52      80
+   }
 }
 
 Lines mapping:
@@ -248,3 +283,11 @@ Lines mapping:
 70 <-> 67
 73 <-> 70
 74 <-> 71
+77 <-> 74
+78 <-> 75
+79 <-> 76
+80 <-> 77
+81 <-> 78
+82 <-> 79
+83 <-> 80
+84 <-> 81
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 68b6c44..b4aa878 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -72,4 +72,15 @@ public class TestPrimitives {
   public void constructor() {
     new Byte((byte)1);
   }
+
+  private boolean compare(char c) {
+    boolean res = (c > -1);
+    res = (c > 0);
+    res = (c > 1);
+    res = (c > 'a');
+    res = (c > 'Z');
+    res = (c > 127);
+    res = (c > 255);
+    return res;
+  }
 }

From bbc76e7cb4bd119930852f31f8e4b08eb0c2dd7d Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 4 May 2017 14:40:09 +0300
Subject: [PATCH 133/252] IDEA-127533 int field is displayed as char - show \n
 etc as chars

---
 .../modules/decompiler/exps/ConstExprent.java |   3 +-
 testData/classes/pkg/TestPrimitives.class     | Bin 3083 -> 3197 bytes
 testData/results/TestPrimitives.dec           |  46 +++++++++++++++---
 testData/src/pkg/TestPrimitives.java          |   6 +++
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 0f0e141..612fd37 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -371,7 +371,8 @@ public class ConstExprent extends Exprent {
     // BYTECHAR and SHORTCHAR => CHAR in the CHAR context
     if (expectedType.equals(VarType.VARTYPE_CHAR) &&
             (constType.equals(VarType.VARTYPE_BYTECHAR) || constType.equals(VarType.VARTYPE_SHORTCHAR))) {
-      if (isPrintableAscii(getIntValue())) {
+      int intValue = getIntValue();
+      if (isPrintableAscii(intValue) || CHAR_ESCAPES.containsKey(intValue)) {
         setConstType(VarType.VARTYPE_CHAR);
       }
     }
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 8ed2ef7df9feb5797be2caf784f8d49e36c09577..be15ee5f11867ff023c89f26814bcbc4985d2194 100644
GIT binary patch
delta 222
zcmeB{_$#r&h?|Sio`H#hnSp^}_GBAwC0mXq4D2k+8CaNYr3E;V*jz|#9was|5?f(%
zFt;nS6$9Vo+1#?V0SqAwF$|#$84O_zB@E#V4Ga+sJq(cyGZ~^7w1M_1Kx}2uVbBHg
zfc7)^F!(YsGH^3Y0IDzox+)qds>2|~>A?7hfrHV35y;@ejkp~cfx2UWdYBku0TiGh
Ao&W#<

delta 142
zcmew>(JisTh?|SyECUk*GXn!d@MIfqrOC^<t%{WxIDmX#25tsF22loo1_g!y1|5b#
z1`CED1{a24AS;AH8>m77q7Nvi3*-S!VDJIzVg%~*V2ENc0-75Q6qRD&<8)yB!@$Al
VzzAe;!4S6tBT#J&Pz4i1ECAu<5w`#U

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index d6fcbc4..eae376a 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -74,11 +74,17 @@ public class TestPrimitives {
       boolean res = c > -1;// 77
       res = c > 0;// 78
       res = c > 1;// 79
-      res = c > 'a';// 80
-      res = c > 'Z';// 81
-      res = c > 127;// 82
-      res = c > 255;// 83
-      return res;// 84
+      res = c > '\b';// 80
+      res = c > '\t';// 81
+      res = c > '\n';// 82
+      res = c > '\f';// 83
+      res = c > '\r';// 84
+      res = c > ' ';// 85
+      res = c > 'a';// 86
+      res = c > 'Z';// 87
+      res = c > 127;// 88
+      res = c > 255;// 89
+      return res;// 90
    }
 }
 
@@ -241,9 +247,27 @@ class 'pkg/TestPrimitives' {
       3b      78
       43      78
       45      79
-      48      79
-      50      79
-      52      80
+      47      79
+      4f      79
+      51      80
+      53      80
+      5b      80
+      5d      81
+      5f      81
+      67      81
+      69      82
+      6b      82
+      73      82
+      75      83
+      77      83
+      7f      83
+      81      84
+      83      84
+      8b      84
+      8d      85
+      90      85
+      98      85
+      9a      86
    }
 }
 
@@ -291,3 +315,9 @@ Lines mapping:
 82 <-> 79
 83 <-> 80
 84 <-> 81
+85 <-> 82
+86 <-> 83
+87 <-> 84
+88 <-> 85
+89 <-> 86
+90 <-> 87
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index b4aa878..39041ef 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -77,6 +77,12 @@ public class TestPrimitives {
     boolean res = (c > -1);
     res = (c > 0);
     res = (c > 1);
+    res = (c > '\b');
+    res = (c > '\t');
+    res = (c > '\n');
+    res = (c > '\f');
+    res = (c > '\r');
+    res = (c > ' ');
     res = (c > 'a');
     res = (c > 'Z');
     res = (c > 127);

From 17d489484894a0e4f00e61eec1e606f891ca3e29 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 5 May 2017 13:10:53 +0300
Subject: [PATCH 134/252] IDEA-172200 Decompiler switch-on-enum multiple
 switches in same class generates wrong cases for all but the first
 switch-on-enum

---
 .../modules/decompiler/SwitchHelper.java      |   5 +-
 testData/classes/pkg/TestSwitchOnEnum$1.class | Bin 700 -> 1346 bytes
 .../pkg/TestSwitchOnEnum$Example$A.class      | Bin 0 -> 1103 bytes
 .../pkg/TestSwitchOnEnum$Example$B.class      | Bin 0 -> 1103 bytes
 .../pkg/TestSwitchOnEnum$Example.class        | Bin 0 -> 1204 bytes
 testData/classes/pkg/TestSwitchOnEnum.class   | Bin 711 -> 763 bytes
 testData/results/TestSwitchOnEnum.dec         |  62 ++++++++++++++++++
 testData/src/pkg/TestSwitchOnEnum.java        |  26 ++++++++
 8 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 testData/classes/pkg/TestSwitchOnEnum$Example$A.class
 create mode 100644 testData/classes/pkg/TestSwitchOnEnum$Example$B.class
 create mode 100644 testData/classes/pkg/TestSwitchOnEnum$Example.class

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
index 01d56e2..cf935f4 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
@@ -37,8 +37,9 @@ public class SwitchHelper {
       List<List<Exprent>> caseValues = switchStatement.getCaseValues();
       Map<Exprent, Exprent> mapping = new HashMap<>(caseValues.size());
       ArrayExprent array = (ArrayExprent)value;
+      FieldExprent arrayField = (FieldExprent)array.getArray();
       ClassesProcessor.ClassNode classNode =
-        DecompilerContext.getClassProcessor().getMapRootClasses().get(((FieldExprent)array.getArray()).getClassname());
+        DecompilerContext.getClassProcessor().getMapRootClasses().get(arrayField.getClassname());
       if (classNode != null) {
         MethodWrapper wrapper = classNode.getWrapper().getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
         if (wrapper != null) {
@@ -48,7 +49,7 @@ public class SwitchHelper {
               if (exprent instanceof AssignmentExprent) {
                 AssignmentExprent assignment = (AssignmentExprent)exprent;
                 Exprent left = assignment.getLeft();
-                if (isEnumArray(left)) {
+                if (left.type == Exprent.EXPRENT_ARRAY && ((ArrayExprent)left).getArray().equals(arrayField)) {
                   mapping.put(assignment.getRight(), ((InvocationExprent)((ArrayExprent)left).getIndex()).getInstance());
                 }
               }
diff --git a/testData/classes/pkg/TestSwitchOnEnum$1.class b/testData/classes/pkg/TestSwitchOnEnum$1.class
index aebc1c568ce9e3d2e92dc364bfca59486d4c7ff1..6c54901212381a045f0240ca9a4b318e49065185 100644
GIT binary patch
literal 1346
zcmb7EYflqF6g|@xmexfI@~Fs5Sb6xMfG8>mw53&~kHjK;;L~=y!oqeJw=MdQ{46Gf
z7{d?n_xRa(W_cMxXiR4I-ZOLV%$+-D_Sc^uCje%Vk6;)hVYEXF(|aJ{sDd#G#v_=(
zLpk>-Oz*LTqtbg4!6f2xVk%5;T0%}tVn)GJ1<wS=wc=;1X6)qjeQj4i(6xHavNgkX
zjJoHUPEA|4D&_~rstE+PRs|;h;qUKlYwKpUcDh2rNjvq5mj0qw_H9#3{0BEF(6V6I
z7Pnax2#!x|2!v8@*%WBYT8^2oS4yV0u9s|%bYxvaw>NaplK5<}wOG@QJs!fxEQ>&-
z=+-^M%vdt0>uR2p@~~V!?HIOOwVdsoS=({T3Z5%?p<*5jD!S3B;x!gkEMZxoSBAuG
z-Pw-k-D2I?$ylacPJ5o~sYqZ^K~e^;sOXY`X=GHqK}Nw_IlQXkjvRi6H5FN`33Ri5
z@vC`h(*o+M<CtE`)~i*sDiFQgw@}(O4PHg(b)gD!0t460TwDqZt(;wufFNo<(Cxb1
zWMq6|D|>V7JSC81dP9wQitCjvN4NdUq-p}mnMSEmFM_>s9toL8qH!LlJnq}?*H7v?
zeyQvDrLKqN(Qo8%M>V&adS57}Q-%CWQDCrPfO5g@yQ!?vAwJFyzVKi)CIte}Qa`?>
z06D|QfgZ$Y?-Kn+kREVw3~}-^@*ROg*@8z1g$iF0TJvEuVUrJ!q4>0xL$HO95ILt2
z-Xc7wsXnds5Nx-P&~{EEj1r#GzM&amX4QixW;B9P+9|4gk#>pN&e3k71e5k7KA}b%
zL@)EbO$+kJFn~PKJ)!`6ANvs0O$GhP$<M|$9%Bc5{vf$P2>1D&Wgn*BPK#&@<~aJ2
RwHl`PYB|Q=-yBlQvA;4lLv{cF

delta 287
zcmW-b%`QVx6otQY|4#39)b-Q$YSC&{Zxa(@fLViq0UdN8CgdgzNJBz+2gBw(iK&Qz
zp(io*0%D&I*4}Gnt^M<re1u!yfA62bF8zcmwHQqn3tM)wu4y>2qFL26Czm^upP_2l
zJ++^;H0y>o9YaiF*r03Jq-S4MGs@{Is&?C}*k5&E2Yy>eFU9!z=E)ZR#o*!b`u4sU
zEBw5FqR^w`!{OP{C~e90l6<4m%q?|H^bAJ&tf)JDVUXK;(7SrWlhhJ5LNYpXJQTky
nel$&$nG@~_Qh^~j*UWS3isTli-lEJyKt<}BAdyKeowW219(^G0

diff --git a/testData/classes/pkg/TestSwitchOnEnum$Example$A.class b/testData/classes/pkg/TestSwitchOnEnum$Example$A.class
new file mode 100644
index 0000000000000000000000000000000000000000..7bd4f3d2b9586271b468ca4e812f8a44faa82cb7
GIT binary patch
literal 1103
zcma)4?{Csj6g`g?3SIZZ4(33dn?nWWV4F-oKo-cdB}<5W=p<SE^r)3}ma>#G{j-!M
z&S*6I>>p*kuOkk08NMd(NAJ1koO|E<`RnTs042PLK}J?Z4tWI$1#2oaJQdS=6w@jN
z*9D>w#k^RH3N{!*wM_+E49eaI-Z^zF2JOIgEpON1y`I%$U^Ry2`surN@zCn|#(Ud0
zj~niu+wWwCDVbVX@CcGjvsQn#XE3b1o}3an<4#{ltY&ln0hf2XZ^+(k-FB^){Z7mB
z4tYx$Rsx>JTZU4$e!|aq(cx~pX!xG(w#&K6M)Z2u<W7@&wjdm`$}aB^x&ALBL!@H6
zw!g!$aD(7MuE`+#$2L_KGwim@{k}&`QdR__71J3eZ;eokepV(q-Jw3KMz`;o*1jz&
zPyBr)1yR0+xVZj=hG!@-EZu&08dBKS@BqsirlD(?ht4o_-A7?f!E=W6ZA1)V)9Jco
zDxS@a6xL{+Sf)?Lw?|tQysq*H?9XM5>r!6)Ce`W&Jz$Mqy;MyK*8r_#9GFXq>M0^4
zh6UUO!y=s?(kg~J0Q-#4C8UpZVo1^)31UgYr*LnGFCi5CRdqT41>sA`0v{T~r|FM&
zg~EL-1#xO4p@iZlB>Dg)zm~p0<WmqHmAg(?up+FJNg=U{C^9r(8Q-Tu#3+1&e55PV
z1)}GO1qW3Q4pZUp6p{w?*pB1@ri^nip*CKeG-Q8-#}o_U3Fc_kX*WYwXGv40-JR;<
EZ{}L@82|tP

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSwitchOnEnum$Example$B.class b/testData/classes/pkg/TestSwitchOnEnum$Example$B.class
new file mode 100644
index 0000000000000000000000000000000000000000..ab8f77d2bf1930b779c22975b56f221d65d9d38e
GIT binary patch
literal 1103
zcma)4?@!ZE6g_Y4)~%EumJMM{1ev-G*#L)r*h1#WNJtj<p}2(jsjGDqyEoEx=%1w{
z5u?%Y*+0s7Us+@*VZJ8sNAJ1koO|E<`RnTs07X2HK}JSJ7C8k81#2oaJQ34+6q70i
z*99UU#jIEh3N{!*)lCIk3`*^T**S4-25p~n+uL=`UeE3^uqwlH{p4M{aA5a*<Gtfs
zM-5)%{Z4wAlCG8nk041mU({dK42G50<5ME1rrQ@1tC{S7z~$ZU8?rZDcewqs-)Y(2
zf!Pv<m4K)5mZ6xbADgFU!8LiiVECTH+okMyBYM4SnQqhc96>l_mATm=a{XUMhDh1r
zj=#e&cZ1-5w#gv-M-EjMGn_Uz{k}&`Qbq)#Wy>8VZ;eokewN2M-Jw3KMz`--_MRgu
zPyBr)c~QQGxVZj=hNmbpEZu&08j{%7a39MWCZTJXh0ZW_)kk4X!83-`ZA1)V%k6S9
z70+Zx3Tw2EZObR)+oP=tURP-Z_UE#$>r!6)Ce_LYJz$Mqy;NBct^r!fI53kG)l)=9
z40E^(hIu+Ypj8ZY0QMQ73rHX7#IQhfB#12%K8eL4zKBrpSJma*7lbb$3w-DrK1F}D
zOBC*5DTq@W2_+OaA<+jYxwX_eBA<frsN7Y$f)!z%ObUrrM3JWX()b<~B1Zlj<U?JN
z&JjIBEI6ogaF_^xr;s$D$95<WFkzg53AO9RNkjIBcto)f9%F`9opw`Xb(%C~+TE$l
F{{{)u@hSiS

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSwitchOnEnum$Example.class b/testData/classes/pkg/TestSwitchOnEnum$Example.class
new file mode 100644
index 0000000000000000000000000000000000000000..dbcba7ec75f9f57845c5f1190c64a9abd00dbc7f
GIT binary patch
literal 1204
zcma)6T~8BH5Iwgo-R-hS<wHObD=yGNZ3R)$BG5LNkW?`#Att_fTQ;z;-8S2;AHT>4
zpX31(AN&FS0)LJ1+-+4tNVQ4t%-oqX_sq=Q`~BzFZva+NHZTM$fjP_@7{NjUX=HRP
z8dySB$6e*g8AxJ5M_$K04J#V%3uxQ#WuxWV0_KkA*?!rT?Y7<4uqq%*8Xiy-1>)<D
z=L8!9(R5~CAXaW35HehGJo`nbQM3I$SyM?yD$Tld_oeSBySEt&j-0l@Or>>lnBTM8
zLG_&z)Q@((ZLia?dISp08qg<DPWKJ8iiQ6EQbAD^QXthou*fq-?Vn*Kh7DB%SwDF$
zTfLHuYO~|l?PrcEdi-KdxnucOni#{lhKD8|Va>#2Jkd}vv5uz#k>aw34HKK#QpSpj
zBG#ytmes<^lmw>xbxR<r&d9scJIwFaj_o=dH`5PcF=hV%j``Z98AvK)b!Wy7Sd6hQ
zR{VR47L!C?@9<tV{R797Zg^v8pQBs-&<^Yd9nB6&k5|G%oM!%|?|4Bq@NL;($44*O
zX4;ktay{bGU0~P&q8#rqocn(>Wk1F)D;Fu4{Fc-&!as)yHilZBQcw;oeu4NLx+l2C
z!_5gyQa8H+n8I~hzzs}uM}dDZS(MT}MP%s=(cCBHS4q3asKnDfec=?bk%2SBKVnd+
z8r4(i*)t?USoR!ds;65j(D;iPq^dYZp*YSX!F2`}i_79RPrbuiIgeL-CEg%|I$wzs
z<iZ+KU7mkxaB-7J#m~hp;v>WZI^ve0r3{VsEbRz04pYt|#x5-53L}!#u5L~8IWjRy
JIY&Q|`Y-k_4vqi-

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSwitchOnEnum.class b/testData/classes/pkg/TestSwitchOnEnum.class
index 3117de8c4e21e479f4230977e7c9643f5d5f107e..f7c13a2596df74ff06741e4cb5a8a44c1403835e 100644
GIT binary patch
delta 287
zcmXYq%Syvg5Qe{rCMS)jZLF7iX}v~;Zi-Oc2yP^x8(ruN6bULeA()E#7?LM(CAe@a
z_&%-#aaz0iZ}ZR0r~Bg`ef_?F06q2sTvjT0tOm4b8`cc#h7G}<W?6E7Jm?oiQW!P`
z6F>FSe2~2Ce}|T;Ws7Y?WZ7Z2Jdn8E%I~hbmq{_ac)T56-JEA}_K-%Ct@2sYvw#`>
z>!9bUD%R9>l||X@ydkgSab3|Hhd!Zd`(I#|hB{%6dBs}Ua}K3m=1%iu)LPWT(3!MG
fYC$uhsj16UB%*~SH4e)d<%TLxnb5~)nhO3OxEUqE

delta 261
zcmXYqy-osA6okLCdiO5N6%kha7sZV+6dDpb6B;TTYeS_4m4+DiNz6WkwUvnltqJdA
zMPeLQo0&6bX3kl<FE?2He9nO(d5UAVM$BHyJ_nvd&ynZY2sg9Y^kw|?P!!YRb@bg%
zsRz28cuoU7&Wx;lwyd1kW%*{0w+S`fj4+fG2B|BtiCzB#d#~&bVO%W}8k)mjfK8fG
z#uhDMDDR`|yH&Quy0Aem|6J;Vtm<|23i|)O)zp?_Y-{US%gq$%NJQ-5#i`6#Of&ff
D?kO0j

diff --git a/testData/results/TestSwitchOnEnum.dec b/testData/results/TestSwitchOnEnum.dec
index 33b0464..b6984c3 100644
--- a/testData/results/TestSwitchOnEnum.dec
+++ b/testData/results/TestSwitchOnEnum.dec
@@ -15,6 +15,37 @@ public class TestSwitchOnEnum {
          return 0;// 20
       }
    }
+
+   static class Example {
+      void test(TestSwitchOnEnum.Example.A a, TestSwitchOnEnum.Example.B b) {
+         switch(a) {// 30
+         case A1:
+            System.out.println("A1");// 32
+            break;// 33
+         case A2:
+            System.out.println("A2");// 35
+         }
+
+         switch(b) {// 38
+         case B1:
+            System.out.println("B1");// 40
+            break;// 41
+         case B2:
+            System.out.println("B2");// 43
+         }
+
+      }// 46
+
+      static enum B {
+         B1,
+         B2;
+      }
+
+      static enum A {
+         A1,
+         A2;
+      }
+   }
 }
 
 class 'pkg/TestSwitchOnEnum' {
@@ -29,8 +60,39 @@ class 'pkg/TestSwitchOnEnum' {
    }
 }
 
+class 'pkg/TestSwitchOnEnum$Example' {
+   method 'test (Lpkg/TestSwitchOnEnum$Example$A;Lpkg/TestSwitchOnEnum$Example$B;)V' {
+      8      20
+      24      22
+      27      22
+      29      22
+      2c      23
+      2f      25
+      32      25
+      34      25
+      3f      28
+      58      30
+      5b      30
+      5d      30
+      60      31
+      63      33
+      66      33
+      68      33
+      6b      36
+   }
+}
+
 Lines mapping:
 14 <-> 9
 16 <-> 11
 18 <-> 13
 20 <-> 15
+30 <-> 21
+32 <-> 23
+33 <-> 24
+35 <-> 26
+38 <-> 29
+40 <-> 31
+41 <-> 32
+43 <-> 34
+46 <-> 37
diff --git a/testData/src/pkg/TestSwitchOnEnum.java b/testData/src/pkg/TestSwitchOnEnum.java
index e26d407..0ea59ec 100644
--- a/testData/src/pkg/TestSwitchOnEnum.java
+++ b/testData/src/pkg/TestSwitchOnEnum.java
@@ -19,4 +19,30 @@ public class TestSwitchOnEnum {
     }
     return 0;
   }
+
+  static class Example {
+
+    enum A { A1, A2}
+
+    enum B { B1, B2}
+
+    void test(A a, B b){
+      switch (a){
+        case A1:
+          System.out.println("A1");
+          break;
+        case A2:
+          System.out.println("A2");
+          break;
+      }
+      switch (b){
+        case B1:
+          System.out.println("B1");
+          break;
+        case B2:
+          System.out.println("B2");
+          break;
+      }
+    }
+  }
 }

From 4da62061d98f3fee980af8b2ea977cb8f8171a7e Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 5 May 2017 16:06:56 +0300
Subject: [PATCH 135/252] do not fail on clinit decompile error

---
 .../java/decompiler/modules/decompiler/SwitchHelper.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
index cf935f4..6bf5975 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
@@ -42,7 +42,7 @@ public class SwitchHelper {
         DecompilerContext.getClassProcessor().getMapRootClasses().get(arrayField.getClassname());
       if (classNode != null) {
         MethodWrapper wrapper = classNode.getWrapper().getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
-        if (wrapper != null) {
+        if (wrapper != null && wrapper.root != null) {
           wrapper.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
             @Override
             public int processExprent(Exprent exprent) {

From 1f0d42ba0d328f34ce2efe786ad15b08f41c23f5 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 10 May 2017 17:01:04 +0300
Subject: [PATCH 136/252] stabilize tests

---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index da6e145..8fccd04 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -404,7 +404,7 @@ public class ControlFlowGraph implements CodeConstants {
 
   private void setSubroutineEdges() {
 
-    final Map<BasicBlock, BasicBlock> subroutines = new HashMap<>();
+    final Map<BasicBlock, BasicBlock> subroutines = new LinkedHashMap<>();
 
     for (BasicBlock block : blocks) {
 

From adbf29f8ce902cd164fc0c41491030268ecc8265 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 10 May 2017 17:02:31 +0300
Subject: [PATCH 137/252] IDEA-149077 Default decompiler is chosen for several
 classes instead of Fernflower - tests

---
 .../decompiler/BulkDecompilationTest.java     |   18 +-
 testData/obfuscated.jar                       |  Bin 0 -> 67514 bytes
 testData/obfuscated/a.java                    |   39 +
 testData/obfuscated/a0.java                   |   18 +
 testData/obfuscated/a1.java                   |   91 +
 testData/obfuscated/a2.java                   |   93 +
 testData/obfuscated/a3.java                   | 2068 ++++
 testData/obfuscated/a4.java                   |  164 +
 testData/obfuscated/a5.java                   |  921 ++
 testData/obfuscated/a6.java                   |    5 +
 testData/obfuscated/a7.java                   |  139 +
 testData/obfuscated/a8.java                   |  405 +
 testData/obfuscated/a9.java                   |   15 +
 testData/obfuscated/a_.java                   |    8 +
 testData/obfuscated/aa.java                   |   10 +
 testData/obfuscated/ab.java                   |   43 +
 testData/obfuscated/ac.java                   |    3 +
 testData/obfuscated/ad.java                   |    3 +
 testData/obfuscated/ae.java                   |   51 +
 testData/obfuscated/af.java                   |    3 +
 testData/obfuscated/ag.java                   |   32 +
 testData/obfuscated/ah.java                   |   28 +
 testData/obfuscated/ai.java                   |   39 +
 testData/obfuscated/aj.java                   | 8595 +++++++++++++++++
 testData/obfuscated/ak.java                   |   11 +
 testData/obfuscated/al.java                   |  459 +
 testData/obfuscated/am.java                   |    3 +
 testData/obfuscated/an.java                   | 1057 ++
 testData/obfuscated/ao.java                   |   25 +
 testData/obfuscated/ap.java                   |   91 +
 testData/obfuscated/aq.java                   |   29 +
 testData/obfuscated/ar.java                   |   22 +
 testData/obfuscated/as.java                   |   49 +
 testData/obfuscated/at.java                   |   81 +
 testData/obfuscated/au.java                   |   24 +
 testData/obfuscated/av.java                   |   24 +
 testData/obfuscated/aw.java                   |  361 +
 testData/obfuscated/ax.java                   |  172 +
 testData/obfuscated/ay.java                   |    3 +
 testData/obfuscated/az.java                   |  205 +
 testData/obfuscated/b.java                    |   99 +
 testData/obfuscated/ba.java                   |  177 +
 testData/obfuscated/bb.java                   |  904 ++
 testData/obfuscated/bc.java                   |  159 +
 testData/obfuscated/bd.java                   |  349 +
 testData/obfuscated/c.java                    |    8 +
 testData/obfuscated/d.java                    |   39 +
 testData/obfuscated/e.java                    |  148 +
 testData/obfuscated/f.java                    |    3 +
 testData/obfuscated/g.java                    |    3 +
 testData/obfuscated/h.java                    |   50 +
 testData/obfuscated/i.java                    |   18 +
 testData/obfuscated/j.java                    |   36 +
 testData/obfuscated/k.java                    |    7 +
 testData/obfuscated/l.java                    |   19 +
 testData/obfuscated/m.java                    |   19 +
 testData/obfuscated/n.java                    |  209 +
 testData/obfuscated/o.java                    |  461 +
 testData/obfuscated/p.java                    | 1047 ++
 testData/obfuscated/q.java                    |    3 +
 testData/obfuscated/r.java                    |  172 +
 testData/obfuscated/s.java                    |  937 ++
 testData/obfuscated/u.java                    |    5 +
 testData/obfuscated/v.java                    |  379 +
 testData/obfuscated/w.java                    |    9 +
 testData/obfuscated/x.java                    |   10 +
 testData/obfuscated/y.java                    |   18 +
 testData/obfuscated/z.java                    |   22 +
 68 files changed, 20713 insertions(+), 4 deletions(-)
 create mode 100644 testData/obfuscated.jar
 create mode 100644 testData/obfuscated/a.java
 create mode 100644 testData/obfuscated/a0.java
 create mode 100644 testData/obfuscated/a1.java
 create mode 100644 testData/obfuscated/a2.java
 create mode 100644 testData/obfuscated/a3.java
 create mode 100644 testData/obfuscated/a4.java
 create mode 100644 testData/obfuscated/a5.java
 create mode 100644 testData/obfuscated/a6.java
 create mode 100644 testData/obfuscated/a7.java
 create mode 100644 testData/obfuscated/a8.java
 create mode 100644 testData/obfuscated/a9.java
 create mode 100644 testData/obfuscated/a_.java
 create mode 100644 testData/obfuscated/aa.java
 create mode 100644 testData/obfuscated/ab.java
 create mode 100644 testData/obfuscated/ac.java
 create mode 100644 testData/obfuscated/ad.java
 create mode 100644 testData/obfuscated/ae.java
 create mode 100644 testData/obfuscated/af.java
 create mode 100644 testData/obfuscated/ag.java
 create mode 100644 testData/obfuscated/ah.java
 create mode 100644 testData/obfuscated/ai.java
 create mode 100644 testData/obfuscated/aj.java
 create mode 100644 testData/obfuscated/ak.java
 create mode 100644 testData/obfuscated/al.java
 create mode 100644 testData/obfuscated/am.java
 create mode 100644 testData/obfuscated/an.java
 create mode 100644 testData/obfuscated/ao.java
 create mode 100644 testData/obfuscated/ap.java
 create mode 100644 testData/obfuscated/aq.java
 create mode 100644 testData/obfuscated/ar.java
 create mode 100644 testData/obfuscated/as.java
 create mode 100644 testData/obfuscated/at.java
 create mode 100644 testData/obfuscated/au.java
 create mode 100644 testData/obfuscated/av.java
 create mode 100644 testData/obfuscated/aw.java
 create mode 100644 testData/obfuscated/ax.java
 create mode 100644 testData/obfuscated/ay.java
 create mode 100644 testData/obfuscated/az.java
 create mode 100644 testData/obfuscated/b.java
 create mode 100644 testData/obfuscated/ba.java
 create mode 100644 testData/obfuscated/bb.java
 create mode 100644 testData/obfuscated/bc.java
 create mode 100644 testData/obfuscated/bd.java
 create mode 100644 testData/obfuscated/c.java
 create mode 100644 testData/obfuscated/d.java
 create mode 100644 testData/obfuscated/e.java
 create mode 100644 testData/obfuscated/f.java
 create mode 100644 testData/obfuscated/g.java
 create mode 100644 testData/obfuscated/h.java
 create mode 100644 testData/obfuscated/i.java
 create mode 100644 testData/obfuscated/j.java
 create mode 100644 testData/obfuscated/k.java
 create mode 100644 testData/obfuscated/l.java
 create mode 100644 testData/obfuscated/m.java
 create mode 100644 testData/obfuscated/n.java
 create mode 100644 testData/obfuscated/o.java
 create mode 100644 testData/obfuscated/p.java
 create mode 100644 testData/obfuscated/q.java
 create mode 100644 testData/obfuscated/r.java
 create mode 100644 testData/obfuscated/s.java
 create mode 100644 testData/obfuscated/u.java
 create mode 100644 testData/obfuscated/v.java
 create mode 100644 testData/obfuscated/w.java
 create mode 100644 testData/obfuscated/x.java
 create mode 100644 testData/obfuscated/y.java
 create mode 100644 testData/obfuscated/z.java

diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
index 7837905..4e2fda3 100644
--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+++ b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,14 +58,24 @@ public class BulkDecompilationTest {
 
   @Test
   public void testJar() {
+    doTestJar("bulk");
+  }
+
+  @Test
+  public void testObfuscated() {
+    doTestJar("obfuscated");
+  }
+
+  private void doTestJar(String name) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
-    decompiler.addSpace(new File(fixture.getTestDataDir(), "bulk.jar"), true);
+    String jarName = name + ".jar";
+    decompiler.addSpace(new File(fixture.getTestDataDir(), jarName), true);
     decompiler.decompileContext();
 
     File unpacked = new File(fixture.getTempDir(), "unpacked");
-    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
+    unpack(new File(fixture.getTargetDir(), jarName), unpacked);
 
-    assertFilesEqual(new File(fixture.getTestDataDir(), "bulk"), unpacked);
+    assertFilesEqual(new File(fixture.getTestDataDir(), name), unpacked);
   }
 
   private static void unpack(File archive, File targetDir) {
diff --git a/testData/obfuscated.jar b/testData/obfuscated.jar
new file mode 100644
index 0000000000000000000000000000000000000000..df97fb57d3b6daaacb16581b3de28f31f8babe1a
GIT binary patch
literal 67514
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
Q{+oUQ0WtZ%+i!^f1A1tKF#rGn

literal 0
HcmV?d00001

diff --git a/testData/obfuscated/a.java b/testData/obfuscated/a.java
new file mode 100644
index 0000000..c075f89
--- /dev/null
+++ b/testData/obfuscated/a.java
@@ -0,0 +1,39 @@
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+public interface a<K, V> {
+   String a();
+
+   int b();
+
+   int c();
+
+   long d();
+
+   List<Long> e();
+
+   Long f();
+
+   List<Long> g();
+
+   Date h();
+
+   void i();
+
+   void j();
+
+   V a(K var1);
+
+   V a(K var1, f<K, V> var2);
+
+   void a(K var1, V var2);
+
+   void b(K var1);
+
+   boolean c(K var1);
+
+   Iterator<K> k();
+
+   List<b<K, V>> l();
+}
diff --git a/testData/obfuscated/a0.java b/testData/obfuscated/a0.java
new file mode 100644
index 0000000..591434a
--- /dev/null
+++ b/testData/obfuscated/a0.java
@@ -0,0 +1,18 @@
+import java.util.List;
+import javax.xml.xpath.XPathExpressionException;
+
+public interface a0 {
+   a0 a(String var1) throws XPathExpressionException;
+
+   List<a0> b(String var1) throws XPathExpressionException;
+
+   a0[] c(String var1) throws XPathExpressionException;
+
+   String d(String var1) throws XPathExpressionException;
+
+   o e(String var1) throws XPathExpressionException;
+
+   boolean f(String var1) throws XPathExpressionException;
+
+   String a();
+}
diff --git a/testData/obfuscated/a1.java b/testData/obfuscated/a1.java
new file mode 100644
index 0000000..5d4c8a4
--- /dev/null
+++ b/testData/obfuscated/a1.java
@@ -0,0 +1,91 @@
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class a1 implements a0 {
+   private Node a;
+   private static final XPathFactory b = XPathFactory.newInstance();
+
+   public a1(Node var1) {
+      this.a = var1;
+   }
+
+   public a0 a(String var1) throws XPathExpressionException {
+      Node var2 = (Node)b.newXPath().compile(var1).evaluate(this.a, XPathConstants.NODE);
+
+      try {
+         if (var2 == null) {
+            return null;
+         }
+      } catch (XPathExpressionException var3) {
+         throw var3;
+      }
+
+      return new a1(var2);
+   }
+
+   public List<a0> b(String var1) throws XPathExpressionException {
+      int var5 = bc.e;
+      NodeList var2 = (NodeList)b.newXPath().compile(var1).evaluate(this.a, XPathConstants.NODESET);
+      ArrayList var3 = new ArrayList(var2.getLength());
+      int var4 = 0;
+
+      ArrayList var10000;
+      while(true) {
+         if (var4 < var2.getLength()) {
+            try {
+               var10000 = var3;
+               if (var5 != 0) {
+                  break;
+               }
+
+               var3.add(new a1(var2.item(var4)));
+               ++var4;
+               if (var5 == 0) {
+                  continue;
+               }
+            } catch (XPathExpressionException var7) {
+               throw var7;
+            }
+
+            int var6 = ap.c;
+            ++var6;
+            ap.c = var6;
+         }
+
+         var10000 = var3;
+         break;
+      }
+
+      return var10000;
+   }
+
+   public a0[] c(String var1) throws XPathExpressionException {
+      List var2 = this.b(var1);
+      return (a0[])var2.toArray(new a0[var2.size()]);
+   }
+
+   public String d(String param1) throws XPathExpressionException {
+      // $FF: Couldn't be decompiled
+   }
+
+   public boolean f(String param1) throws XPathExpressionException {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String a() {
+      return this.a.getNodeName();
+   }
+
+   public String toString() {
+      return this.a();
+   }
+
+   public o e(String var1) throws XPathExpressionException {
+      return o.b((Object)this.d(var1));
+   }
+}
diff --git a/testData/obfuscated/a2.java b/testData/obfuscated/a2.java
new file mode 100644
index 0000000..343fa6a
--- /dev/null
+++ b/testData/obfuscated/a2.java
@@ -0,0 +1,93 @@
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+class a2 implements EntityResolver {
+   final bc a;
+   private static final String b;
+
+   a2(bc var1) {
+      this.a = var1;
+   }
+
+   public InputSource resolveEntity(String var1, String var2) throws SAXException, IOException {
+      URL var3 = new URL(var2);
+      if (b.equals(var3.getProtocol())) {
+         File var4 = new File(var3.getFile());
+
+         try {
+            if (var4.exists()) {
+               return new InputSource(new FileInputStream(var4));
+            }
+         } catch (SAXException var5) {
+            throw var5;
+         }
+      }
+
+      return null;
+   }
+
+   static {
+      char[] var10000 = "\u001d2\u00049".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            b = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 123;
+            break;
+         case 1:
+            var10005 = 91;
+            break;
+         case 2:
+            var10005 = 104;
+            break;
+         case 3:
+            var10005 = 92;
+            break;
+         default:
+            var10005 = 15;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               b = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a3.java b/testData/obfuscated/a3.java
new file mode 100644
index 0000000..8bd1e44
--- /dev/null
+++ b/testData/obfuscated/a3.java
@@ -0,0 +1,2068 @@
+import java.util.concurrent.TimeUnit;
+
+public class a3 {
+   private static final a<Integer, Integer> a;
+   private static final String[] b;
+
+   private static int a(int param0, boolean param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static void main(String[] var0) throws Exception {
+      boolean var2 = a7.b;
+      ax var1 = ax.a();
+      System.out.println(b[4]);
+      a(42, false);
+      System.out.println(var1.e());
+      System.out.println(b[5]);
+      a(42, true);
+      System.out.println(var1.e());
+      a();
+      System.out.println(b[6]);
+      Thread.sleep(5000L);
+      System.out.println(b[3]);
+      d.b();
+      a();
+      if (var2) {
+         int var3 = ap.c;
+         ++var3;
+         ap.c = var3;
+      }
+
+   }
+
+   private static void a() {
+      System.out.println(b[1] + a.c());
+      System.out.println(b[0] + a.d());
+      System.out.println(b[2] + a.f());
+   }
+
+   static {
+      int var1;
+      int var6;
+      char[] var8;
+      String[] var10000;
+      char[] var10003;
+      char[] var10004;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label697: {
+         var10000 = new String[7];
+         var10003 = "`eA\u0006\u0003\u0015".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var6 = var10005;
+         if (var10005 <= 1) {
+            var8 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var6 = var10005;
+            if (var10005 <= var1) {
+               break label697;
+            }
+
+            var8 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var8[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 53;
+               break;
+            case 1:
+               var10008 = 22;
+               break;
+            case 2:
+               var10008 = 36;
+               break;
+            case 3:
+               var10008 = 117;
+               break;
+            default:
+               var10008 = 57;
+            }
+
+            var8[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var6 == 0) {
+               var10006 = var6;
+               var8 = var10004;
+            } else {
+               if (var6 <= var1) {
+                  break;
+               }
+
+               var8 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "f\u007f^\u0010\u0003\u0015".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var6 = var10005;
+      char[] var2;
+      int var3;
+      char[] var5;
+      char var9;
+      byte var10;
+      char[] var10001;
+      int var10002;
+      if (var10005 <= 1) {
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 53;
+            break;
+         case 1:
+            var10008 = 22;
+            break;
+         case 2:
+            var10008 = 36;
+            break;
+         case 3:
+            var10008 = 117;
+            break;
+         default:
+            var10008 = 57;
+         }
+      } else {
+         var10004 = var10003;
+         var6 = var10005;
+         if (var10005 <= var1) {
+            label740: {
+               var10000[1] = (new String(var10003)).intern();
+               var10003 = "}\u007fPXkTbAO\u0019".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= 1) {
+                  var8 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= var1) {
+                     break label740;
+                  }
+
+                  var8 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var8[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 53;
+                     break;
+                  case 1:
+                     var10008 = 22;
+                     break;
+                  case 2:
+                     var10008 = 36;
+                     break;
+                  case 3:
+                     var10008 = 117;
+                     break;
+                  default:
+                     var10008 = 57;
+                  }
+
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                  } else {
+                     if (var6 <= var1) {
+                        break;
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[2] = (new String(var10004)).intern();
+            var10003 = "gcJ\u001bP[q\u0004\u0016XV~AX\\C\u007fG\u0001PZx\n[\u0017".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var6 = var10005;
+            if (var10005 <= 1) {
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            } else {
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= var1) {
+                  label808: {
+                     var10000[3] = (new String(var10003)).intern();
+                     var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label808;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 53;
+                           break;
+                        case 1:
+                           var10008 = 22;
+                           break;
+                        case 2:
+                           var10008 = 36;
+                           break;
+                        case 3:
+                           var10008 = 117;
+                           break;
+                        default:
+                           var10008 = 57;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[4] = (new String(var10004)).intern();
+                  var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label876: {
+                           var10000[5] = (new String(var10003)).intern();
+                           var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label876;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 53;
+                                 break;
+                              case 1:
+                                 var10008 = 22;
+                                 break;
+                              case 2:
+                                 var10008 = 36;
+                                 break;
+                              case 3:
+                                 var10008 = 117;
+                                 break;
+                              default:
+                                 var10008 = 57;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[6] = (new String(var10004)).intern();
+                        b = var10000;
+                        var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                        var10002 = var2.length;
+                        var1 = 0;
+                        var10001 = var2;
+                        var3 = var10002;
+                        if (var10002 <= 1) {
+                           var5 = var2;
+                           var6 = var1;
+                        } else {
+                           var10001 = var2;
+                           var3 = var10002;
+                           if (var10002 <= var1) {
+                              a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                              return;
+                           }
+
+                           var5 = var2;
+                           var6 = var1;
+                        }
+
+                        while(true) {
+                           var9 = var5[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10 = 53;
+                              break;
+                           case 1:
+                              var10 = 22;
+                              break;
+                           case 2:
+                              var10 = 36;
+                              break;
+                           case 3:
+                              var10 = 117;
+                              break;
+                           default:
+                              var10 = 57;
+                           }
+
+                           var5[var6] = (char)(var9 ^ var10);
+                           ++var1;
+                           if (var3 == 0) {
+                              var6 = var3;
+                              var5 = var10001;
+                           } else {
+                              if (var3 <= var1) {
+                                 a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                 return;
+                              }
+
+                              var5 = var10001;
+                              var6 = var1;
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label984: {
+                                 var10000[5] = (new String(var10004)).intern();
+                                 var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label984;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[6] = (new String(var10004)).intern();
+                              b = var10000;
+                              var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                              var10002 = var2.length;
+                              var1 = 0;
+                              var10001 = var2;
+                              var3 = var10002;
+                              if (var10002 <= 1) {
+                                 var5 = var2;
+                                 var6 = var1;
+                              } else {
+                                 var10001 = var2;
+                                 var3 = var10002;
+                                 if (var10002 <= var1) {
+                                    a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                    return;
+                                 }
+
+                                 var5 = var2;
+                                 var6 = var1;
+                              }
+
+                              while(true) {
+                                 var9 = var5[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10 = 53;
+                                    break;
+                                 case 1:
+                                    var10 = 22;
+                                    break;
+                                 case 2:
+                                    var10 = 36;
+                                    break;
+                                 case 3:
+                                    var10 = 117;
+                                    break;
+                                 default:
+                                    var10 = 57;
+                                 }
+
+                                 var5[var6] = (char)(var9 ^ var10);
+                                 ++var1;
+                                 if (var3 == 0) {
+                                    var6 = var3;
+                                    var5 = var10001;
+                                 } else {
+                                    if (var3 <= var1) {
+                                       a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                       return;
+                                    }
+
+                                    var5 = var10001;
+                                    var6 = var1;
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                     var10007 = var10004[var6];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  } else {
+                     if (var6 <= var1) {
+                        label1119: {
+                           var10000[3] = (new String(var10004)).intern();
+                           var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label1119;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 53;
+                                 break;
+                              case 1:
+                                 var10008 = 22;
+                                 break;
+                              case 2:
+                                 var10008 = 36;
+                                 break;
+                              case 3:
+                                 var10008 = 117;
+                                 break;
+                              default:
+                                 var10008 = 57;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label1187: {
+                                 var10000[5] = (new String(var10003)).intern();
+                                 var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label1187;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[6] = (new String(var10004)).intern();
+                              b = var10000;
+                              var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                              var10002 = var2.length;
+                              var1 = 0;
+                              var10001 = var2;
+                              var3 = var10002;
+                              if (var10002 <= 1) {
+                                 var5 = var2;
+                                 var6 = var1;
+                              } else {
+                                 var10001 = var2;
+                                 var3 = var10002;
+                                 if (var10002 <= var1) {
+                                    a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                    return;
+                                 }
+
+                                 var5 = var2;
+                                 var6 = var1;
+                              }
+
+                              while(true) {
+                                 var9 = var5[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10 = 53;
+                                    break;
+                                 case 1:
+                                    var10 = 22;
+                                    break;
+                                 case 2:
+                                    var10 = 36;
+                                    break;
+                                 case 3:
+                                    var10 = 117;
+                                    break;
+                                 default:
+                                    var10 = 57;
+                                 }
+
+                                 var5[var6] = (char)(var9 ^ var10);
+                                 ++var1;
+                                 if (var3 == 0) {
+                                    var6 = var3;
+                                    var5 = var10001;
+                                 } else {
+                                    if (var3 <= var1) {
+                                       a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                       return;
+                                    }
+
+                                    var5 = var10001;
+                                    var6 = var1;
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label1295: {
+                                       var10000[5] = (new String(var10004)).intern();
+                                       var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label1295;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 53;
+                                             break;
+                                          case 1:
+                                             var10008 = 22;
+                                             break;
+                                          case 2:
+                                             var10008 = 36;
+                                             break;
+                                          case 3:
+                                             var10008 = 117;
+                                             break;
+                                          default:
+                                             var10008 = 57;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[6] = (new String(var10004)).intern();
+                                    b = var10000;
+                                    var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 53;
+                                          break;
+                                       case 1:
+                                          var10 = 22;
+                                          break;
+                                       case 2:
+                                          var10 = 36;
+                                          break;
+                                       case 3:
+                                          var10 = 117;
+                                          break;
+                                       default:
+                                          var10 = 57;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  }
+               }
+            }
+         }
+
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 53;
+            break;
+         case 1:
+            var10008 = 22;
+            break;
+         case 2:
+            var10008 = 36;
+            break;
+         case 3:
+            var10008 = 117;
+            break;
+         default:
+            var10008 = 57;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var8[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var6 == 0) {
+               var10006 = var6;
+               var8 = var10004;
+               var10007 = var10004[var6];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            } else {
+               if (var6 <= var1) {
+                  label333: {
+                     var10000[1] = (new String(var10004)).intern();
+                     var10003 = "}\u007fPXkTbAO\u0019".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label333;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 53;
+                           break;
+                        case 1:
+                           var10008 = 22;
+                           break;
+                        case 2:
+                           var10008 = 36;
+                           break;
+                        case 3:
+                           var10008 = 117;
+                           break;
+                        default:
+                           var10008 = 57;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[2] = (new String(var10004)).intern();
+                  var10003 = "gcJ\u001bP[q\u0004\u0016XV~AX\\C\u007fG\u0001PZx\n[\u0017".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label377: {
+                           var10000[3] = (new String(var10003)).intern();
+                           var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label377;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 53;
+                                 break;
+                              case 1:
+                                 var10008 = 22;
+                                 break;
+                              case 2:
+                                 var10008 = 36;
+                                 break;
+                              case 3:
+                                 var10008 = 117;
+                                 break;
+                              default:
+                                 var10008 = 57;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label445: {
+                                 var10000[5] = (new String(var10003)).intern();
+                                 var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label445;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[6] = (new String(var10004)).intern();
+                              b = var10000;
+                              var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                              var10002 = var2.length;
+                              var1 = 0;
+                              var10001 = var2;
+                              var3 = var10002;
+                              if (var10002 <= 1) {
+                                 var5 = var2;
+                                 var6 = var1;
+                              } else {
+                                 var10001 = var2;
+                                 var3 = var10002;
+                                 if (var10002 <= var1) {
+                                    a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                    return;
+                                 }
+
+                                 var5 = var2;
+                                 var6 = var1;
+                              }
+
+                              while(true) {
+                                 var9 = var5[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10 = 53;
+                                    break;
+                                 case 1:
+                                    var10 = 22;
+                                    break;
+                                 case 2:
+                                    var10 = 36;
+                                    break;
+                                 case 3:
+                                    var10 = 117;
+                                    break;
+                                 default:
+                                    var10 = 57;
+                                 }
+
+                                 var5[var6] = (char)(var9 ^ var10);
+                                 ++var1;
+                                 if (var3 == 0) {
+                                    var6 = var3;
+                                    var5 = var10001;
+                                 } else {
+                                    if (var3 <= var1) {
+                                       a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                       return;
+                                    }
+
+                                    var5 = var10001;
+                                    var6 = var1;
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label553: {
+                                       var10000[5] = (new String(var10004)).intern();
+                                       var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label553;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 53;
+                                             break;
+                                          case 1:
+                                             var10008 = 22;
+                                             break;
+                                          case 2:
+                                             var10008 = 36;
+                                             break;
+                                          case 3:
+                                             var10008 = 117;
+                                             break;
+                                          default:
+                                             var10008 = 57;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[6] = (new String(var10004)).intern();
+                                    b = var10000;
+                                    var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 53;
+                                          break;
+                                       case 1:
+                                          var10 = 22;
+                                          break;
+                                       case 2:
+                                          var10 = 36;
+                                          break;
+                                       case 3:
+                                          var10 = 117;
+                                          break;
+                                       default:
+                                          var10 = 57;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label172: {
+                                 var10000[3] = (new String(var10004)).intern();
+                                 var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label172;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[4] = (new String(var10004)).intern();
+                              var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label216: {
+                                       var10000[5] = (new String(var10003)).intern();
+                                       var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label216;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 53;
+                                             break;
+                                          case 1:
+                                             var10008 = 22;
+                                             break;
+                                          case 2:
+                                             var10008 = 36;
+                                             break;
+                                          case 3:
+                                             var10008 = 117;
+                                             break;
+                                          default:
+                                             var10008 = 57;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[6] = (new String(var10004)).intern();
+                                    b = var10000;
+                                    var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 53;
+                                          break;
+                                       case 1:
+                                          var10 = 22;
+                                          break;
+                                       case 2:
+                                          var10 = 36;
+                                          break;
+                                       case 3:
+                                          var10 = 117;
+                                          break;
+                                       default:
+                                          var10 = 57;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 53;
+                                          break;
+                                       case 1:
+                                          var10008 = 22;
+                                          break;
+                                       case 2:
+                                          var10008 = 36;
+                                          break;
+                                       case 3:
+                                          var10008 = 117;
+                                          break;
+                                       default:
+                                          var10008 = 57;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label136: {
+                                             var10000[5] = (new String(var10004)).intern();
+                                             var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label136;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 53;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 22;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 36;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 117;
+                                                   break;
+                                                default:
+                                                   var10008 = 57;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[6] = (new String(var10004)).intern();
+                                          b = var10000;
+                                          var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 53;
+                                                break;
+                                             case 1:
+                                                var10 = 22;
+                                                break;
+                                             case 2:
+                                                var10 = 36;
+                                                break;
+                                             case 3:
+                                                var10 = 117;
+                                                break;
+                                             default:
+                                                var10 = 57;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 53;
+                                          break;
+                                       case 1:
+                                          var10008 = 22;
+                                          break;
+                                       case 2:
+                                          var10008 = 36;
+                                          break;
+                                       case 3:
+                                          var10008 = 117;
+                                          break;
+                                       default:
+                                          var10008 = 57;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a4.java b/testData/obfuscated/a4.java
new file mode 100644
index 0000000..e0307cf
--- /dev/null
+++ b/testData/obfuscated/a4.java
@@ -0,0 +1,164 @@
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.logging.Level;
+
+@aa(
+   a = {ac.class}
+)
+public class a4 implements ac {
+   private static boolean a;
+   private static y<ad> b;
+   private static final String[] c;
+
+   public static void main(String[] var0) throws Exception {
+      t.a.setLevel(Level.FINE);
+      t.a();
+      a = true;
+
+      while(true) {
+         Thread.sleep(10000L);
+         System.out.println(c[1] + ((ad)b.a()).a());
+      }
+   }
+
+   public void a() throws Exception {
+      try {
+         if (a) {
+            System.out.println(c[0] + DateFormat.getTimeInstance().format(new Date()));
+         }
+
+      } catch (Exception var1) {
+         throw var1;
+      }
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "f\u0019\u0016n-[\u001c\u0016n0AKS".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 50;
+               break;
+            case 1:
+               var10008 = 113;
+               break;
+            case 2:
+               var10008 = 115;
+               break;
+            case 3:
+               var10008 = 78;
+               break;
+            default:
+               var10008 = 89;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "~\u0010\u0000:y[\u001f\u0005!:S\u0005\u001a!7\bQ".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            c = var10000;
+            a = false;
+            b = y.a(ad.class);
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 50;
+            break;
+         case 1:
+            var10008 = 113;
+            break;
+         case 2:
+            var10008 = 115;
+            break;
+         case 3:
+            var10008 = 78;
+            break;
+         default:
+            var10008 = 89;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               c = var10000;
+               a = false;
+               b = y.a(ad.class);
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a5.java b/testData/obfuscated/a5.java
new file mode 100644
index 0000000..cad3502
--- /dev/null
+++ b/testData/obfuscated/a5.java
@@ -0,0 +1,921 @@
+import java.text.DecimalFormat;
+import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
+
+public class a5 {
+   private static y<ai> a;
+   private static final String[] b;
+
+   public static void main(String[] var0) throws Exception {
+      t.a();
+
+      while(true) {
+         System.out.println(b[1]);
+         Thread.sleep(TimeUnit.MILLISECONDS.convert(60L, TimeUnit.SECONDS));
+         a();
+         System.out.println(b[0]);
+      }
+   }
+
+   private static void a() {
+      boolean var2 = a7.b;
+      Iterator var0 = ((ai)a.a()).a().iterator();
+
+      while(var0.hasNext()) {
+         al var1 = (al)var0.next();
+         System.out.println(var1.a().a() + b[3] + var1.a().b() + "\n" + DecimalFormat.getNumberInstance().format(var1.d()) + " " + var1.a().c() + b[4] + DecimalFormat.getNumberInstance().format(var1.e()) + " " + var1.a().c() + b[2] + DecimalFormat.getNumberInstance().format(var1.f()) + " " + var1.a().c() + "\n");
+         if (var2) {
+            break;
+         }
+      }
+
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 77;
+            break;
+         case 1:
+            var10008 = 48;
+            break;
+         case 2:
+            var10008 = 116;
+            break;
+         case 3:
+            var10008 = 19;
+            break;
+         default:
+            var10008 = 19;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u001aQ\u001dgz#WT|}(\u0010\u0019z}8D\u0011==c".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 77;
+                     break;
+                  case 1:
+                     var10008 = 48;
+                     break;
+                  case 2:
+                     var10008 = 116;
+                     break;
+                  case 3:
+                     var10008 = 19;
+                     break;
+                  default:
+                     var10008 = 19;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "a\u00105etm\u0002@{)m".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "m\u001dT".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 77;
+                           break;
+                        case 1:
+                           var10008 = 48;
+                           break;
+                        case 2:
+                           var10008 = 116;
+                           break;
+                        case 3:
+                           var10008 = 19;
+                           break;
+                        default:
+                           var10008 = 19;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        b = var10000;
+                        a = y.a(ai.class);
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           b = var10000;
+                           a = y.a(ai.class);
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "m\u001dT".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 77;
+                                 break;
+                              case 1:
+                                 var10008 = 48;
+                                 break;
+                              case 2:
+                                 var10008 = 116;
+                                 break;
+                              case 3:
+                                 var10008 = 19;
+                                 break;
+                              default:
+                                 var10008 = 19;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              b = var10000;
+                              a = y.a(ai.class);
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 b = var10000;
+                                 a = y.a(ai.class);
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 77;
+            break;
+         case 1:
+            var10008 = 48;
+            break;
+         case 2:
+            var10008 = 116;
+            break;
+         case 3:
+            var10008 = 19;
+            break;
+         default:
+            var10008 = 19;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u001aQ\u001dgz#WT|}(\u0010\u0019z}8D\u0011==c".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 77;
+                           break;
+                        case 1:
+                           var10008 = 48;
+                           break;
+                        case 2:
+                           var10008 = 116;
+                           break;
+                        case 3:
+                           var10008 = 19;
+                           break;
+                        default:
+                           var10008 = 19;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "a\u00105etm\u0002@{)m".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "m\u001dT".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 77;
+                                 break;
+                              case 1:
+                                 var10008 = 48;
+                                 break;
+                              case 2:
+                                 var10008 = 116;
+                                 break;
+                              case 3:
+                                 var10008 = 19;
+                                 break;
+                              default:
+                                 var10008 = 19;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              b = var10000;
+                              a = y.a(ai.class);
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 b = var10000;
+                                 a = y.a(ai.class);
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "m\u001dT".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 77;
+                                       break;
+                                    case 1:
+                                       var10008 = 48;
+                                       break;
+                                    case 2:
+                                       var10008 = 116;
+                                       break;
+                                    case 3:
+                                       var10008 = 19;
+                                       break;
+                                    default:
+                                       var10008 = 19;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    b = var10000;
+                                    a = y.a(ai.class);
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 77;
+                                    break;
+                                 case 1:
+                                    var10008 = 48;
+                                    break;
+                                 case 2:
+                                    var10008 = 116;
+                                    break;
+                                 case 3:
+                                    var10008 = 19;
+                                    break;
+                                 default:
+                                    var10008 = 19;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       b = var10000;
+                                       a = y.a(ai.class);
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a6.java b/testData/obfuscated/a6.java
new file mode 100644
index 0000000..f935895
--- /dev/null
+++ b/testData/obfuscated/a6.java
@@ -0,0 +1,5 @@
+public class a6 {
+   public static void main(String[] param0) throws Exception {
+      // $FF: Couldn't be decompiled
+   }
+}
diff --git a/testData/obfuscated/a7.java b/testData/obfuscated/a7.java
new file mode 100644
index 0000000..3e6e15f
--- /dev/null
+++ b/testData/obfuscated/a7.java
@@ -0,0 +1,139 @@
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+public class a7 {
+   public static boolean b;
+   private static final String[] a;
+
+   public static void main(String[] var0) throws Exception {
+      bc var1 = new bc();
+      var1.a(a[0], new a8());
+      var1.a((InputStream)(new FileInputStream(a[1])));
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "Z7wN".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 52;
+               break;
+            case 1:
+               var10008 = 88;
+               break;
+            case 2:
+               var10008 = 19;
+               break;
+            case 3:
+               var10008 = 43;
+               break;
+            default:
+               var10008 = 10;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "G*p\u0004oL9~[fQ+<_oG,=SgX".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            a = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 52;
+            break;
+         case 1:
+            var10008 = 88;
+            break;
+         case 2:
+            var10008 = 19;
+            break;
+         case 3:
+            var10008 = 43;
+            break;
+         default:
+            var10008 = 10;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               a = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a8.java b/testData/obfuscated/a8.java
new file mode 100644
index 0000000..7e8744a
--- /dev/null
+++ b/testData/obfuscated/a8.java
@@ -0,0 +1,405 @@
+final class a8 implements ay {
+   private static final String[] a;
+
+   public void a(a0 param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label115: {
+         var10000 = new String[4];
+         var10003 = "(\u000f7O".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label115;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 70;
+               break;
+            case 1:
+               var10008 = 110;
+               break;
+            case 2:
+               var10008 = 90;
+               break;
+            case 3:
+               var10008 = 42;
+               break;
+            default:
+               var10008 = 64;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "4\u000b)E54\r?Yo4\u000b)E54\r?q\u00002\u0017*O}a\u001a?Y4a3".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 70;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 90;
+            break;
+         case 3:
+            var10008 = 42;
+            break;
+         default:
+            var10008 = 64;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label158: {
+               var10000[1] = (new String(var10003)).intern();
+               var10003 = "6\u001c3I%".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label158;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 70;
+                     break;
+                  case 1:
+                     var10008 = 110;
+                     break;
+                  case 2:
+                     var10008 = 90;
+                     break;
+                  case 3:
+                     var10008 = 42;
+                     break;
+                  default:
+                     var10008 = 64;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[2] = (new String(var10004)).intern();
+            var10003 = "4\u000b)E54\r?Yo4\u000b)E54\r?q\u00002\u0017*O}a\u001a?Y4a3".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[3] = (new String(var10003)).intern();
+                  a = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 70;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 90;
+                  break;
+               case 3:
+                  var10008 = 42;
+                  break;
+               default:
+                  var10008 = 64;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[3] = (new String(var10004)).intern();
+                     a = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 70;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 90;
+            break;
+         case 3:
+            var10008 = 42;
+            break;
+         default:
+            var10008 = 64;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 70;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 90;
+                  break;
+               case 3:
+                  var10008 = 42;
+                  break;
+               default:
+                  var10008 = 64;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label79: {
+                     var10000[1] = (new String(var10004)).intern();
+                     var10003 = "6\u001c3I%".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label79;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 70;
+                           break;
+                        case 1:
+                           var10008 = 110;
+                           break;
+                        case 2:
+                           var10008 = 90;
+                           break;
+                        case 3:
+                           var10008 = 42;
+                           break;
+                        default:
+                           var10008 = 64;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[2] = (new String(var10004)).intern();
+                  var10003 = "4\u000b)E54\r?Yo4\u000b)E54\r?q\u00002\u0017*O}a\u001a?Y4a3".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[3] = (new String(var10003)).intern();
+                        a = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 70;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 90;
+                        break;
+                     case 3:
+                        var10008 = 42;
+                        break;
+                     default:
+                        var10008 = 64;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[3] = (new String(var10004)).intern();
+                           a = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 70;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 90;
+                  break;
+               case 3:
+                  var10008 = 42;
+                  break;
+               default:
+                  var10008 = 64;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a9.java b/testData/obfuscated/a9.java
new file mode 100644
index 0000000..017a83b
--- /dev/null
+++ b/testData/obfuscated/a9.java
@@ -0,0 +1,15 @@
+public class a9 extends RuntimeException {
+   private static final long serialVersionUID = 1180433275280350911L;
+
+   public a9(String var1, Throwable var2) {
+      super(var1, var2);
+   }
+
+   public a9(Throwable var1) {
+      super(var1);
+   }
+
+   public a9(String var1) {
+      super(var1);
+   }
+}
diff --git a/testData/obfuscated/a_.java b/testData/obfuscated/a_.java
new file mode 100644
index 0000000..a1fd30c
--- /dev/null
+++ b/testData/obfuscated/a_.java
@@ -0,0 +1,8 @@
+class a_ extends RuntimeException {
+   private static final long serialVersionUID = -7454219131982518216L;
+   final bc a;
+
+   a_(bc var1) {
+      this.a = var1;
+   }
+}
diff --git a/testData/obfuscated/aa.java b/testData/obfuscated/aa.java
new file mode 100644
index 0000000..646a3d3
--- /dev/null
+++ b/testData/obfuscated/aa.java
@@ -0,0 +1,10 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface aa {
+   Class<?>[] a();
+}
diff --git a/testData/obfuscated/ab.java b/testData/obfuscated/ab.java
new file mode 100644
index 0000000..935ee07
--- /dev/null
+++ b/testData/obfuscated/ab.java
@@ -0,0 +1,43 @@
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class ab implements u {
+   private List<Object> a = new ArrayList();
+
+   public void a(Class<?> param1) throws Exception {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a() throws Exception {
+      int var3 = y.d;
+      Iterator var1 = this.a.iterator();
+
+      while(true) {
+         if (var1.hasNext()) {
+            Object var2 = var1.next();
+
+            try {
+               v.a(var2);
+               if (var3 != 0) {
+                  break;
+               }
+
+               if (var3 == 0) {
+                  continue;
+               }
+            } catch (Exception var5) {
+               throw var5;
+            }
+
+            int var4 = ap.c;
+            ++var4;
+            ap.c = var4;
+         }
+
+         this.a.clear();
+         break;
+      }
+
+   }
+}
diff --git a/testData/obfuscated/ac.java b/testData/obfuscated/ac.java
new file mode 100644
index 0000000..b9054d9
--- /dev/null
+++ b/testData/obfuscated/ac.java
@@ -0,0 +1,3 @@
+public interface ac {
+   void a() throws Exception;
+}
diff --git a/testData/obfuscated/ad.java b/testData/obfuscated/ad.java
new file mode 100644
index 0000000..08b141e
--- /dev/null
+++ b/testData/obfuscated/ad.java
@@ -0,0 +1,3 @@
+public interface ad {
+   String a();
+}
diff --git a/testData/obfuscated/ae.java b/testData/obfuscated/ae.java
new file mode 100644
index 0000000..4dd6fc4
--- /dev/null
+++ b/testData/obfuscated/ae.java
@@ -0,0 +1,51 @@
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Timer;
+import java.util.concurrent.locks.ReentrantLock;
+
+@aa(
+   a = {ad.class}
+)
+public class ae implements ad {
+   @x(
+      a = ac.class
+   )
+   private List<ac> a;
+   private long b = 0L;
+   private Timer c;
+   private ReentrantLock d = new ReentrantLock();
+   public static boolean e;
+
+   public ae() {
+      this.a();
+   }
+
+   public void a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void b() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String a() {
+      try {
+         if (this.b == 0L) {
+            return "-";
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      return DateFormat.getDateTimeInstance().format(new Date(this.b));
+   }
+
+   static List a(ae var0) {
+      return var0.a;
+   }
+
+   static long a(ae var0, long var1) {
+      return var0.b = var1;
+   }
+}
diff --git a/testData/obfuscated/af.java b/testData/obfuscated/af.java
new file mode 100644
index 0000000..0326ac8
--- /dev/null
+++ b/testData/obfuscated/af.java
@@ -0,0 +1,3 @@
+// $FF: synthetic class
+class af {
+}
diff --git a/testData/obfuscated/ag.java b/testData/obfuscated/ag.java
new file mode 100644
index 0000000..73eb9ae
--- /dev/null
+++ b/testData/obfuscated/ag.java
@@ -0,0 +1,32 @@
+public class ag {
+   private long a = 0L;
+   private long[] b = new long[100];
+   private int c = 0;
+   private int d = 0;
+
+   public void a(long param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double a() {
+      try {
+         if (this.d == 0) {
+            return 0.0D;
+         }
+      } catch (a_ var4) {
+         throw var4;
+      }
+
+      double var1 = 0.0D;
+
+      for(int var3 = 0; var3 <= this.d; ++var3) {
+         var1 += (double)this.b[var3];
+      }
+
+      return var1 / (double)this.d;
+   }
+
+   public long b() {
+      return this.a;
+   }
+}
diff --git a/testData/obfuscated/ah.java b/testData/obfuscated/ah.java
new file mode 100644
index 0000000..f18b012
--- /dev/null
+++ b/testData/obfuscated/ah.java
@@ -0,0 +1,28 @@
+import java.util.concurrent.TimeUnit;
+
+public class ah {
+   private volatile long a = -1L;
+   private volatile long b = 0L;
+
+   public void a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double a(TimeUnit var1) {
+      return (double)(this.b / this.b(var1));
+   }
+
+   public long b() {
+      return this.b;
+   }
+
+   public long b(TimeUnit var1) {
+      long var2 = System.currentTimeMillis() - this.a;
+      return TimeUnit.MILLISECONDS.convert(var2, var1);
+   }
+
+   public void c() {
+      this.a = System.currentTimeMillis();
+      this.b = 0L;
+   }
+}
diff --git a/testData/obfuscated/ai.java b/testData/obfuscated/ai.java
new file mode 100644
index 0000000..b6b3516
--- /dev/null
+++ b/testData/obfuscated/ai.java
@@ -0,0 +1,39 @@
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@aa(
+   a = {ac.class, ai.class}
+)
+public class ai implements ac {
+   @x(
+      a = am.class
+   )
+   private List<am> a;
+   private static Map<ak, al> b = Collections.synchronizedMap(new LinkedHashMap());
+
+   public void a() throws Exception {
+      boolean var3 = an.k;
+      Iterator var1 = this.a.iterator();
+
+      while(var1.hasNext()) {
+         am var2 = (am)var1.next();
+         var2.a(new j(this));
+         if (var3) {
+            break;
+         }
+      }
+
+   }
+
+   public Collection<al> a() {
+      return b.values();
+   }
+
+   static Map b() {
+      return b;
+   }
+}
diff --git a/testData/obfuscated/aj.java b/testData/obfuscated/aj.java
new file mode 100644
index 0000000..4ced9b7
--- /dev/null
+++ b/testData/obfuscated/aj.java
@@ -0,0 +1,8595 @@
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@aa(
+   a = {am.class}
+)
+public class aj implements am {
+   private static final Pattern a;
+   private Map<String, Long> b;
+   private long c;
+   private Map<String, n<Long, Long>> d;
+   private long e;
+   private static final long f = 10L;
+   private static final Pattern g;
+   private static final String[] h;
+
+   private Map<String, Long> a() throws IOException {
+      LinkedHashMap var1 = new LinkedHashMap();
+      File var2 = new File(h[2]);
+
+      try {
+         if (!var2.exists()) {
+            return var1;
+         }
+      } catch (IOException var12) {
+         throw var12;
+      }
+
+      BufferedReader var3 = new BufferedReader(new FileReader(var2));
+
+      try {
+         for(String var4 = var3.readLine(); var4 != null; var4 = var3.readLine()) {
+            Matcher var5 = a.matcher(var4);
+
+            try {
+               if (var5.matches()) {
+                  var1.put(var5.group(1), Long.parseLong(var5.group(2)));
+               }
+            } catch (IOException var10) {
+               throw var10;
+            }
+         }
+      } finally {
+         var3.close();
+      }
+
+      return var1;
+   }
+
+   private Map<String, n<Long, Long>> b() throws IOException {
+      LinkedHashMap var1 = new LinkedHashMap();
+      File var2 = new File(h[0]);
+
+      try {
+         if (!var2.exists()) {
+            return var1;
+         }
+      } catch (IOException var12) {
+         throw var12;
+      }
+
+      BufferedReader var3 = new BufferedReader(new FileReader(var2));
+
+      try {
+         for(String var4 = var3.readLine(); var4 != null; var4 = var3.readLine()) {
+            Matcher var5 = g.matcher(var4);
+
+            try {
+               if (var5.matches()) {
+                  var1.put(var5.group(1), new n(Long.parseLong(var5.group(2)), Long.parseLong(var5.group(3))));
+               }
+            } catch (IOException var10) {
+               throw var10;
+            }
+         }
+      } finally {
+         var3.close();
+      }
+
+      return var1;
+   }
+
+   public void a(k<ak> var1) {
+      this.b(var1);
+      this.c(var1);
+   }
+
+   protected void b(k<ak> var1) {
+      try {
+         Map var2 = this.a();
+         long var3 = System.currentTimeMillis() - this.c;
+         this.c = System.currentTimeMillis();
+         if (this.b != null) {
+            Iterator var5 = var2.entrySet().iterator();
+
+            while(var5.hasNext()) {
+               Entry var6 = (Entry)var5.next();
+               Long var7 = (Long)this.b.get(var6.getKey());
+               if (var7 != null) {
+                  double var8 = (double)((((Long)var6.getValue()).longValue() - var7.longValue()) * 10L) / (double)var3;
+                  var1.a((Object)(new ar(h[1], (String)var6.getKey(), "%", var8 * 100.0D)));
+               }
+            }
+         }
+
+         this.b = var2;
+      } catch (IOException var10) {
+         var10.printStackTrace();
+      }
+
+   }
+
+   protected void c(k<ak> param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000 = new String[9];
+      char[] var10003 = "h!\"+hh597`4%10x".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var6 = var10005;
+      char[] var2;
+      int var3;
+      char[] var5;
+      char[] var8;
+      char var9;
+      byte var10;
+      char[] var10001;
+      int var10002;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 71;
+            break;
+         case 1:
+            var10008 = 81;
+            break;
+         case 2:
+            var10008 = 80;
+            break;
+         case 3:
+            var10008 = 68;
+            break;
+         default:
+            var10008 = 11;
+         }
+      } else {
+         var10004 = var10003;
+         var6 = var10005;
+         if (var10005 <= var1) {
+            label3117: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u0014\b\u0003".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= 1) {
+                  var8 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= var1) {
+                     break label3117;
+                  }
+
+                  var8 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var8[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 71;
+                     break;
+                  case 1:
+                     var10008 = 81;
+                     break;
+                  case 2:
+                     var10008 = 80;
+                     break;
+                  case 3:
+                     var10008 = 68;
+                     break;
+                  default:
+                     var10008 = 11;
+                  }
+
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                  } else {
+                     if (var6 <= var1) {
+                        break;
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "h!\"+hh\"$%\u007f".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var6 = var10005;
+            if (var10005 <= 1) {
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            } else {
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= var1) {
+                  label3185: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "j#5%o4".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label3185;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 71;
+                           break;
+                        case 1:
+                           var10008 = 81;
+                           break;
+                        case 2:
+                           var10008 = 80;
+                           break;
+                        case 3:
+                           var10008 = 68;
+                           break;
+                        default:
+                           var10008 = 11;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "v~#".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label3253: {
+                           var10000[4] = (new String(var10003)).intern();
+                           var10003 = "j&\"-\u007f\"\"".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label3253;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 71;
+                                 break;
+                              case 1:
+                                 var10008 = 81;
+                                 break;
+                              case 2:
+                                 var10008 = 80;
+                                 break;
+                              case 3:
+                                 var10008 = 68;
+                                 break;
+                              default:
+                                 var10008 = 11;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[5] = (new String(var10004)).intern();
+                        var10003 = "\u0014\b\u0003".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label3321: {
+                                 var10000[6] = (new String(var10003)).intern();
+                                 var10003 = "v~#".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label3321;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[7] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label3389: {
+                                       var10000[8] = (new String(var10003)).intern();
+                                       h = var10000;
+                                       var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                       var10002 = var2.length;
+                                       var1 = 0;
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= 1) {
+                                          var5 = var2;
+                                          var6 = var1;
+                                       } else {
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= var1) {
+                                             break label3389;
+                                          }
+
+                                          var5 = var2;
+                                          var6 = var1;
+                                       }
+
+                                       while(true) {
+                                          var9 = var5[var6];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10 = 71;
+                                             break;
+                                          case 1:
+                                             var10 = 81;
+                                             break;
+                                          case 2:
+                                             var10 = 80;
+                                             break;
+                                          case 3:
+                                             var10 = 68;
+                                             break;
+                                          default:
+                                             var10 = 11;
+                                          }
+
+                                          var5[var6] = (char)(var9 ^ var10);
+                                          ++var1;
+                                          if (var3 == 0) {
+                                             var6 = var3;
+                                             var5 = var10001;
+                                          } else {
+                                             if (var3 <= var1) {
+                                                break;
+                                             }
+
+                                             var5 = var10001;
+                                             var6 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    a = Pattern.compile((new String(var10001)).intern());
+                                    var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          g = Pattern.compile((new String(var2)).intern());
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 71;
+                                          break;
+                                       case 1:
+                                          var10 = 81;
+                                          break;
+                                       case 2:
+                                          var10 = 80;
+                                          break;
+                                       case 3:
+                                          var10 = 68;
+                                          break;
+                                       default:
+                                          var10 = 11;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             g = Pattern.compile((new String(var10001)).intern());
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label3497: {
+                                             var10000[8] = (new String(var10004)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label3497;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label3632: {
+                                       var10000[6] = (new String(var10004)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label3632;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label3700: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label3700;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label3808: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label3808;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label3970: {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label3970;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[5] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label4038: {
+                                       var10000[6] = (new String(var10003)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label4038;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label4106: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label4106;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label4214: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label4214;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label4349: {
+                                             var10000[6] = (new String(var10004)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label4349;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label4417: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label4417;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label4525: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label4525;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                     var10007 = var10004[var6];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  } else {
+                     if (var6 <= var1) {
+                        label4714: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "j#5%o4".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label4714;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 71;
+                                 break;
+                              case 1:
+                                 var10008 = 81;
+                                 break;
+                              case 2:
+                                 var10008 = 80;
+                                 break;
+                              case 3:
+                                 var10008 = 68;
+                                 break;
+                              default:
+                                 var10008 = 11;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "v~#".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label4782: {
+                                 var10000[4] = (new String(var10003)).intern();
+                                 var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label4782;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[5] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label4850: {
+                                       var10000[6] = (new String(var10003)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label4850;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label4918: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label4918;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label5026: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label5026;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label5161: {
+                                             var10000[6] = (new String(var10004)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label5161;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label5229: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label5229;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label5337: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label5337;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label5499: {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label5499;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[5] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label5567: {
+                                             var10000[6] = (new String(var10003)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label5567;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label5635: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label5635;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label5743: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label5743;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label5878: {
+                                                   var10000[6] = (new String(var10004)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label5878;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label5946: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label5946;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label6054: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label6054;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  }
+               }
+            }
+         }
+
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 71;
+            break;
+         case 1:
+            var10008 = 81;
+            break;
+         case 2:
+            var10008 = 80;
+            break;
+         case 3:
+            var10008 = 68;
+            break;
+         default:
+            var10008 = 11;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var8[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var6 == 0) {
+               var10006 = var6;
+               var8 = var10004;
+               var10007 = var10004[var6];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            } else {
+               if (var6 <= var1) {
+                  label1509: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u0014\b\u0003".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label1509;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 71;
+                           break;
+                        case 1:
+                           var10008 = 81;
+                           break;
+                        case 2:
+                           var10008 = 80;
+                           break;
+                        case 3:
+                           var10008 = 68;
+                           break;
+                        default:
+                           var10008 = 11;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "h!\"+hh\"$%\u007f".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label1553: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "j#5%o4".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label1553;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 71;
+                                 break;
+                              case 1:
+                                 var10008 = 81;
+                                 break;
+                              case 2:
+                                 var10008 = 80;
+                                 break;
+                              case 3:
+                                 var10008 = 68;
+                                 break;
+                              default:
+                                 var10008 = 11;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "v~#".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label1621: {
+                                 var10000[4] = (new String(var10003)).intern();
+                                 var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label1621;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[5] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label1689: {
+                                       var10000[6] = (new String(var10003)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label1689;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label1757: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label1757;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label1865: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label1865;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label2000: {
+                                             var10000[6] = (new String(var10004)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label2000;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label2068: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label2068;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label2176: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label2176;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label2338: {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label2338;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[5] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label2406: {
+                                             var10000[6] = (new String(var10003)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label2406;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label2474: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label2474;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label2582: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label2582;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label2717: {
+                                                   var10000[6] = (new String(var10004)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label2717;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label2785: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label2785;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label2893: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label2893;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label739: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "j#5%o4".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label739;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "v~#".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label783: {
+                                       var10000[4] = (new String(var10003)).intern();
+                                       var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label783;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[5] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label851: {
+                                             var10000[6] = (new String(var10003)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label851;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label919: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label919;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label1027: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label1027;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label1162: {
+                                                   var10000[6] = (new String(var10004)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label1162;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label1230: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label1230;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label1338: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label1338;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label375: {
+                                             var10000[4] = (new String(var10004)).intern();
+                                             var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label375;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[5] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label419: {
+                                                   var10000[6] = (new String(var10003)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label419;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label487: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label487;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label595: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label595;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label214: {
+                                                         var10000[6] = (new String(var10004)).intern();
+                                                         var10003 = "v~#".toCharArray();
+                                                         var10005 = var10003.length;
+                                                         var1 = 0;
+                                                         var10004 = var10003;
+                                                         var6 = var10005;
+                                                         if (var10005 <= 1) {
+                                                            var8 = var10003;
+                                                            var10006 = var1;
+                                                         } else {
+                                                            var10004 = var10003;
+                                                            var6 = var10005;
+                                                            if (var10005 <= var1) {
+                                                               break label214;
+                                                            }
+
+                                                            var8 = var10003;
+                                                            var10006 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var10007 = var8[var10006];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10008 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10008 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10008 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10008 = 68;
+                                                               break;
+                                                            default:
+                                                               var10008 = 11;
+                                                            }
+
+                                                            var8[var10006] = (char)(var10007 ^ var10008);
+                                                            ++var1;
+                                                            if (var6 == 0) {
+                                                               var10006 = var6;
+                                                               var8 = var10004;
+                                                            } else {
+                                                               if (var6 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var8 = var10004;
+                                                               var10006 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      var10000[7] = (new String(var10004)).intern();
+                                                      var10003 = "\u0014\b\u0003".toCharArray();
+                                                      var10005 = var10003.length;
+                                                      var1 = 0;
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= 1) {
+                                                         var8 = var10003;
+                                                         var10006 = var1;
+                                                         var10007 = var10003[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         var10004 = var10003;
+                                                         var6 = var10005;
+                                                         if (var10005 <= var1) {
+                                                            label178: {
+                                                               var10000[8] = (new String(var10003)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label178;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10003;
+                                                         var10006 = var1;
+                                                         var10007 = var10003[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+
+                                                      while(true) {
+                                                         while(true) {
+                                                            var8[var10006] = (char)(var10007 ^ var10008);
+                                                            ++var1;
+                                                            if (var6 == 0) {
+                                                               var10006 = var6;
+                                                               var8 = var10004;
+                                                               var10007 = var10004[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10008 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10008 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10008 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10008 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10008 = 11;
+                                                               }
+                                                            } else {
+                                                               if (var6 <= var1) {
+                                                                  label258: {
+                                                                     var10000[8] = (new String(var10004)).intern();
+                                                                     h = var10000;
+                                                                     var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                                     var10002 = var2.length;
+                                                                     var1 = 0;
+                                                                     var10001 = var2;
+                                                                     var3 = var10002;
+                                                                     if (var10002 <= 1) {
+                                                                        var5 = var2;
+                                                                        var6 = var1;
+                                                                     } else {
+                                                                        var10001 = var2;
+                                                                        var3 = var10002;
+                                                                        if (var10002 <= var1) {
+                                                                           break label258;
+                                                                        }
+
+                                                                        var5 = var2;
+                                                                        var6 = var1;
+                                                                     }
+
+                                                                     while(true) {
+                                                                        var9 = var5[var6];
+                                                                        switch(var1 % 5) {
+                                                                        case 0:
+                                                                           var10 = 71;
+                                                                           break;
+                                                                        case 1:
+                                                                           var10 = 81;
+                                                                           break;
+                                                                        case 2:
+                                                                           var10 = 80;
+                                                                           break;
+                                                                        case 3:
+                                                                           var10 = 68;
+                                                                           break;
+                                                                        default:
+                                                                           var10 = 11;
+                                                                        }
+
+                                                                        var5[var6] = (char)(var9 ^ var10);
+                                                                        ++var1;
+                                                                        if (var3 == 0) {
+                                                                           var6 = var3;
+                                                                           var5 = var10001;
+                                                                        } else {
+                                                                           if (var3 <= var1) {
+                                                                              break;
+                                                                           }
+
+                                                                           var5 = var10001;
+                                                                           var6 = var1;
+                                                                        }
+                                                                     }
+                                                                  }
+
+                                                                  a = Pattern.compile((new String(var10001)).intern());
+                                                                  var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                                  var10002 = var2.length;
+                                                                  var1 = 0;
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= 1) {
+                                                                     var5 = var2;
+                                                                     var6 = var1;
+                                                                  } else {
+                                                                     var10001 = var2;
+                                                                     var3 = var10002;
+                                                                     if (var10002 <= var1) {
+                                                                        g = Pattern.compile((new String(var2)).intern());
+                                                                        return;
+                                                                     }
+
+                                                                     var5 = var2;
+                                                                     var6 = var1;
+                                                                  }
+
+                                                                  while(true) {
+                                                                     var9 = var5[var6];
+                                                                     switch(var1 % 5) {
+                                                                     case 0:
+                                                                        var10 = 71;
+                                                                        break;
+                                                                     case 1:
+                                                                        var10 = 81;
+                                                                        break;
+                                                                     case 2:
+                                                                        var10 = 80;
+                                                                        break;
+                                                                     case 3:
+                                                                        var10 = 68;
+                                                                        break;
+                                                                     default:
+                                                                        var10 = 11;
+                                                                     }
+
+                                                                     var5[var6] = (char)(var9 ^ var10);
+                                                                     ++var1;
+                                                                     if (var3 == 0) {
+                                                                        var6 = var3;
+                                                                        var5 = var10001;
+                                                                     } else {
+                                                                        if (var3 <= var1) {
+                                                                           g = Pattern.compile((new String(var10001)).intern());
+                                                                           return;
+                                                                        }
+
+                                                                        var5 = var10001;
+                                                                        var6 = var1;
+                                                                     }
+                                                                  }
+                                                               }
+
+                                                               var8 = var10004;
+                                                               var10006 = var1;
+                                                               var10007 = var10004[var1];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10008 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10008 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10008 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10008 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10008 = 11;
+                                                               }
+                                                            }
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ak.java b/testData/obfuscated/ak.java
new file mode 100644
index 0000000..f463318
--- /dev/null
+++ b/testData/obfuscated/ak.java
@@ -0,0 +1,11 @@
+public interface ak {
+   String a();
+
+   String b();
+
+   String c();
+
+   double d();
+
+   Double e();
+}
diff --git a/testData/obfuscated/al.java b/testData/obfuscated/al.java
new file mode 100644
index 0000000..2ca4151
--- /dev/null
+++ b/testData/obfuscated/al.java
@@ -0,0 +1,459 @@
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class al implements Comparable<al> {
+   private final ak a;
+   private final List<n<Date, Double>> b = new ArrayList();
+   private final List<n<Date, Double>> c = new ArrayList();
+   private double d = 0.0D;
+   private double e = 0.0D;
+   private double f = 0.0D;
+   private static final String[] g;
+
+   public al(ak var1) {
+      this.a = var1;
+   }
+
+   protected static long a(Date param0, Date param1, TimeUnit param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   protected static <T> T a(List<T> param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   protected static <T> T b(List<T> param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a(double param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public ak a() {
+      return this.a;
+   }
+
+   public List<n<Date, Double>> b() {
+      return this.b;
+   }
+
+   public List<n<Date, Double>> c() {
+      return this.c;
+   }
+
+   public double d() {
+      return this.d;
+   }
+
+   public double e() {
+      try {
+         if (this.b.isEmpty()) {
+            return 0.0D;
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      return this.e / (double)this.b.size();
+   }
+
+   public double f() {
+      try {
+         if (this.c.isEmpty()) {
+            return 0.0D;
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      return this.f / (double)this.c.size();
+   }
+
+   public String toString() {
+      StringBuilder var1 = new StringBuilder(this.a.a());
+
+      try {
+         var1.append(g[2]);
+         var1.append(this.a.b());
+         if (this.a.c() != null) {
+            var1.append(g[1]);
+            var1.append(this.a.c());
+            var1.append("]");
+         }
+      } catch (a_ var2) {
+         throw var2;
+      }
+
+      var1.append(g[0]);
+      var1.append(DecimalFormat.getNumberInstance().format(this.d()));
+      var1.append(" ");
+      var1.append(DecimalFormat.getNumberInstance().format(this.e()));
+      var1.append(" ");
+      var1.append(DecimalFormat.getNumberInstance().format(this.f()));
+      return var1.toString();
+   }
+
+   protected static boolean a(Object param0, Object param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public int a(al var1) {
+      try {
+         if (var1 == null) {
+            return 1;
+         }
+      } catch (a_ var2) {
+         throw var2;
+      }
+
+      try {
+         if (a(this.a().a(), var1.a().a())) {
+            return this.a().b().compareTo(var1.a().b());
+         }
+      } catch (a_ var3) {
+         throw var3;
+      }
+
+      return this.a().a().compareTo(var1.a().a());
+   }
+
+   static {
+      String[] var10000 = new String[3];
+      char[] var10003 = "\u0007Y".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 61;
+            break;
+         case 1:
+            var10008 = 121;
+            break;
+         case 2:
+            var10008 = 103;
+            break;
+         case 3:
+            var10008 = 113;
+            break;
+         default:
+            var10008 = 123;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label127: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u001d\"".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label127;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 61;
+                     break;
+                  case 1:
+                     var10008 = 121;
+                     break;
+                  case 2:
+                     var10008 = 103;
+                     break;
+                  case 3:
+                     var10008 = 113;
+                     break;
+                  default:
+                     var10008 = 123;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "\u001dTG".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[2] = (new String(var10003)).intern();
+                  g = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 61;
+                  break;
+               case 1:
+                  var10008 = 121;
+                  break;
+               case 2:
+                  var10008 = 103;
+                  break;
+               case 3:
+                  var10008 = 113;
+                  break;
+               default:
+                  var10008 = 123;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[2] = (new String(var10004)).intern();
+                     g = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 61;
+            break;
+         case 1:
+            var10008 = 121;
+            break;
+         case 2:
+            var10008 = 103;
+            break;
+         case 3:
+            var10008 = 113;
+            break;
+         default:
+            var10008 = 123;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 61;
+                  break;
+               case 1:
+                  var10008 = 121;
+                  break;
+               case 2:
+                  var10008 = 103;
+                  break;
+               case 3:
+                  var10008 = 113;
+                  break;
+               default:
+                  var10008 = 123;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label65: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u001d\"".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label65;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 61;
+                           break;
+                        case 1:
+                           var10008 = 121;
+                           break;
+                        case 2:
+                           var10008 = 103;
+                           break;
+                        case 3:
+                           var10008 = 113;
+                           break;
+                        default:
+                           var10008 = 123;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "\u001dTG".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[2] = (new String(var10003)).intern();
+                        g = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 61;
+                        break;
+                     case 1:
+                        var10008 = 121;
+                        break;
+                     case 2:
+                        var10008 = 103;
+                        break;
+                     case 3:
+                        var10008 = 113;
+                        break;
+                     default:
+                        var10008 = 123;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[2] = (new String(var10004)).intern();
+                           g = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 61;
+                  break;
+               case 1:
+                  var10008 = 121;
+                  break;
+               case 2:
+                  var10008 = 103;
+                  break;
+               case 3:
+                  var10008 = 113;
+                  break;
+               default:
+                  var10008 = 123;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/am.java b/testData/obfuscated/am.java
new file mode 100644
index 0000000..7353ace
--- /dev/null
+++ b/testData/obfuscated/am.java
@@ -0,0 +1,3 @@
+public interface am {
+   void a(k<ak> var1);
+}
diff --git a/testData/obfuscated/an.java b/testData/obfuscated/an.java
new file mode 100644
index 0000000..59d7f06
--- /dev/null
+++ b/testData/obfuscated/an.java
@@ -0,0 +1,1057 @@
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.ThreadMXBean;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+@aa(
+   a = {am.class}
+)
+public class an implements am {
+   private OperatingSystemMXBean a = ManagementFactory.getOperatingSystemMXBean();
+   private MemoryMXBean b = ManagementFactory.getMemoryMXBean();
+   private List<MemoryPoolMXBean> c = ManagementFactory.getMemoryPoolMXBeans();
+   private ThreadMXBean d = ManagementFactory.getThreadMXBean();
+   private List<GarbageCollectorMXBean> e = ManagementFactory.getGarbageCollectorMXBeans();
+   private Map<Long, ao> f = Collections.synchronizedMap(new TreeMap());
+   private ak g;
+   private List<aw> h;
+   private ak i;
+   private ak j;
+   public static boolean k;
+   private static final String[] l;
+
+   public an() {
+      this.g = new at(this, l[2], l[1]);
+      this.i = new au(this, l[0], l[5]);
+      this.j = new av(this, l[4], l[3]);
+   }
+
+   private List<aw> a() {
+      boolean var4 = k;
+
+      List var10000;
+      label45: {
+         try {
+            var10000 = this.h;
+            if (var4) {
+               return var10000;
+            }
+
+            if (var10000 != null) {
+               break label45;
+            }
+         } catch (a_ var6) {
+            throw var6;
+         }
+
+         ArrayList var1 = new ArrayList();
+         Iterator var2 = this.c.iterator();
+
+         while(var2.hasNext()) {
+            MemoryPoolMXBean var3 = (MemoryPoolMXBean)var2.next();
+
+            try {
+               var1.add(new aw(this, var3));
+               if (var4) {
+                  break label45;
+               }
+
+               if (var4) {
+                  break;
+               }
+            } catch (a_ var5) {
+               throw var5;
+            }
+         }
+
+         this.h = var1;
+      }
+
+      var10000 = this.h;
+      return var10000;
+   }
+
+   public void a(k<ak> var1) {
+      var1.a((Object)this.g);
+      var1.a((Collection)this.a());
+      var1.a((Object)this.i);
+      var1.a((Object)this.j);
+   }
+
+   public List<ao> b() {
+      ArrayList var1 = new ArrayList(this.f.values());
+      Collections.sort(var1);
+      return var1;
+   }
+
+   static MemoryMXBean a(an var0) {
+      return var0.b;
+   }
+
+   static Map b(an var0) {
+      return var0.f;
+   }
+
+   static ThreadMXBean c(an var0) {
+      return var0.d;
+   }
+
+   static OperatingSystemMXBean d(an var0) {
+      return var0.a;
+   }
+
+   static List e(an var0) {
+      return var0.e;
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label304: {
+         var10000 = new String[6];
+         var10003 = "\u0006\b\u000e".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label304;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 76;
+               break;
+            case 1:
+               var10008 = 94;
+               break;
+            case 2:
+               var10008 = 67;
+               break;
+            case 3:
+               var10008 = 50;
+               break;
+            default:
+               var10008 = 117;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "\u0004;\"B".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 76;
+            break;
+         case 1:
+            var10008 = 94;
+            break;
+         case 2:
+            var10008 = 67;
+            break;
+         case 3:
+            var10008 = 50;
+            break;
+         default:
+            var10008 = 117;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label347: {
+               var10000[1] = (new String(var10003)).intern();
+               var10003 = "\u0006\b\u000e".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label347;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 76;
+                     break;
+                  case 1:
+                     var10008 = 94;
+                     break;
+                  case 2:
+                     var10008 = 67;
+                     break;
+                  case 3:
+                     var10008 = 50;
+                     break;
+                  default:
+                     var10008 = 117;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[2] = (new String(var10004)).intern();
+            var10003 = "\u000b\u001d".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label415: {
+                     var10000[3] = (new String(var10003)).intern();
+                     var10003 = "\u0006\b\u000e".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label415;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 76;
+                           break;
+                        case 1:
+                           var10008 = 94;
+                           break;
+                        case 2:
+                           var10008 = 67;
+                           break;
+                        case 3:
+                           var10008 = 50;
+                           break;
+                        default:
+                           var10008 = 117;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[4] = (new String(var10004)).intern();
+                  var10003 = "\u000f\u000e\u0016".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[5] = (new String(var10003)).intern();
+                        l = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[5] = (new String(var10004)).intern();
+                           l = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label523: {
+                           var10000[3] = (new String(var10004)).intern();
+                           var10003 = "\u0006\b\u000e".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label523;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 76;
+                                 break;
+                              case 1:
+                                 var10008 = 94;
+                                 break;
+                              case 2:
+                                 var10008 = 67;
+                                 break;
+                              case 3:
+                                 var10008 = 50;
+                                 break;
+                              default:
+                                 var10008 = 117;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "\u000f\u000e\u0016".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[5] = (new String(var10003)).intern();
+                              l = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[5] = (new String(var10004)).intern();
+                                 l = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 76;
+            break;
+         case 1:
+            var10008 = 94;
+            break;
+         case 2:
+            var10008 = 67;
+            break;
+         case 3:
+            var10008 = 50;
+            break;
+         default:
+            var10008 = 117;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label143: {
+                     var10000[1] = (new String(var10004)).intern();
+                     var10003 = "\u0006\b\u000e".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label143;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 76;
+                           break;
+                        case 1:
+                           var10008 = 94;
+                           break;
+                        case 2:
+                           var10008 = 67;
+                           break;
+                        case 3:
+                           var10008 = 50;
+                           break;
+                        default:
+                           var10008 = 117;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[2] = (new String(var10004)).intern();
+                  var10003 = "\u000b\u001d".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label187: {
+                           var10000[3] = (new String(var10003)).intern();
+                           var10003 = "\u0006\b\u000e".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label187;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 76;
+                                 break;
+                              case 1:
+                                 var10008 = 94;
+                                 break;
+                              case 2:
+                                 var10008 = 67;
+                                 break;
+                              case 3:
+                                 var10008 = 50;
+                                 break;
+                              default:
+                                 var10008 = 117;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "\u000f\u000e\u0016".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[5] = (new String(var10003)).intern();
+                              l = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[5] = (new String(var10004)).intern();
+                                 l = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label107: {
+                                 var10000[3] = (new String(var10004)).intern();
+                                 var10003 = "\u0006\b\u000e".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label107;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 76;
+                                       break;
+                                    case 1:
+                                       var10008 = 94;
+                                       break;
+                                    case 2:
+                                       var10008 = 67;
+                                       break;
+                                    case 3:
+                                       var10008 = 50;
+                                       break;
+                                    default:
+                                       var10008 = 117;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[4] = (new String(var10004)).intern();
+                              var10003 = "\u000f\u000e\u0016".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[5] = (new String(var10003)).intern();
+                                    l = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 76;
+                                    break;
+                                 case 1:
+                                    var10008 = 94;
+                                    break;
+                                 case 2:
+                                    var10008 = 67;
+                                    break;
+                                 case 3:
+                                    var10008 = 50;
+                                    break;
+                                 default:
+                                    var10008 = 117;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[5] = (new String(var10004)).intern();
+                                       l = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ao.java b/testData/obfuscated/ao.java
new file mode 100644
index 0000000..745e043
--- /dev/null
+++ b/testData/obfuscated/ao.java
@@ -0,0 +1,25 @@
+import java.lang.Thread.State;
+
+public class ao implements Comparable<ao> {
+   protected String a;
+   protected State b;
+   protected double c;
+   protected long d;
+   protected long e;
+
+   public String a() {
+      return this.a;
+   }
+
+   public State b() {
+      return this.b;
+   }
+
+   public double c() {
+      return this.c;
+   }
+
+   public int a(ao param1) {
+      // $FF: Couldn't be decompiled
+   }
+}
diff --git a/testData/obfuscated/ap.java b/testData/obfuscated/ap.java
new file mode 100644
index 0000000..8f14fd7
--- /dev/null
+++ b/testData/obfuscated/ap.java
@@ -0,0 +1,91 @@
+public abstract class ap implements ak {
+   private final String a;
+   private final String b;
+   public static int c;
+   private static final String d;
+
+   public ap(String var1, String var2) {
+      this.b = var1;
+      this.a = var2;
+   }
+
+   public String b() {
+      return this.a;
+   }
+
+   public String a() {
+      return this.b;
+   }
+
+   public int hashCode() {
+      return (this.b + this.a).hashCode();
+   }
+
+   public boolean equals(Object param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String toString() {
+      return this.b + d + this.a;
+   }
+
+   static {
+      char[] var10000 = "K\u000eX".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            d = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 107;
+            break;
+         case 1:
+            var10005 = 35;
+            break;
+         case 2:
+            var10005 = 120;
+            break;
+         case 3:
+            var10005 = 65;
+            break;
+         default:
+            var10005 = 23;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               d = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/aq.java b/testData/obfuscated/aq.java
new file mode 100644
index 0000000..784fb30
--- /dev/null
+++ b/testData/obfuscated/aq.java
@@ -0,0 +1,29 @@
+public class aq extends ap {
+   private volatile long d;
+   private volatile long e;
+   private final String f;
+   private static final long g = 4611686018427387903L;
+   private final Double h;
+
+   public aq(String var1, String var2, String var3, Double var4) {
+      super(var1, var2);
+      this.f = var3;
+      this.h = var4;
+   }
+
+   public String c() {
+      return this.f;
+   }
+
+   public void a(long param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Double e() {
+      return this.h;
+   }
+}
diff --git a/testData/obfuscated/ar.java b/testData/obfuscated/ar.java
new file mode 100644
index 0000000..bf70813
--- /dev/null
+++ b/testData/obfuscated/ar.java
@@ -0,0 +1,22 @@
+public class ar extends ap {
+   private final String d;
+   private final double e;
+
+   public ar(String var1, String var2, String var3, double var4) {
+      super(var1, var2);
+      this.d = var3;
+      this.e = var4;
+   }
+
+   public String c() {
+      return this.d;
+   }
+
+   public double d() {
+      return this.e;
+   }
+
+   public Double e() {
+      return null;
+   }
+}
diff --git a/testData/obfuscated/as.java b/testData/obfuscated/as.java
new file mode 100644
index 0000000..6e7c1a5
--- /dev/null
+++ b/testData/obfuscated/as.java
@@ -0,0 +1,49 @@
+import java.util.concurrent.TimeUnit;
+
+public class as extends ap {
+   private volatile long d = 0L;
+   private volatile long e;
+   private final TimeUnit f;
+   private final Double g;
+   private String h;
+   private double i;
+
+   public as(String var1, String var2, TimeUnit var3, Double var4, String var5) {
+      super(var1, var2);
+      this.f = var3;
+      this.h = var5;
+      this.g = var4;
+      this.e = System.currentTimeMillis();
+   }
+
+   public String c() {
+      return this.h;
+   }
+
+   public void a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a(long var1) {
+      try {
+         if (9223372036854775797L - var1 > this.d) {
+            this.d += var1;
+         }
+
+      } catch (a_ var3) {
+         throw var3;
+      }
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double b() {
+      return this.i;
+   }
+
+   public Double e() {
+      return this.g;
+   }
+}
diff --git a/testData/obfuscated/at.java b/testData/obfuscated/at.java
new file mode 100644
index 0000000..efafba2
--- /dev/null
+++ b/testData/obfuscated/at.java
@@ -0,0 +1,81 @@
+class at extends ap {
+   final an d;
+   private static final String e;
+
+   at(an var1, String var2, String var3) {
+      super(var2, var3);
+      this.d = var1;
+   }
+
+   public double d() {
+      return (double)an.a(this.d).getHeapMemoryUsage().getUsed() / 1024.0D / 1024.0D;
+   }
+
+   public String c() {
+      return e;
+   }
+
+   public Double e() {
+      return (double)an.a(this.d).getHeapMemoryUsage().getMax() / 1024.0D / 1024.0D;
+   }
+
+   static {
+      char[] var10000 = "$b".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            e = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 105;
+            break;
+         case 1:
+            var10005 = 32;
+            break;
+         case 2:
+            var10005 = 18;
+            break;
+         case 3:
+            var10005 = 31;
+            break;
+         default:
+            var10005 = 120;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               e = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/au.java b/testData/obfuscated/au.java
new file mode 100644
index 0000000..cf88f45
--- /dev/null
+++ b/testData/obfuscated/au.java
@@ -0,0 +1,24 @@
+class au extends ap {
+   private long d;
+   private long e;
+   final an f;
+
+   au(an var1, String var2, String var3) {
+      super(var2, var3);
+      this.f = var1;
+      this.d = 0L;
+      this.e = 0L;
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String c() {
+      return "%";
+   }
+
+   public Double e() {
+      return 100.0D;
+   }
+}
diff --git a/testData/obfuscated/av.java b/testData/obfuscated/av.java
new file mode 100644
index 0000000..ab6587d
--- /dev/null
+++ b/testData/obfuscated/av.java
@@ -0,0 +1,24 @@
+class av extends ap {
+   private long d;
+   private long e;
+   final an f;
+
+   av(an var1, String var2, String var3) {
+      super(var2, var3);
+      this.f = var1;
+      this.d = 0L;
+      this.e = 0L;
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String c() {
+      return "%";
+   }
+
+   public Double e() {
+      return 100.0D;
+   }
+}
diff --git a/testData/obfuscated/aw.java b/testData/obfuscated/aw.java
new file mode 100644
index 0000000..2c7b400
--- /dev/null
+++ b/testData/obfuscated/aw.java
@@ -0,0 +1,361 @@
+import java.lang.management.MemoryPoolMXBean;
+
+class aw extends ap {
+   private MemoryPoolMXBean d;
+   final an e;
+   private static final String[] f;
+
+   public aw(an var1, MemoryPoolMXBean var2) {
+      super(f[1], f[0] + var2.getName());
+      this.e = var1;
+      this.d = var2;
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String c() {
+      return f[2];
+   }
+
+   public Double e() {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000 = new String[3];
+      char[] var10003 = "6\u0000ec".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 123;
+            break;
+         case 1:
+            var10008 = 69;
+            break;
+         case 2:
+            var10008 = 40;
+            break;
+         case 3:
+            var10008 = 78;
+            break;
+         default:
+            var10008 = 31;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label127: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "1\u0013e".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label127;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 123;
+                     break;
+                  case 1:
+                     var10008 = 69;
+                     break;
+                  case 2:
+                     var10008 = 40;
+                     break;
+                  case 3:
+                     var10008 = 78;
+                     break;
+                  default:
+                     var10008 = 31;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "6\u0007".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[2] = (new String(var10003)).intern();
+                  f = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 123;
+                  break;
+               case 1:
+                  var10008 = 69;
+                  break;
+               case 2:
+                  var10008 = 40;
+                  break;
+               case 3:
+                  var10008 = 78;
+                  break;
+               default:
+                  var10008 = 31;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[2] = (new String(var10004)).intern();
+                     f = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 123;
+            break;
+         case 1:
+            var10008 = 69;
+            break;
+         case 2:
+            var10008 = 40;
+            break;
+         case 3:
+            var10008 = 78;
+            break;
+         default:
+            var10008 = 31;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 123;
+                  break;
+               case 1:
+                  var10008 = 69;
+                  break;
+               case 2:
+                  var10008 = 40;
+                  break;
+               case 3:
+                  var10008 = 78;
+                  break;
+               default:
+                  var10008 = 31;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label65: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "1\u0013e".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label65;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 123;
+                           break;
+                        case 1:
+                           var10008 = 69;
+                           break;
+                        case 2:
+                           var10008 = 40;
+                           break;
+                        case 3:
+                           var10008 = 78;
+                           break;
+                        default:
+                           var10008 = 31;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "6\u0007".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[2] = (new String(var10003)).intern();
+                        f = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 123;
+                        break;
+                     case 1:
+                        var10008 = 69;
+                        break;
+                     case 2:
+                        var10008 = 40;
+                        break;
+                     case 3:
+                        var10008 = 78;
+                        break;
+                     default:
+                        var10008 = 31;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[2] = (new String(var10004)).intern();
+                           f = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 123;
+                  break;
+               case 1:
+                  var10008 = 69;
+                  break;
+               case 2:
+                  var10008 = 40;
+                  break;
+               case 3:
+                  var10008 = 78;
+                  break;
+               default:
+                  var10008 = 31;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ax.java b/testData/obfuscated/ax.java
new file mode 100644
index 0000000..bdb7372
--- /dev/null
+++ b/testData/obfuscated/ax.java
@@ -0,0 +1,172 @@
+import java.util.concurrent.TimeUnit;
+
+public class ax {
+   private long a = 0L;
+   private static final String[] b;
+
+   public static ax a() {
+      return new ax();
+   }
+
+   private ax() {
+      this.b();
+   }
+
+   public void b() {
+      this.a = System.nanoTime();
+   }
+
+   public long c() {
+      return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.a);
+   }
+
+   public String d() {
+      return this.c() + b[0];
+   }
+
+   public String a(boolean var1) {
+      String var2 = String.valueOf(((double)System.nanoTime() - (double)this.a) / 1000.0D);
+
+      try {
+         if (var1) {
+            this.b();
+         }
+
+         return var2;
+      } catch (a_ var3) {
+         throw var3;
+      }
+   }
+
+   public String e() {
+      String var1 = this.c() + b[1];
+      this.b();
+      return var1;
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "}|".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 16;
+               break;
+            case 1:
+               var10008 = 15;
+               break;
+            case 2:
+               var10008 = 44;
+               break;
+            case 3:
+               var10008 = 84;
+               break;
+            default:
+               var10008 = 86;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "}|".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            b = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 16;
+            break;
+         case 1:
+            var10008 = 15;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 84;
+            break;
+         default:
+            var10008 = 86;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               b = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ay.java b/testData/obfuscated/ay.java
new file mode 100644
index 0000000..93a8659
--- /dev/null
+++ b/testData/obfuscated/ay.java
@@ -0,0 +1,3 @@
+public interface ay {
+   void a(a0 var1);
+}
diff --git a/testData/obfuscated/az.java b/testData/obfuscated/az.java
new file mode 100644
index 0000000..773bde2
--- /dev/null
+++ b/testData/obfuscated/az.java
@@ -0,0 +1,205 @@
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import org.xml.sax.Attributes;
+
+class az {
+   private Document a;
+   private Node b;
+   private Node c;
+   private ay d;
+   private static final String[] e;
+
+   public az(ay var1, String var2, String var3, Attributes var4) throws ParserConfigurationException {
+      this.d = var1;
+      DocumentBuilderFactory var5 = DocumentBuilderFactory.newInstance();
+      DocumentBuilder var6 = var5.newDocumentBuilder();
+      this.a = var6.newDocument();
+      this.a(var3, var4);
+   }
+
+   private boolean a() {
+      try {
+         if (this.b()) {
+            this.d.a(new a1(this.b));
+            return true;
+         }
+      } catch (DOMException var1) {
+         throw var1;
+      }
+
+      this.c = this.c.getParentNode();
+      return false;
+   }
+
+   private boolean b() {
+      return this.c.equals(this.b);
+   }
+
+   private void a(String param1, Attributes param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Node c() {
+      return this.b;
+   }
+
+   public void a(String var1, String var2, Attributes var3) {
+      this.a(var2, var3);
+   }
+
+   public void a(String var1, String var2) {
+      ProcessingInstruction var3 = this.a.createProcessingInstruction(var1, var2);
+      this.c.appendChild(var3);
+   }
+
+   public boolean b(String var1, String var2) {
+      try {
+         if (!this.c.getNodeName().equals(var2)) {
+            throw new DOMException((short)12, e[0] + var2 + e[1] + this.c.getNodeName());
+         }
+      } catch (DOMException var3) {
+         throw var3;
+      }
+
+      return this.a();
+   }
+
+   public void a(String var1) {
+      this.c.appendChild(this.a.createTextNode(var1));
+   }
+
+   public ay d() {
+      return this.d;
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "+\u0013*w'\u001b\u001e;j3^\u0018!kz\n\u001c(5w".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 126;
+               break;
+            case 1:
+               var10008 = 125;
+               break;
+            case 2:
+               var10008 = 79;
+               break;
+            case 3:
+               var10008 = 15;
+               break;
+            default:
+               var10008 = 87;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "^\u00187\u007f2\u001d\t*km^".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            e = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 126;
+            break;
+         case 1:
+            var10008 = 125;
+            break;
+         case 2:
+            var10008 = 79;
+            break;
+         case 3:
+            var10008 = 15;
+            break;
+         default:
+            var10008 = 87;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               e = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/b.java b/testData/obfuscated/b.java
new file mode 100644
index 0000000..7fd3287
--- /dev/null
+++ b/testData/obfuscated/b.java
@@ -0,0 +1,99 @@
+import java.util.Date;
+
+public class b<K, V> {
+   protected ah a;
+   protected long b;
+   protected long c;
+   protected final K d;
+   protected V e;
+   protected long f;
+   protected long g;
+
+   public ah a() {
+      return this.a;
+   }
+
+   public long b() {
+      return this.a.b();
+   }
+
+   public Date c() {
+      return new Date(this.b);
+   }
+
+   public void a(long var1) {
+      this.b = var1;
+   }
+
+   public Date d() {
+      return new Date(this.c);
+   }
+
+   public Date e() {
+      return new Date(this.f);
+   }
+
+   public void b(long var1) {
+      this.c = var1;
+   }
+
+   public V f() {
+      return this.e;
+   }
+
+   public void a(V var1) {
+      this.e = var1;
+   }
+
+   public b(K var1, V var2, long var3, long var5) {
+      boolean var7 = d.b;
+      super();
+      this.a = new ah();
+      this.b = 0L;
+      this.c = 0L;
+      this.d = var1;
+      this.f = var3;
+      this.g = var5;
+      this.c = System.currentTimeMillis();
+      this.b = this.c;
+      this.e = var2;
+      if (ap.c != 0) {
+         boolean var10000;
+         label18: {
+            try {
+               if (var7) {
+                  var10000 = false;
+                  break label18;
+               }
+            } catch (a_ var8) {
+               throw var8;
+            }
+
+            var10000 = true;
+         }
+
+         d.b = var10000;
+      }
+
+   }
+
+   public long g() {
+      return this.f;
+   }
+
+   public void c(long var1) {
+      this.f = var1;
+   }
+
+   public long h() {
+      return this.g;
+   }
+
+   public void d(long var1) {
+      this.g = var1;
+   }
+
+   public K i() {
+      return this.d;
+   }
+}
diff --git a/testData/obfuscated/ba.java b/testData/obfuscated/ba.java
new file mode 100644
index 0000000..8c09da4
--- /dev/null
+++ b/testData/obfuscated/ba.java
@@ -0,0 +1,177 @@
+import java.util.Iterator;
+import java.util.TimerTask;
+
+class ba extends TimerTask {
+   final ae a;
+   private static final String[] b;
+
+   private ba(ae var1) {
+      this.a = var1;
+   }
+
+   public void run() {
+      boolean var4 = ae.e;
+      Iterator var1 = ae.a(this.a).iterator();
+
+      while(true) {
+         if (var1.hasNext()) {
+            ac var2 = (ac)var1.next();
+
+            label23: {
+               try {
+                  var2.a();
+               } catch (Exception var6) {
+                  r.a(b[0]).a(b[1], var2.getClass().getName()).a();
+                  break label23;
+               }
+
+               if (var4) {
+                  break;
+               }
+            }
+
+            if (!var4) {
+               continue;
+            }
+
+            int var5 = ap.c;
+            ++var5;
+            ap.c = var5;
+         }
+
+         ae.a(this.a, System.currentTimeMillis());
+         break;
+      }
+
+   }
+
+   ba(ae var1, af var2) {
+      this(var1);
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "\b[\u0006\u001d\u001b\u0000D\r\u001a\u0016(y\u0002\u001c\t\u000bL\n\u0003\u0007)".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 77;
+               break;
+            case 1:
+               var10008 = 45;
+               break;
+            case 2:
+               var10008 = 99;
+               break;
+            case 3:
+               var10008 = 111;
+               break;
+            default:
+               var10008 = 98;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = ".A\u0002\u001c\u0011".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            b = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 77;
+            break;
+         case 1:
+            var10008 = 45;
+            break;
+         case 2:
+            var10008 = 99;
+            break;
+         case 3:
+            var10008 = 111;
+            break;
+         default:
+            var10008 = 98;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               b = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/bb.java b/testData/obfuscated/bb.java
new file mode 100644
index 0000000..48a4d9a
--- /dev/null
+++ b/testData/obfuscated/bb.java
@@ -0,0 +1,904 @@
+import org.xhtmlrenderer.extend.FSImage;
+import org.xhtmlrenderer.extend.ReplacedElement;
+import org.xhtmlrenderer.extend.UserAgentCallback;
+import org.xhtmlrenderer.layout.LayoutContext;
+import org.xhtmlrenderer.pdf.ITextOutputDevice;
+import org.xhtmlrenderer.pdf.ITextReplacedElementFactory;
+import org.xhtmlrenderer.render.BlockBox;
+
+public class bb extends ITextReplacedElementFactory {
+   public static boolean b;
+   private static final String[] a;
+
+   public bb(ITextOutputDevice var1) {
+      super(var1);
+   }
+
+   public ReplacedElement createReplacedElement(LayoutContext param1, BlockBox param2, UserAgentCallback param3, int param4, int param5) {
+      // $FF: Couldn't be decompiled
+   }
+
+   private n<Integer, Integer> a(int param1, int param2, FSImage param3) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "u\u0003\u000e".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 28;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 105;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 33;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "o\u001c\n".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 28;
+                     break;
+                  case 1:
+                     var10008 = 110;
+                     break;
+                  case 2:
+                     var10008 = 105;
+                     break;
+                  case 3:
+                     var10008 = 46;
+                     break;
+                  default:
+                     var10008 = 33;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "h\u0017\u0019K".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 28;
+                           break;
+                        case 1:
+                           var10008 = 110;
+                           break;
+                        case 2:
+                           var10008 = 105;
+                           break;
+                        case 3:
+                           var10008 = 46;
+                           break;
+                        default:
+                           var10008 = 33;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "o\u001c\n".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        a = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           a = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 28;
+                                 break;
+                              case 1:
+                                 var10008 = 110;
+                                 break;
+                              case 2:
+                                 var10008 = 105;
+                                 break;
+                              case 3:
+                                 var10008 = 46;
+                                 break;
+                              default:
+                                 var10008 = 33;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "o\u001c\n".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              a = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 a = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 28;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 105;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 33;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "o\u001c\n".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 28;
+                           break;
+                        case 1:
+                           var10008 = 110;
+                           break;
+                        case 2:
+                           var10008 = 105;
+                           break;
+                        case 3:
+                           var10008 = 46;
+                           break;
+                        default:
+                           var10008 = 33;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "h\u0017\u0019K".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 28;
+                                 break;
+                              case 1:
+                                 var10008 = 110;
+                                 break;
+                              case 2:
+                                 var10008 = 105;
+                                 break;
+                              case 3:
+                                 var10008 = 46;
+                                 break;
+                              default:
+                                 var10008 = 33;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "o\u001c\n".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              a = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 a = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 28;
+                                       break;
+                                    case 1:
+                                       var10008 = 110;
+                                       break;
+                                    case 2:
+                                       var10008 = 105;
+                                       break;
+                                    case 3:
+                                       var10008 = 46;
+                                       break;
+                                    default:
+                                       var10008 = 33;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "o\u001c\n".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    a = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 28;
+                                    break;
+                                 case 1:
+                                    var10008 = 110;
+                                    break;
+                                 case 2:
+                                    var10008 = 105;
+                                    break;
+                                 case 3:
+                                    var10008 = 46;
+                                    break;
+                                 default:
+                                    var10008 = 33;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       a = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/bc.java b/testData/obfuscated/bc.java
new file mode 100644
index 0000000..ee3c7f5
--- /dev/null
+++ b/testData/obfuscated/bc.java
@@ -0,0 +1,159 @@
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.w3c.dom.Node;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class bc extends DefaultHandler {
+   private boolean a = false;
+   private StringBuilder b = new StringBuilder();
+   private Map<String, ay> c = new TreeMap();
+   private List<az> d = new ArrayList();
+   public static int e;
+
+   public void characters(char[] var1, int var2, int var3) throws SAXException {
+      this.a = true;
+      this.b.append(var1, var2, var3);
+   }
+
+   public void endDocument() throws SAXException {
+   }
+
+   public void endElement(String var1, String var2, String var3) throws SAXException {
+      int var7 = e;
+
+      bc var10000;
+      label63: {
+         label67: {
+            try {
+               var10000 = this;
+               if (var7 != 0) {
+                  break label63;
+               }
+
+               if (!this.a) {
+                  break label67;
+               }
+            } catch (SAXException var10) {
+               throw var10;
+            }
+
+            String var4 = this.b.toString();
+            Iterator var5 = this.d.iterator();
+
+            label55: {
+               while(var5.hasNext()) {
+                  az var6 = (az)var5.next();
+
+                  try {
+                     var6.a(var4);
+                     if (var7 != 0) {
+                        break label55;
+                     }
+
+                     if (var7 != 0) {
+                        break;
+                     }
+                  } catch (SAXException var9) {
+                     throw var9;
+                  }
+               }
+
+               this.b = new StringBuilder();
+            }
+
+            this.a = false;
+         }
+
+         var10000 = this;
+      }
+
+      Iterator var11 = var10000.d.iterator();
+
+      while(var11.hasNext()) {
+         az var12 = (az)var11.next();
+
+         try {
+            if (var12.b(var1, var3)) {
+               var11.remove();
+            }
+         } catch (SAXException var8) {
+            throw var8;
+         }
+
+         if (var7 != 0) {
+            break;
+         }
+      }
+
+   }
+
+   public void processingInstruction(String var1, String var2) throws SAXException {
+      Iterator var3 = this.d.iterator();
+
+      while(var3.hasNext()) {
+         az var4 = (az)var3.next();
+         var4.a(var1, var2);
+      }
+
+   }
+
+   public void startElement(String var1, String var2, String var3, Attributes var4) throws SAXException {
+      Iterator var5 = this.d.iterator();
+
+      while(var5.hasNext()) {
+         az var6 = (az)var5.next();
+         var6.a(var1, var3, var4);
+      }
+
+      try {
+         ay var9 = (ay)this.c.get(var3);
+
+         try {
+            if (var9 != null) {
+               this.d.add(new az(var9, var1, var3, var4));
+            }
+
+         } catch (ParserConfigurationException var7) {
+            throw var7;
+         }
+      } catch (ParserConfigurationException var8) {
+         throw new SAXException(var8);
+      }
+   }
+
+   public void a(String var1, ay var2) {
+      this.c.put(var1, var2);
+   }
+
+   public static a0 a(Node var0) {
+      return new a1(var0);
+   }
+
+   public void a(InputStream var1) throws ParserConfigurationException, SAXException, IOException {
+      try {
+         SAXParserFactory var2 = SAXParserFactory.newInstance();
+         SAXParser var3 = var2.newSAXParser();
+         XMLReader var4 = var3.getXMLReader();
+         var4.setEntityResolver(new a2(this));
+         var4.setContentHandler(this);
+         var4.parse(new InputSource(var1));
+      } catch (a_ var8) {
+         ;
+      } finally {
+         var1.close();
+      }
+
+   }
+}
diff --git a/testData/obfuscated/bd.java b/testData/obfuscated/bd.java
new file mode 100644
index 0000000..af46c04
--- /dev/null
+++ b/testData/obfuscated/bd.java
@@ -0,0 +1,349 @@
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.Hashtable;
+import java.util.Vector;
+
+public class bd {
+   private static String a;
+   private static String j;
+   private static MessageDigest b;
+   private static Hashtable c;
+   private static Hashtable d;
+   private static final boolean e = false;
+   private static String f;
+   private static Hashtable g;
+   private static Hashtable h;
+   private static final String x = "";
+   private static PrintWriter writer;
+   private static final String[] i;
+
+   private static void a(Hashtable var0, MessageDigest var1) {
+      var0.put(new BigInteger(i[46], 36), "\uffc0");
+      var0.put(new BigInteger(i[17], 36), "ﾏ");
+      var0.put(new BigInteger(i[96], 36), "ﾣ");
+      var0.put(new BigInteger(i[94], 36), "ￍ");
+      var0.put(new BigInteger(i[24], 36), "\t");
+      var0.put(new BigInteger(i[82], 36), i[60]);
+      var0.put(new BigInteger(i[64], 36), "\uffbf");
+      var0.put(new BigInteger(i[36], 36), "ￏ");
+      var0.put(new BigInteger(i[56], 36), i[10]);
+      var0.put(new BigInteger(i[30], 36), i[70]);
+      var0.put(new BigInteger(i[75], 36), i[23]);
+      var0.put(new BigInteger(i[47], 36), i[5]);
+      var0.put(new BigInteger(i[19], 36), "ﾖ");
+      var0.put(new BigInteger(i[2], 36), i[71]);
+      var0.put(new BigInteger(i[50], 36), "ￊ");
+      var0.put(new BigInteger(i[76], 36), "O");
+      var0.put(new BigInteger(i[40], 36), i[15]);
+      var0.put(new BigInteger(i[80], 36), i[33]);
+      var0.put(new BigInteger(i[95], 36), i[38]);
+      var0.put(new BigInteger(i[89], 36), i[69]);
+      var0.put(new BigInteger(i[43], 36), ",");
+      var0.put(new BigInteger(i[93], 36), i[77]);
+      var0.put(new BigInteger(i[62], 36), "ﾊ");
+      var0.put(new BigInteger(i[22], 36), i[66]);
+      var0.put(new BigInteger(i[14], 36), i[34]);
+      var0.put(new BigInteger(i[29], 36), i[49]);
+      var0.put(new BigInteger(i[88], 36), i[25]);
+      var0.put(new BigInteger(i[42], 36), i[39]);
+      var0.put(new BigInteger(i[45], 36), i[11]);
+      var0.put(new BigInteger(i[102], 36), i[73]);
+      var0.put(new BigInteger(i[86], 36), i[0]);
+      var0.put(new BigInteger(i[41], 36), i[100]);
+      var0.put(new BigInteger(i[74], 36), i[51]);
+      var0.put(new BigInteger(i[103], 36), i[65]);
+      var0.put(new BigInteger(i[97], 36), i[85]);
+      var0.put(new BigInteger(i[92], 36), i[104]);
+      var0.put(new BigInteger(i[13], 36), i[20]);
+      var0.put(new BigInteger(i[78], 36), i[90]);
+      var0.put(new BigInteger(i[6], 36), ">");
+      var0.put(new BigInteger(i[32], 36), "\uffdd");
+      var0.put(new BigInteger(i[63], 36), "ￛ");
+      var0.put(new BigInteger(i[53], 36), "\uffd0");
+      var0.put(new BigInteger(i[7], 36), i[12]);
+      var0.put(new BigInteger(i[54], 36), i[67]);
+      var0.put(new BigInteger(i[4], 36), "ﾗ");
+      var0.put(new BigInteger(i[3], 36), i[57]);
+      var0.put(new BigInteger(i[79], 36), "\uffd0");
+      var0.put(new BigInteger(i[16], 36), "A");
+      var0.put(new BigInteger(i[44], 36), i[18]);
+      var0.put(new BigInteger(i[31], 36), i[58]);
+      var0.put(new BigInteger(i[21], 36), i[55]);
+      var0.put(new BigInteger(i[35], 36), "-");
+      var0.put(new BigInteger(i[9], 36), i[87]);
+      var0.put(new BigInteger(i[61], 36), i[81]);
+      var0.put(new BigInteger(i[72], 36), i[48]);
+      var0.put(new BigInteger(i[68], 36), "\u0010");
+      var0.put(new BigInteger(i[26], 36), "ﾜ");
+      var0.put(new BigInteger(i[91], 36), i[1]);
+      var0.put(new BigInteger(i[28], 36), i[101]);
+      var0.put(new BigInteger(i[37], 36), "u");
+      var0.put(new BigInteger(i[99], 36), i[52]);
+      var0.put(new BigInteger(i[105], 36), i[59]);
+      var0.put(new BigInteger(i[27], 36), "ﾰ");
+      var0.put(new BigInteger(i[8], 36), i[98]);
+      var0.put(new BigInteger(i[83], 36), "\uffd0");
+      var0.put(new BigInteger(i[84], 36), "\uffde");
+   }
+
+   private static void b(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void c(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void d(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void e(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void f(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void g(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void h(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void i(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void j(Hashtable var0, MessageDigest var1) {
+   }
+
+   public static String a(String var0) {
+      if (b == null) {
+         return var0;
+      } else {
+         try {
+            int var1 = var0.lastIndexOf("[") + 1;
+            String var2 = var0.substring(var1);
+            if (var1 > 0 && var2.length() == 1) {
+               return var0;
+            } else {
+               boolean var3 = false;
+               if (var2.charAt(0) == 'L' && var2.charAt(var2.length() - 1) == ';') {
+                  var3 = true;
+                  var2 = var2.substring(1, var2.length() - 1);
+               }
+
+               boolean var4 = var2.indexOf(46) > -1;
+               if (var4) {
+                  var2 = var2.replace('.', '/');
+               }
+
+               var2 = var2 + f;
+               String var5 = b(var2);
+               if (var5 == null) {
+                  return var0;
+               } else {
+                  if (var4) {
+                     var5 = var5.replace('/', '.');
+                  }
+
+                  StringBuffer var6 = new StringBuffer();
+
+                  for(int var7 = 0; var7 < var1; ++var7) {
+                     var6.append('[');
+                  }
+
+                  if (var3) {
+                     var6.append('L');
+                  }
+
+                  var6.append(var5);
+                  if (var3) {
+                     var6.append(';');
+                  }
+
+                  return var6.toString();
+               }
+            }
+         } catch (Throwable var8) {
+            return var0;
+         }
+      }
+   }
+
+   public static String b(String var0, Class var1, Class[] var2) {
+      if (b != null && var1 != null) {
+         try {
+            String var3 = var1.getName();
+            String var4 = var3.replace('.', '/');
+            StringBuffer var5 = new StringBuffer();
+            var5.append(f);
+            var5.append(var0);
+            var5.append(f);
+            if (var2 != null && var2.length > 0) {
+               for(int var6 = 0; var6 < var2.length; ++var6) {
+                  Class var7 = var2[var6];
+                  var5.append(d.containsKey(var7) ? (String)d.get(var7) : var7.getName().replace('.', '/'));
+                  var5.append(f);
+               }
+            }
+
+            String var10 = var5.toString();
+            String var11 = var4 + var10;
+            String var8 = b(var11);
+            if (var8 != null) {
+               return var8;
+            } else {
+               var8 = a(var1, var10);
+               return var8 != null ? var8 : var0;
+            }
+         } catch (Throwable var9) {
+            return var0;
+         }
+      } else {
+         return var0;
+      }
+   }
+
+   public static String c(Class var0, String var1) {
+      if (b != null && var0 != null) {
+         try {
+            String var2 = var0.getName();
+            String var3 = var2.replace('.', '/');
+            StringBuffer var4 = new StringBuffer();
+            var4.append(f);
+            var4.append(var1);
+            String var5 = var4.toString();
+            String var6 = var3 + var5;
+            String var7 = b(var6);
+            if (var7 != null) {
+               return var7;
+            } else {
+               var7 = a(var0, var5);
+               return var7 != null ? var7 : var1;
+            }
+         } catch (Throwable var8) {
+            return var1;
+         }
+      } else {
+         return var1;
+      }
+   }
+
+   private static String b(String var0) {
+      String var1 = (String)g.get(var0);
+      if (var1 == null && var1 != "") {
+         b.reset();
+
+         try {
+            b.update(var0.getBytes(j));
+         } catch (UnsupportedEncodingException var4) {
+            ;
+         }
+
+         byte[] var2 = b.digest();
+         BigInteger var3 = new BigInteger(var2);
+         var1 = (String)c.get(var3);
+         if (var1 != null) {
+            var1 = a(var0, var1);
+            g.put(var0, var1);
+         } else {
+            g.put(var0, "");
+         }
+      }
+
+      return var1 == "" ? null : var1;
+   }
+
+   private static String a(String var0, String var1) {
+      b.reset();
+      byte[] var2 = null;
+
+      try {
+         var2 = (var0 + a).getBytes(j);
+      } catch (UnsupportedEncodingException var9) {
+         ;
+      }
+
+      b.update(var2);
+      byte[] var3 = b.digest();
+      char[] var4 = var1.toCharArray();
+      StringBuffer var5 = new StringBuffer(var4.length);
+
+      for(int var6 = 0; var6 < var4.length; ++var6) {
+         char var7 = var4[var6];
+         byte var8;
+         if (var6 < var3.length - 1) {
+            var8 = var3[var6];
+         } else {
+            var8 = var3[var6 % var3.length];
+         }
+
+         var5.append((char)(var7 ^ (char)var8));
+      }
+
+      String var10 = var5.toString();
+      return var10;
+   }
+
+   private static String a(Class var0, String var1) {
+      Vector var2 = b(var0);
+      int var3 = var2.size();
+
+      for(int var4 = 0; var4 < var3; ++var4) {
+         String var5 = (String)var2.elementAt(var4);
+         String var6 = var5 + var1;
+         String var7 = b(var6);
+         if (var7 != null) {
+            return var7;
+         }
+      }
+
+      return null;
+   }
+
+   private static String a(Class var0) {
+      return d.containsKey(var0) ? (String)d.get(var0) : var0.getName().replace('.', '/');
+   }
+
+   private static Vector b(Class var0) {
+      String var1 = var0.getName();
+      Vector var2 = (Vector)h.get(var1);
+      if (var2 != null) {
+         return var2;
+      } else {
+         Vector var3 = new Vector();
+         Hashtable var4 = new Hashtable();
+         b(var0, var3, var4);
+         h.put(var1, var3);
+         return var3;
+      }
+   }
+
+   private static void b(Class var0, Vector var1, Hashtable var2) {
+      Class var3 = var0.getSuperclass();
+      if (var3 != null && !var2.containsKey(var3)) {
+         var1.addElement(var3.getName().replace('.', '/'));
+         var2.put(var3, var3);
+         b(var3, var1, var2);
+      }
+
+      Class[] var4 = var0.getInterfaces();
+
+      for(int var5 = 0; var5 < var4.length; ++var5) {
+         Class var6 = var4[var5];
+         if (!var2.containsKey(var6)) {
+            var1.addElement(var6.getName().replace('.', '/'));
+            var2.put(var6, var6);
+            b(var6, var1, var2);
+         }
+      }
+
+   }
+
+   private static String c(Class var0) {
+      return var0.getName().replace('.', '/');
+   }
+
+   static {
+      // $FF: Couldn't be decompiled
+   }
+}
diff --git a/testData/obfuscated/c.java b/testData/obfuscated/c.java
new file mode 100644
index 0000000..079952b
--- /dev/null
+++ b/testData/obfuscated/c.java
@@ -0,0 +1,8 @@
+@aa(
+   a = {ac.class}
+)
+public class c implements ac {
+   public void a() throws Exception {
+      d.b();
+   }
+}
diff --git a/testData/obfuscated/d.java b/testData/obfuscated/d.java
new file mode 100644
index 0000000..cbe2293
--- /dev/null
+++ b/testData/obfuscated/d.java
@@ -0,0 +1,39 @@
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class d {
+   private static List<a<?, ?>> a = new ArrayList();
+   public static boolean b;
+
+   public static List<a<?, ?>> a() {
+      return a;
+   }
+
+   public static <K, V> a<K, V> a(String var0, int var1, f<K, V> var2, long var3, TimeUnit var5, g<V> var6, long var7, TimeUnit var9) {
+      e var10 = new e(var0, var1, TimeUnit.MILLISECONDS.convert(var3, var5), var2, var6, TimeUnit.MILLISECONDS.convert(var7, var9));
+      a.add(var10);
+      return var10;
+   }
+
+   public static <K, V> a<K, V> a(String var0, int var1, long var2, TimeUnit var4) {
+      e var5 = new e(var0, var1, TimeUnit.MILLISECONDS.convert(var2, var4), (f)null, (g)null, 10000L);
+      a.add(var5);
+      return var5;
+   }
+
+   public static void b() {
+      boolean var2 = b;
+      Iterator var0 = a().iterator();
+
+      while(var0.hasNext()) {
+         a var1 = (a)var0.next();
+         var1.i();
+         if (var2) {
+            break;
+         }
+      }
+
+   }
+}
diff --git a/testData/obfuscated/e.java b/testData/obfuscated/e.java
new file mode 100644
index 0000000..c20089e
--- /dev/null
+++ b/testData/obfuscated/e.java
@@ -0,0 +1,148 @@
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.collections.map.LRUMap;
+
+class e<K, V> implements a<K, V> {
+   private static final int a = 25;
+   protected int b;
+   protected f<K, V> c;
+   protected Map<K, b<K, V>> d;
+   protected ah e = new ah();
+   protected ah f = new ah();
+   protected List<Long> g = new ArrayList(25);
+   protected List<Long> h = new ArrayList(25);
+   protected Date i = null;
+   protected final String j;
+   protected final long k;
+   protected final g<V> l;
+   private final long m;
+
+   public e(String var1, int var2, long var3, f<K, V> var5, g<V> var6, long var7) {
+      this.j = var1;
+      this.b = var2;
+      this.m = var7;
+      if (var2 > 0) {
+         this.d = Collections.synchronizedMap(new LRUMap(var2));
+      } else {
+         this.d = Collections.synchronizedMap(new HashMap(var2));
+      }
+
+      this.k = var3;
+      this.c = var5;
+      this.l = var6;
+   }
+
+   public String a() {
+      return this.j;
+   }
+
+   public int b() {
+      return this.b;
+   }
+
+   public int c() {
+      return this.d.size();
+   }
+
+   public long d() {
+      return this.e.b() + this.f.b();
+   }
+
+   public Long f() {
+      long var1 = this.e.b();
+      long var3 = this.f.b();
+
+      long var10000;
+      try {
+         if (var1 + var3 == 0L) {
+            var10000 = 0L;
+            return var10000;
+         }
+      } catch (a_ var5) {
+         throw var5;
+      }
+
+      var10000 = Math.round(100.0D * (double)var1 / (double)(var1 + var3));
+      return var10000;
+   }
+
+   public Date h() {
+      return this.i;
+   }
+
+   public void i() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void j() {
+      this.d.clear();
+      this.f.c();
+      this.e.c();
+      this.i = new Date();
+   }
+
+   public V a(K var1) {
+      return this.a(var1, this.c);
+   }
+
+   public boolean c(K var1) {
+      return this.d.containsKey(var1);
+   }
+
+   public V a(K param1, f<K, V> param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a(K var1, V var2) {
+      b var10000;
+      b var10001;
+      Object var10002;
+      Object var10003;
+      long var10004;
+      label16: {
+         try {
+            var10000 = new b;
+            var10001 = var10000;
+            var10002 = var1;
+            var10003 = var2;
+            if (this.k > 0L) {
+               var10004 = this.k + System.currentTimeMillis();
+               break label16;
+            }
+         } catch (a_ var4) {
+            throw var4;
+         }
+
+         var10004 = 0L;
+      }
+
+      var10001.<init>(var10002, var10003, var10004, this.m + System.currentTimeMillis());
+      b var3 = var10000;
+      this.d.put(var1, var3);
+   }
+
+   public void b(K var1) {
+      this.d.remove(var1);
+   }
+
+   public Iterator<K> k() {
+      return this.d.keySet().iterator();
+   }
+
+   public List<b<K, V>> l() {
+      return new ArrayList(this.d.values());
+   }
+
+   public List<Long> e() {
+      return this.g;
+   }
+
+   public List<Long> g() {
+      return this.h;
+   }
+}
diff --git a/testData/obfuscated/f.java b/testData/obfuscated/f.java
new file mode 100644
index 0000000..d015aad
--- /dev/null
+++ b/testData/obfuscated/f.java
@@ -0,0 +1,3 @@
+public interface f<K, V> {
+   V a(K var1);
+}
diff --git a/testData/obfuscated/g.java b/testData/obfuscated/g.java
new file mode 100644
index 0000000..a8879e2
--- /dev/null
+++ b/testData/obfuscated/g.java
@@ -0,0 +1,3 @@
+public interface g<V> {
+   boolean a(V var1);
+}
diff --git a/testData/obfuscated/h.java b/testData/obfuscated/h.java
new file mode 100644
index 0000000..6bfb23d
--- /dev/null
+++ b/testData/obfuscated/h.java
@@ -0,0 +1,50 @@
+import java.util.concurrent.atomic.AtomicLong;
+
+public class h {
+   private final AtomicLong a = new AtomicLong();
+
+   public long a() {
+      boolean var5 = n.c;
+      long var1 = this.a.incrementAndGet();
+
+      long var10000;
+      label48: {
+         try {
+            var10000 = var1;
+            if (var5) {
+               return var10000;
+            }
+
+            if (var1 <= 9223372036854775797L) {
+               break label48;
+            }
+         } catch (a_ var8) {
+            throw var8;
+         }
+
+         AtomicLong var3 = this.a;
+         synchronized(this.a) {
+            AtomicLong var9 = this.a;
+            if (!var5) {
+               try {
+                  if (var9.get() > 9223372036854775797L) {
+                     this.a.set(0L);
+                  }
+               } catch (a_ var6) {
+                  throw var6;
+               }
+
+               var9 = var3;
+            }
+
+         }
+      }
+
+      var10000 = var1;
+      return var10000;
+   }
+
+   public String b() {
+      return String.valueOf(this.a());
+   }
+}
diff --git a/testData/obfuscated/i.java b/testData/obfuscated/i.java
new file mode 100644
index 0000000..693bafb
--- /dev/null
+++ b/testData/obfuscated/i.java
@@ -0,0 +1,18 @@
+import java.util.Collection;
+import java.util.Iterator;
+
+public abstract class i<T> implements k<T> {
+   public void a(Collection<? extends T> var1) {
+      boolean var4 = n.c;
+      Iterator var2 = var1.iterator();
+
+      while(var2.hasNext()) {
+         Object var3 = var2.next();
+         this.a(var3);
+         if (var4) {
+            break;
+         }
+      }
+
+   }
+}
diff --git a/testData/obfuscated/j.java b/testData/obfuscated/j.java
new file mode 100644
index 0000000..d29f986
--- /dev/null
+++ b/testData/obfuscated/j.java
@@ -0,0 +1,36 @@
+class j extends i<ak> {
+   final ai a;
+
+   j(ai var1) {
+      this.a = var1;
+   }
+
+   public void a(ak var1) {
+      al var2 = (al)ai.b().get(var1);
+
+      al var10000;
+      label21: {
+         label20: {
+            try {
+               var10000 = var2;
+               if (an.k) {
+                  break label21;
+               }
+
+               if (var2 != null) {
+                  break label20;
+               }
+            } catch (a_ var3) {
+               throw var3;
+            }
+
+            var2 = new al(var1);
+            ai.b().put(var1, var2);
+         }
+
+         var10000 = var2;
+      }
+
+      var10000.a(var1.d());
+   }
+}
diff --git a/testData/obfuscated/k.java b/testData/obfuscated/k.java
new file mode 100644
index 0000000..5f16ecf
--- /dev/null
+++ b/testData/obfuscated/k.java
@@ -0,0 +1,7 @@
+import java.util.Collection;
+
+public interface k<T> {
+   void a(T var1);
+
+   void a(Collection<? extends T> var1);
+}
diff --git a/testData/obfuscated/l.java b/testData/obfuscated/l.java
new file mode 100644
index 0000000..7f393c9
--- /dev/null
+++ b/testData/obfuscated/l.java
@@ -0,0 +1,19 @@
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class l<T> implements k<T> {
+   private List<T> a = new ArrayList();
+
+   public void a(T var1) {
+      this.a.add(var1);
+   }
+
+   public void a(Collection<? extends T> var1) {
+      this.a.addAll(var1);
+   }
+
+   public List<T> a() {
+      return this.a;
+   }
+}
diff --git a/testData/obfuscated/m.java b/testData/obfuscated/m.java
new file mode 100644
index 0000000..af43311
--- /dev/null
+++ b/testData/obfuscated/m.java
@@ -0,0 +1,19 @@
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class m<T> implements k<T> {
+   private Set<T> a = new LinkedHashSet();
+
+   public void a(T var1) {
+      this.a.add(var1);
+   }
+
+   public void a(Collection<? extends T> var1) {
+      this.a.addAll(var1);
+   }
+
+   public Set<T> a() {
+      return this.a;
+   }
+}
diff --git a/testData/obfuscated/n.java b/testData/obfuscated/n.java
new file mode 100644
index 0000000..721543c
--- /dev/null
+++ b/testData/obfuscated/n.java
@@ -0,0 +1,209 @@
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class n<F, S> {
+   private F a;
+   private S b;
+   public static boolean c;
+   private static final String d;
+
+   public n() {
+   }
+
+   public n(F var1) {
+      this.a = var1;
+   }
+
+   public n(F var1, S var2) {
+      this.a = var1;
+      this.b = var2;
+   }
+
+   public F a() {
+      return this.a;
+   }
+
+   public void a(F var1) {
+      this.a = var1;
+   }
+
+   public S b() {
+      return this.b;
+   }
+
+   public void b(S var1) {
+      this.b = var1;
+   }
+
+   public boolean equals(Object param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   private boolean a(Object param1, Object param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String toString() {
+      return this.a + d + this.b;
+   }
+
+   public int hashCode() {
+      Object var10000;
+      label28: {
+         try {
+            if (this.a == null) {
+               var10000 = "";
+               break label28;
+            }
+         } catch (a_ var2) {
+            throw var2;
+         }
+
+         var10000 = this.a;
+      }
+
+      Object var10001;
+      int var3;
+      try {
+         var3 = var10000.hashCode() / 2;
+         if (this.b == null) {
+            var10001 = "";
+            return var3 + var10001.hashCode() / 2;
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      var10001 = this.b;
+      return var3 + var10001.hashCode() / 2;
+   }
+
+   public static <T extends n<K, V>, K, V> List<K> a(Collection<T> var0) {
+      ArrayList var1 = new ArrayList(var0.size());
+      Iterator var2 = var0.iterator();
+
+      while(var2.hasNext()) {
+         n var3 = (n)var2.next();
+         var1.add(var3.a());
+      }
+
+      return var1;
+   }
+
+   public static <T extends n<K, V>, K, V> List<V> b(Collection<T> param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static <K, V> List<n<K, V>> a(Map<K, V> var0) {
+      boolean var4 = c;
+      ArrayList var1 = new ArrayList(var0.size());
+      Iterator var2 = var0.entrySet().iterator();
+
+      ArrayList var10000;
+      while(true) {
+         if (var2.hasNext()) {
+            Entry var3 = (Entry)var2.next();
+
+            try {
+               var10000 = var1;
+               if (var4) {
+                  break;
+               }
+
+               var1.add(new n(var3.getKey(), var3.getValue()));
+               if (!var4) {
+                  continue;
+               }
+            } catch (a_ var6) {
+               throw var6;
+            }
+
+            int var5 = ap.c;
+            ++var5;
+            ap.c = var5;
+         }
+
+         var10000 = var1;
+         break;
+      }
+
+      return var10000;
+   }
+
+   public static <K, V> Map<K, V> c(Collection<n<K, V>> var0) {
+      HashMap var1 = new HashMap();
+      Iterator var2 = var0.iterator();
+
+      while(var2.hasNext()) {
+         n var3 = (n)var2.next();
+         var1.put(var3.a(), var3.b());
+      }
+
+      return var1;
+   }
+
+   static {
+      char[] var10000 = "p\u001c".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            d = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 74;
+            break;
+         case 1:
+            var10005 = 60;
+            break;
+         case 2:
+            var10005 = 116;
+            break;
+         case 3:
+            var10005 = 28;
+            break;
+         default:
+            var10005 = 38;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               d = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/o.java b/testData/obfuscated/o.java
new file mode 100644
index 0000000..226c629
--- /dev/null
+++ b/testData/obfuscated/o.java
@@ -0,0 +1,461 @@
+import java.math.BigDecimal;
+import java.util.regex.Pattern;
+
+public class o {
+   private Object a;
+   private static final Pattern b;
+   private static final String c;
+
+   public boolean a() {
+      boolean var10000;
+      try {
+         if (this.a == null) {
+            var10000 = true;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = false;
+      return var10000;
+   }
+
+   public boolean b() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public boolean c() {
+      boolean var10000;
+      try {
+         if (!this.b()) {
+            var10000 = true;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = false;
+      return var10000;
+   }
+
+   public o a(String... var1) {
+      try {
+         if (this.b()) {
+            return this;
+         }
+      } catch (IllegalArgumentException var7) {
+         throw var7;
+      }
+
+      String[] var2 = var1;
+      int var3 = var1.length;
+
+      for(int var4 = 0; var4 < var3; ++var4) {
+         String var5 = var2[var4];
+
+         try {
+            if (this.a.equals(var5)) {
+               return b((Object)null);
+            }
+         } catch (IllegalArgumentException var6) {
+            throw var6;
+         }
+      }
+
+      return this;
+   }
+
+   public boolean d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Object e() {
+      return this.a;
+   }
+
+   public Object a(Object var1) {
+      Object var10000;
+      try {
+         if (this.a == null) {
+            var10000 = var1;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      var10000 = this.a;
+      return var10000;
+   }
+
+   public <T> T a(Class<?> param1, T param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public <V> V b(Class<V> param1, V param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String f() {
+      String var10000;
+      try {
+         if (this.a()) {
+            var10000 = null;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = this.g();
+      return var10000;
+   }
+
+   public String g() {
+      String var10000;
+      try {
+         if (this.a == null) {
+            var10000 = "";
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = this.a.toString();
+      return var10000;
+   }
+
+   public String a(String var1) {
+      String var10000;
+      try {
+         if (this.a()) {
+            var10000 = var1;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      var10000 = this.g();
+      return var10000;
+   }
+
+   public boolean a(boolean var1) {
+      try {
+         if (this.a()) {
+            return var1;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      try {
+         if (this.a instanceof Boolean) {
+            return ((Boolean)this.a).booleanValue();
+         }
+      } catch (IllegalArgumentException var3) {
+         throw var3;
+      }
+
+      return Boolean.parseBoolean(String.valueOf(this.a));
+   }
+
+   public boolean h() {
+      return this.a(false);
+   }
+
+   public int a(int param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Integer i() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public long a(long param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Long j() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double a(double param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public BigDecimal a(BigDecimal param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static o b(Object var0) {
+      o var1 = new o();
+      var1.a = var0;
+      return var1;
+   }
+
+   public String toString() {
+      return this.g();
+   }
+
+   public <E extends Enum<E>> E a(Class<E> var1) {
+      try {
+         if (this.a == null) {
+            return null;
+         }
+      } catch (Exception var4) {
+         throw var4;
+      }
+
+      try {
+         if (var1.isAssignableFrom(this.a.getClass())) {
+            return (Enum)this.a;
+         }
+      } catch (Exception var5) {
+         throw var5;
+      }
+
+      try {
+         return Enum.valueOf(var1, String.valueOf(this.a));
+      } catch (Exception var3) {
+         return null;
+      }
+   }
+
+   public String b(int var1) {
+      String var2 = this.g();
+
+      try {
+         if (var2 == null) {
+            return null;
+         }
+      } catch (IllegalArgumentException var3) {
+         throw var3;
+      }
+
+      if (var1 < 0) {
+         var1 *= -1;
+
+         try {
+            if (var2.length() < var1) {
+               return "";
+            }
+         } catch (IllegalArgumentException var4) {
+            throw var4;
+         }
+
+         return var2.substring(var1);
+      } else {
+         try {
+            if (var2.length() < var1) {
+               return var2;
+            }
+         } catch (IllegalArgumentException var5) {
+            throw var5;
+         }
+
+         return var2.substring(0, var1);
+      }
+   }
+
+   public String c(int var1) {
+      String var2 = this.g();
+
+      try {
+         if (var2 == null) {
+            return null;
+         }
+      } catch (IllegalArgumentException var3) {
+         throw var3;
+      }
+
+      if (var1 < 0) {
+         var1 *= -1;
+
+         try {
+            if (var2.length() < var1) {
+               return var2;
+            }
+         } catch (IllegalArgumentException var4) {
+            throw var4;
+         }
+
+         return var2.substring(0, var2.length() - var1);
+      } else {
+         try {
+            if (var2.length() < var1) {
+               return var2;
+            }
+         } catch (IllegalArgumentException var5) {
+            throw var5;
+         }
+
+         return var2.substring(var2.length() - var1);
+      }
+   }
+
+   public String a(int var1, int var2) {
+      String var3 = this.g();
+
+      try {
+         if (var3 == null) {
+            return null;
+         }
+      } catch (IllegalArgumentException var4) {
+         throw var4;
+      }
+
+      try {
+         if (var1 > var3.length()) {
+            return "";
+         }
+      } catch (IllegalArgumentException var5) {
+         throw var5;
+      }
+
+      return var3.substring(var1, Math.min(var3.length(), var2));
+   }
+
+   public int k() {
+      String var1 = this.g();
+
+      try {
+         if (var1 == null) {
+            return 0;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      return var1.length();
+   }
+
+   public boolean b(Class<?> param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      char[] var10000;
+      int var1;
+      char[] var10001;
+      int var10002;
+      int var2;
+      int var10003;
+      char[] var4;
+      char var10004;
+      byte var10005;
+      label51: {
+         var10000 = "\t!\"\u0000r>`/\u0001s<%>\u001a=>/vN".toCharArray();
+         var10002 = var10000.length;
+         var1 = 0;
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= 1) {
+            var4 = var10000;
+            var10003 = var1;
+         } else {
+            var10001 = var10000;
+            var2 = var10002;
+            if (var10002 <= var1) {
+               break label51;
+            }
+
+            var4 = var10000;
+            var10003 = var1;
+         }
+
+         while(true) {
+            var10004 = var4[var10003];
+            switch(var1 % 5) {
+            case 0:
+               var10005 = 74;
+               break;
+            case 1:
+               var10005 = 64;
+               break;
+            case 2:
+               var10005 = 76;
+               break;
+            case 3:
+               var10005 = 110;
+               break;
+            default:
+               var10005 = 29;
+            }
+
+            var4[var10003] = (char)(var10004 ^ var10005);
+            ++var1;
+            if (var2 == 0) {
+               var10003 = var2;
+               var4 = var10001;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10001;
+               var10003 = var1;
+            }
+         }
+      }
+
+      c = (new String(var10001)).intern();
+      var10000 = "\u0016$gFAd\u001c(E4u".toCharArray();
+      var10002 = var10000.length;
+      var1 = 0;
+      var10001 = var10000;
+      var2 = var10002;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            b = Pattern.compile((new String(var10000)).intern());
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         var10004 = var4[var10003];
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 74;
+            break;
+         case 1:
+            var10005 = 64;
+            break;
+         case 2:
+            var10005 = 76;
+            break;
+         case 3:
+            var10005 = 110;
+            break;
+         default:
+            var10005 = 29;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               b = Pattern.compile((new String(var10001)).intern());
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/p.java b/testData/obfuscated/p.java
new file mode 100644
index 0000000..e588675
--- /dev/null
+++ b/testData/obfuscated/p.java
@@ -0,0 +1,1047 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+public class p {
+   protected String a;
+   protected String b;
+   protected String c;
+   private String d;
+   private String e;
+   private Throwable f;
+   private static final String[] g;
+
+   public p(String var1, String var2, Throwable var3, String var4) {
+      int var10 = s.d;
+      super();
+      this.e = "";
+      this.a = var1;
+      this.c = var2;
+      this.f = var3;
+      ArrayList var5 = new ArrayList(Arrays.asList(Thread.currentThread().getStackTrace()));
+      int var6 = 3;
+
+      while(!var5.isEmpty()) {
+         try {
+            if (var6 <= 0) {
+               break;
+            }
+
+            var5.remove(0);
+            --var6;
+            if (var10 == 0) {
+               continue;
+            }
+         } catch (a_ var16) {
+            throw var16;
+         }
+
+         int var11 = ap.c;
+         ++var11;
+         ap.c = var11;
+         break;
+      }
+
+      StringBuilder var7 = new StringBuilder();
+      Iterator var8 = var5.iterator();
+
+      while(true) {
+         if (var8.hasNext()) {
+            StackTraceElement var9 = (StackTraceElement)var8.next();
+
+            try {
+               var7.append(var9.getClassName());
+               var7.append(".");
+               var7.append(var9.getMethodName());
+               var7.append(g[0]);
+               var7.append(var9.getFileName());
+               var7.append(":");
+               var7.append(var9.getLineNumber());
+               var7.append(")");
+               var7.append("\n");
+               if (var10 != 0) {
+                  break;
+               }
+
+               if (var10 == 0) {
+                  continue;
+               }
+            } catch (a_ var15) {
+               throw var15;
+            }
+         }
+
+         this.d = var7.toString();
+         break;
+      }
+
+      p var10000;
+      String var10001;
+      label56: {
+         label55: {
+            label54: {
+               try {
+                  if (var10 != 0) {
+                     break label55;
+                  }
+
+                  if (var3 == null) {
+                     break label54;
+                  }
+               } catch (a_ var14) {
+                  throw var14;
+               }
+
+               StringWriter var17 = new StringWriter();
+               PrintWriter var18 = new PrintWriter(var17);
+               var3.printStackTrace(var18);
+               this.e = var17.toString();
+               var18.close();
+            }
+
+            try {
+               var10000 = this;
+               var10001 = var4;
+               if (var10 != 0) {
+                  break label56;
+               }
+
+               this.b = var4;
+            } catch (a_ var13) {
+               throw var13;
+            }
+         }
+
+         try {
+            if (var4 != null) {
+               return;
+            }
+
+            var10000 = this;
+            var10001 = var1;
+         } catch (a_ var12) {
+            throw var12;
+         }
+      }
+
+      var10000.b = var10001;
+   }
+
+   public String a() {
+      return this.c;
+   }
+
+   public String b() {
+      return this.d;
+   }
+
+   public String c() {
+      return this.b;
+   }
+
+   public String d() {
+      return this.e;
+   }
+
+   public String toString() {
+      StringBuilder var1 = new StringBuilder();
+      var1.append(this.e());
+      var1.append(g[4]);
+      var1.append(this.a());
+      var1.append(g[1]);
+      var1.append(g[3]);
+      var1.append(this.c());
+      var1.append(g[2]);
+      return var1.toString();
+   }
+
+   public String e() {
+      return this.a;
+   }
+
+   public Throwable f() {
+      return this.f;
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "D@".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 100;
+            break;
+         case 1:
+            var10008 = 104;
+            break;
+         case 2:
+            var10008 = 14;
+            break;
+         case 3:
+            var10008 = 21;
+            break;
+         default:
+            var10008 = 25;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 100;
+                     break;
+                  case 1:
+                     var10008 = 104;
+                     break;
+                  case 2:
+                     var10008 = 14;
+                     break;
+                  case 3:
+                     var10008 = 21;
+                     break;
+                  default:
+                     var10008 = 25;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 100;
+                           break;
+                        case 1:
+                           var10008 = 104;
+                           break;
+                        case 2:
+                           var10008 = 14;
+                           break;
+                        case 3:
+                           var10008 = 21;
+                           break;
+                        default:
+                           var10008 = 25;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        g = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           g = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 100;
+                                 break;
+                              case 1:
+                                 var10008 = 104;
+                                 break;
+                              case 2:
+                                 var10008 = 14;
+                                 break;
+                              case 3:
+                                 var10008 = 21;
+                                 break;
+                              default:
+                                 var10008 = 25;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              g = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 g = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 100;
+            break;
+         case 1:
+            var10008 = 104;
+            break;
+         case 2:
+            var10008 = 14;
+            break;
+         case 3:
+            var10008 = 21;
+            break;
+         default:
+            var10008 = 25;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 100;
+                           break;
+                        case 1:
+                           var10008 = 104;
+                           break;
+                        case 2:
+                           var10008 = 14;
+                           break;
+                        case 3:
+                           var10008 = 21;
+                           break;
+                        default:
+                           var10008 = 25;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 100;
+                                 break;
+                              case 1:
+                                 var10008 = 104;
+                                 break;
+                              case 2:
+                                 var10008 = 14;
+                                 break;
+                              case 3:
+                                 var10008 = 21;
+                                 break;
+                              default:
+                                 var10008 = 25;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              g = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 g = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 100;
+                                       break;
+                                    case 1:
+                                       var10008 = 104;
+                                       break;
+                                    case 2:
+                                       var10008 = 14;
+                                       break;
+                                    case 3:
+                                       var10008 = 21;
+                                       break;
+                                    default:
+                                       var10008 = 25;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    g = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 100;
+                                    break;
+                                 case 1:
+                                    var10008 = 104;
+                                    break;
+                                 case 2:
+                                    var10008 = 14;
+                                    break;
+                                 case 3:
+                                    var10008 = 21;
+                                    break;
+                                 default:
+                                    var10008 = 25;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       g = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/q.java b/testData/obfuscated/q.java
new file mode 100644
index 0000000..2d00496
--- /dev/null
+++ b/testData/obfuscated/q.java
@@ -0,0 +1,3 @@
+public interface q {
+   void a(p var1);
+}
diff --git a/testData/obfuscated/r.java b/testData/obfuscated/r.java
new file mode 100644
index 0000000..173e7e3
--- /dev/null
+++ b/testData/obfuscated/r.java
@@ -0,0 +1,172 @@
+import java.sql.SQLException;
+import java.util.List;
+import java.util.logging.Logger;
+
+public class r {
+   public static final Logger a;
+   @x(
+      a = q.class
+   )
+   private static List<q> b;
+   private static final String[] c;
+
+   public static s a(String var0) {
+      return new s(var0);
+   }
+
+   private static a9 a(p param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static a9 a(Throwable var0) {
+      try {
+         if (var0 instanceof a9) {
+            return (a9)var0;
+         }
+      } catch (a9 var1) {
+         throw var1;
+      }
+
+      try {
+         if (var0 instanceof SQLException) {
+            return a(c[0]).a(var0).a();
+         }
+      } catch (a9 var2) {
+         throw var2;
+      }
+
+      return a(c[1]).a(var0).a();
+   }
+
+   static a9 b(p var0) {
+      return a(var0);
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "hzE\u0016\u0001nt\u0002\u0007\u000bi|\u000275W\\T\u0007\u0001kmE\u000b\n".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 27;
+               break;
+            case 1:
+               var10008 = 25;
+               break;
+            case 2:
+               var10008 = 44;
+               break;
+            case 3:
+               var10008 = 100;
+               break;
+            default:
+               var10008 = 100;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "hzE\u0016\u0001nt\u0002\u0007\u000bi|\u00021\n~a\\\u0001\u0007o|H!\u001cx|\\\u0010\rtw".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            c = var10000;
+            a = Logger.getLogger(r.class.getName());
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 27;
+            break;
+         case 1:
+            var10008 = 25;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 100;
+            break;
+         default:
+            var10008 = 100;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               c = var10000;
+               a = Logger.getLogger(r.class.getName());
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/s.java b/testData/obfuscated/s.java
new file mode 100644
index 0000000..bc0b96e
--- /dev/null
+++ b/testData/obfuscated/s.java
@@ -0,0 +1,937 @@
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class s {
+   private final String a;
+   private Map<String, String> b = new LinkedHashMap();
+   private Throwable c;
+   public static int d;
+   private static final String[] e;
+
+   public s(String var1) {
+      this.a = var1;
+   }
+
+   public s a(Throwable var1) {
+      this.c = var1;
+      return this;
+   }
+
+   public s a(String var1, Object var2) {
+      try {
+         if (var2 != null) {
+            this.b.put(var1, var2.toString());
+         }
+
+         return this;
+      } catch (a_ var3) {
+         throw var3;
+      }
+   }
+
+   public a9 a() {
+      return r.b(this.b());
+   }
+
+   protected p b() {
+      // $FF: Couldn't be decompiled
+   }
+
+   protected static String b(Throwable var0) {
+      String var1 = "-";
+      StackTraceElement[] var2;
+      if (var0 != null) {
+         var2 = var0.getStackTrace();
+         if (var2.length > 0) {
+            var1 = var2[0].getFileName() + ":" + var2[0].getLineNumber() + "[" + var2[0].getClassName() + "." + var2[0].getMethodName() + "]";
+         }
+      } else {
+         var2 = Thread.currentThread().getStackTrace();
+         if (var2.length > 5) {
+            var1 = var2[5].getFileName() + ":" + var2[5].getLineNumber() + "[" + var2[5].getClassName() + "." + var2[5].getMethodName() + "]";
+         }
+      }
+
+      return var1;
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "][BX\u0014\u0014\u000bsI\u0018\u001fA'".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 113;
+            break;
+         case 1:
+            var10008 = 123;
+            break;
+         case 2:
+            var10008 = 7;
+            break;
+         case 3:
+            var10008 = 32;
+            break;
+         default:
+            var10008 = 119;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u001e\tnG\u001e\u001f".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 113;
+                     break;
+                  case 1:
+                     var10008 = 123;
+                     break;
+                  case 2:
+                     var10008 = 7;
+                     break;
+                  case 3:
+                     var10008 = 32;
+                     break;
+                  default:
+                     var10008 = 119;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "K[".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "QF'".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 113;
+                           break;
+                        case 1:
+                           var10008 = 123;
+                           break;
+                        case 2:
+                           var10008 = 7;
+                           break;
+                        case 3:
+                           var10008 = 32;
+                           break;
+                        default:
+                           var10008 = 119;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "][".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        e = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           e = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "QF'".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 113;
+                                 break;
+                              case 1:
+                                 var10008 = 123;
+                                 break;
+                              case 2:
+                                 var10008 = 7;
+                                 break;
+                              case 3:
+                                 var10008 = 32;
+                                 break;
+                              default:
+                                 var10008 = 119;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "][".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              e = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 e = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 113;
+            break;
+         case 1:
+            var10008 = 123;
+            break;
+         case 2:
+            var10008 = 7;
+            break;
+         case 3:
+            var10008 = 32;
+            break;
+         default:
+            var10008 = 119;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u001e\tnG\u001e\u001f".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 113;
+                           break;
+                        case 1:
+                           var10008 = 123;
+                           break;
+                        case 2:
+                           var10008 = 7;
+                           break;
+                        case 3:
+                           var10008 = 32;
+                           break;
+                        default:
+                           var10008 = 119;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "K[".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "QF'".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 113;
+                                 break;
+                              case 1:
+                                 var10008 = 123;
+                                 break;
+                              case 2:
+                                 var10008 = 7;
+                                 break;
+                              case 3:
+                                 var10008 = 32;
+                                 break;
+                              default:
+                                 var10008 = 119;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "][".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              e = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 e = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "QF'".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 113;
+                                       break;
+                                    case 1:
+                                       var10008 = 123;
+                                       break;
+                                    case 2:
+                                       var10008 = 7;
+                                       break;
+                                    case 3:
+                                       var10008 = 32;
+                                       break;
+                                    default:
+                                       var10008 = 119;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "][".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    e = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 113;
+                                    break;
+                                 case 1:
+                                    var10008 = 123;
+                                    break;
+                                 case 2:
+                                    var10008 = 7;
+                                    break;
+                                 case 3:
+                                    var10008 = 32;
+                                    break;
+                                 default:
+                                    var10008 = 119;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       e = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/u.java b/testData/obfuscated/u.java
new file mode 100644
index 0000000..1ac386e
--- /dev/null
+++ b/testData/obfuscated/u.java
@@ -0,0 +1,5 @@
+public interface u {
+   void a(Class<?> var1) throws Exception;
+
+   void a() throws Exception;
+}
diff --git a/testData/obfuscated/v.java b/testData/obfuscated/v.java
new file mode 100644
index 0000000..8705a52
--- /dev/null
+++ b/testData/obfuscated/v.java
@@ -0,0 +1,379 @@
+import java.lang.reflect.Field;
+import java.util.logging.Level;
+
+public class v {
+   private static final String[] a;
+
+   public static Object a(Object var0) {
+      try {
+         if (var0 != null) {
+            a(var0, var0.getClass());
+         }
+
+         return var0;
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+   }
+
+   private static void a(Object param0, Class<?> param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   private static void a(Field param0, Object param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   private static void b(Field var0, Object var1) {
+      try {
+         var0.set(var1, t.a(var0.getType()));
+      } catch (Throwable var3) {
+         t.a.log(Level.WARNING, var1.getClass() + "." + var0.getName() + a[0] + var3.getMessage(), var3);
+      }
+
+   }
+
+   public <I> I a(Class<I> var1) {
+      try {
+         return a(var1.newInstance());
+      } catch (Throwable var3) {
+         throw new IllegalArgumentException(var3);
+      }
+   }
+
+   static {
+      String[] var10000 = new String[3];
+      char[] var10003 = "]\u0007".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 103;
+            break;
+         case 1:
+            var10008 = 39;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 93;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label127: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "]\u0007".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label127;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 103;
+                     break;
+                  case 1:
+                     var10008 = 39;
+                     break;
+                  case 2:
+                     var10008 = 44;
+                     break;
+                  case 3:
+                     var10008 = 46;
+                     break;
+                  default:
+                     var10008 = 93;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "]\u0007lg3\rBOZ\u0011\u000eTX\u000e/\u0002VYG/\u0002C\fO}\rFZOs\u0012SEBs+N_Za\"\u0019\fO.GAEK1\u0003\u0007XW-\u0002".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[2] = (new String(var10003)).intern();
+                  a = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 103;
+                  break;
+               case 1:
+                  var10008 = 39;
+                  break;
+               case 2:
+                  var10008 = 44;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 93;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[2] = (new String(var10004)).intern();
+                     a = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 103;
+            break;
+         case 1:
+            var10008 = 39;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 93;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 103;
+                  break;
+               case 1:
+                  var10008 = 39;
+                  break;
+               case 2:
+                  var10008 = 44;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 93;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label65: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "]\u0007".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label65;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 103;
+                           break;
+                        case 1:
+                           var10008 = 39;
+                           break;
+                        case 2:
+                           var10008 = 44;
+                           break;
+                        case 3:
+                           var10008 = 46;
+                           break;
+                        default:
+                           var10008 = 93;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "]\u0007lg3\rBOZ\u0011\u000eTX\u000e/\u0002VYG/\u0002C\fO}\rFZOs\u0012SEBs+N_Za\"\u0019\fO.GAEK1\u0003\u0007XW-\u0002".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[2] = (new String(var10003)).intern();
+                        a = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 103;
+                        break;
+                     case 1:
+                        var10008 = 39;
+                        break;
+                     case 2:
+                        var10008 = 44;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 93;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[2] = (new String(var10004)).intern();
+                           a = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 103;
+                  break;
+               case 1:
+                  var10008 = 39;
+                  break;
+               case 2:
+                  var10008 = 44;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 93;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/w.java b/testData/obfuscated/w.java
new file mode 100644
index 0000000..d25151d
--- /dev/null
+++ b/testData/obfuscated/w.java
@@ -0,0 +1,9 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface w {
+}
diff --git a/testData/obfuscated/x.java b/testData/obfuscated/x.java
new file mode 100644
index 0000000..f9a151e
--- /dev/null
+++ b/testData/obfuscated/x.java
@@ -0,0 +1,10 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface x {
+   Class<?> a();
+}
diff --git a/testData/obfuscated/y.java b/testData/obfuscated/y.java
new file mode 100644
index 0000000..d82c70f
--- /dev/null
+++ b/testData/obfuscated/y.java
@@ -0,0 +1,18 @@
+public class y<P> {
+   private P a;
+   private Class<P> b;
+   private boolean c;
+   public static int d;
+
+   private y(Class<P> var1) {
+      this.b = var1;
+   }
+
+   public static <P> y<P> a(Class<P> var0) {
+      return new y(var0);
+   }
+
+   public P a() {
+      // $FF: Couldn't be decompiled
+   }
+}
diff --git a/testData/obfuscated/z.java b/testData/obfuscated/z.java
new file mode 100644
index 0000000..dfb0e0b
--- /dev/null
+++ b/testData/obfuscated/z.java
@@ -0,0 +1,22 @@
+import java.util.List;
+
+public class z<P> {
+   private List<P> a;
+   private Class<P> b;
+
+   private z(Class<P> var1) {
+      this.b = var1;
+   }
+
+   public static <P> z<P> a(Class<P> var0) {
+      return new z(var0);
+   }
+
+   public List<P> a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public List<P> b() {
+      return t.b(this.b);
+   }
+}

From fd792b711d48825796659f437cdc7b8b748dad5a Mon Sep 17 00:00:00 2001
From: Ben Mintz <bmintz@protonmail.com>
Date: Sun, 4 Jun 2017 23:31:03 -0500
Subject: [PATCH 138/252] README.md: escape * and +

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 28b82dc..24a32f2 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ Fernflower is licenced under the Apache Licence Version 2.0. It can be found her
 
 java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>
 
-* means 0 or more times
-+ means 1 or more times
+\* means 0 or more times\
+\+ means 1 or more times
 
 <source>: file or directory with files to be decompiled. Directories are recursively scanned. Allowed file extensions are class, zip and jar.
           Sources prefixed with -e= mean "library" files that won't be decompiled, but taken into account when analysing relationships between 

From 40c4d8299674d39f754ebc93146403e60c696960 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 8 Jun 2017 13:15:58 +0300
Subject: [PATCH 139/252] Cleanup (escaping and other fixes in
 decompiler/README.md)

---
 README.md | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 24a32f2..abc4871 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,36 @@
-## About fernflower
+### About Fernflower
 
 Fernflower is the first actually working analytical decompiler for Java and 
 probably for a high-level programming language in general. Naturally it is still 
 under development, please send your bug reports and improvement suggestions at 
 fernflower.decompiler@gmail.com
 
+### Licence
 
-## Licence
+Fernflower is licenced under the [Apache Licence Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
-Fernflower is licenced under the Apache Licence Version 2.0. It can be found here: http://www.apache.org/licenses/LICENSE-2.0
+### Running from command line
 
-## Running from command line
-
-java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>
+`java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>`
 
 \* means 0 or more times\
 \+ means 1 or more times
 
-<source>: file or directory with files to be decompiled. Directories are recursively scanned. Allowed file extensions are class, zip and jar.
+\<source>: file or directory with files to be decompiled. Directories are recursively scanned. Allowed file extensions are class, zip and jar.
           Sources prefixed with -e= mean "library" files that won't be decompiled, but taken into account when analysing relationships between 
           classes or methods. Especially renaming of identifiers (s. option 'ren') can benefit from information about external classes.          
-<destination>: destination directory 
-<option>,<value>: command line option with the corresponding value, see 4.
 
-### Examples
+\<destination>: destination directory 
 
-java -jar fernflower.jar -hes=0 -hdc=0 c:\Temp\binary\ -e=c:\Java\rt.jar c:\Temp\source\
+\<option>, \<value>: a command-line option with the corresponding value (see "Command-line options" below).
 
-java -jar fernflower.jar -dgs=1 c:\Temp\binary\library.jar c:\Temp\binary\Boot.class c:\Temp\source\
+##### Examples:
 
+`java -jar fernflower.jar -hes=0 -hdc=0 c:\Temp\binary\ -e=c:\Java\rt.jar c:\Temp\source\`
 
-## Command line options
+`java -jar fernflower.jar -dgs=1 c:\Temp\binary\library.jar c:\Temp\binary\Boot.class c:\Temp\source\`
+
+### Command-line options
 
 With the exception of mpm and urc the value of 1 means the option is activated, 0 - deactivated. Default 
 value, if any, is given between parentheses.
@@ -59,18 +59,15 @@ The rest of options can be left as they are: they are aimed at professional reve
 - fdi (1): de-inline finally structures
 - mpm (0): maximum allowed processing time per decompiled method, in seconds. 0 means no upper limit
 - ren (0): rename ambiguous (resp. obfuscated) classes and class elements
-- urc    : full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
-         should be renamed and provides new identifier names. For more information see section 5
+- urc: full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
+         should be renamed and provides new identifier names (see "Renaming identifiers")
 - inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
 - lac (0): decompile lambda expressions to anonymous classes
 - nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent
-- ind    : indentation string (default is "   " (3 spaces))
- 
-The default logging level is INFO. This value can be overwritten by setting the option 'log' as follows:
-log (INFO): possible values TRACE, INFO, WARN, ERROR
+- ind: indentation string (default is 3 spaces)
+- log (INFO): a logging level, possible values are TRACE, INFO, WARN, ERROR
 
-
-## Renaming identifiers
+### Renaming identifiers
 
 Some obfuscators give classes and their member elements short, meaningless and above all ambiguous names. Recompiling of such
 code leads to a great number of conflicts. Therefore it is advisable to let the decompiler rename elements in its turn, 
@@ -78,10 +75,10 @@ ensuring uniqueness of each identifier.
 
 Option 'ren' (i.e. -ren=1) activates renaming functionality. Default renaming strategy goes as follows:
 - rename an element if its name is a reserved word or is shorter than 3 characters
-- new names are built according to a simple pattern: (class|method|field)_<consecutive unique number>  
+- new names are built according to a simple pattern: (class|method|field)_\<consecutive unique number>  
 You can overwrite this rules by providing your own implementation of the 4 key methods invoked by the decompiler while renaming. Simply 
 pass a class that implements org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer in the option 'urc'
-(e.g. -urc=com.mypackage.MyRenamer) to Fernflower. The class must be available on the application classpath.
+(e.g. -urc=com.example.MyRenamer) to Fernflower. The class must be available on the application classpath.
 
 The meaning of each method should be clear from naming: toBeRenamed determine whether the element will be renamed, while the other three
 provide new names for classes, methods and fields respectively.  

From 5f292c415c076374d5068e3e73358ccc16047118 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Thu, 20 Apr 2017 22:49:24 +0200
Subject: [PATCH 140/252] Removed 'Integer.valueOf()' boxing of literals

---
 .../decompiler/exps/InvocationExprent.java    |   9 +
 testData/classes/pkg/TestPrimitives.class     | Bin 3197 -> 2832 bytes
 testData/results/TestClassLambda.dec          |   2 +-
 testData/results/TestPrimitives.dec           | 231 ++++++++++--------
 testData/src/pkg/TestPrimitives.java          |   1 +
 5 files changed, 134 insertions(+), 109 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 8d53711..19f913e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -409,6 +409,15 @@ public class InvocationExprent extends Exprent {
 
       // special handling for ambiguous types
       if (lstParameters.get(0).type == Exprent.EXPRENT_CONST) {
+        // 'Integer.valueOf(1)' has '1' type detected as TYPE_BYTECHAR
+        if (lstParameters.get(0).getExprType().typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
+          if (classname.equals("java/lang/Integer")) {
+            // 'Integer.valueOf(40_000)' will change to '40_000' and that will be interpreted as 'char' type
+            ((ConstExprent) lstParameters.get(0)).setConstType(VarType.VARTYPE_INT);
+            return true;
+          }
+        }
+
         if (paramType == CodeConstants.TYPE_BYTECHAR || paramType == CodeConstants.TYPE_SHORTCHAR) {
           if (classname.equals("java/lang/Character")) {
             return true;
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index be15ee5f11867ff023c89f26814bcbc4985d2194..022c8c1860db9321f95c8d604faa47ffb5727aa3 100644
GIT binary patch
literal 2832
zcmaKuTXz#x6vzLQq?vRW+B8W^QLrFHLM$zys90{j5Nxf02Ei6@({$PnB$=8{i+~rr
z-!F)FL4ANX7i;N5%yKRL0KWSH{0u($=JJ2eOed3;(6ut>oPGBGoqhJ%XP^H0-*0~a
zxF0`ih~u<|44xLBXT;}O@p-O=^WyKK7(E|3cy0c==o!(2|J+Pn`1{CBF`5#eLJZR?
zObs)b)i4Ju3|u{=;SA0$L$Vr*C}}9eZpA!ah@m1Z7sSWWu!tqmJE!4AoEN<d8ZP3c
z7+#Lyl^9;ta0#zzcpY!V@TQ8l6h!w~Wy?9BAe`BLQbA<co;DS<k6UH)=wfNgteh~W
zij*YA?SfG}X;dsR_Jk2<&RS5A8lOKq+ke7baE@23lI2)S=E8u2*nGt*JA=id0$p~8
zY`bV0Wv-H$6pJZS{7ouob!X2zTqlwll2bzpG%3!{*%e2~^HR>`l>9P#v@B;v<&4Fd
z(Ph}UU7i(2V{(cfC}YdOT+ue9Sx(N)a4x4{ja+QRUX;6yWJcuVG$%)vnZt8NMKFiu
zRDn~&WX_t7zc0p++fju`ZiZv-BgV0}3kv9blmh8GhxB-@T>7X{so3XCuBheh#Y(}<
zSt9Pq#<2FCF_sJ++mY3=3%hmf!2>!T!d@NwuwTa^4C)xcVI7ZPRL3|T<I$z3dN-w~
z13&s67oh&4QJ(ETHg(1<I4a)O@ebZq@t$bkSMh;pKUDFNXg^l*iH=WkS;c2MuHbV8
zZH-(V$MLw1Cy-b1g)sS2#|b>C;wv%uTE|J8Qt^$BZ}FXiP@0DyN^`rR^o)wDLg$)_
z??wBA5YorQ>a<eOQFq*rySii)7tLcl$}VQs_$m!1W5A4|H)l;AWmjf2sO-t9oU9YX
zp&JE9sCV<^18jeW25of%H}jIrynwC{QY{elyu-`E6phZ<m6FKEy_tZ%J3DYXAaYM>
zAV~GJ8oB2e9J9phY%dbp=>jaf|G2n|G%$@)qrYyZCVA}wiwPms+Uwi$5;(<c7|@ea
zD!Kt{T!t4xCU%h*zVjBF6SpX^fOjoZnOtxIDQ%40@*VBu9SykRiU+WnRWB|JZaWll
zQTV-=<9@aZ+m`IFP=017gkFB5QW(Y#_H|bQeN+bfJALDSJ-r**NEM-M{9+a1Y=@#$
z5s`zIYzomTV%bD%6&eR?s#u$iPgc>EXpcvKM|>h2si7l35n+?aPqcL4FWHGElCo9f
zg&I=%iC7AqHLT0m(0%F`tWVsbO5<!5ce?iMZKz=*5$xSnLr;Dp%HAeHp-~l^>znJt
z8o9+5sO-g%Kr6bTp@*Y1x7&-g*o}6S7_sZ<2n6AV9|TqzhC)Q}7=sXEyH5CZcSQOn
zom#o9Ce>2tLZ?J_xn>@c0NlqHQyd4Y*R9}NeE7yydvf93gs*Q3e^A0%6>kskX#(Fs
z_{JvihcO`GthTp@uRaae^G$?rZUR4mgA&dv?!#5^zW_JpURZj({Af687rvG7bQAax
zh9#V@gAWfJ=vFu8TWUx*2}_3X?M>i09FcIoIzBw$xd-1?!#z#ly@c;*0w2Sp63*Am
zhX*|0=4VT)34ABvyPCj{GOtA{^6~QEy>iR~5&nsh50;5NlHrz#kbgt?;(3-kJj-zW
z(n{040n@N=%J<PT?ek0{9hb1uc7MP&;@k2$UA1g>rRiY6w7%?9eqlSz{fVlW%!(Rv
iS(G)=xx&I$FC%R-1rM`$<XA$E1dvJJn+X}J$^QXZ?eshV

literal 3197
zcmaKu`%@cL6vw}tENoa7NFY2cRj4gCP1B}UR9f0Xfl@&VXet$2A4^zZX_CcdLv5=T
z-><5z^;K)@V>;t6PG|IoG^3+`fd7SmgTFfJxpz043vJ4f%{k}Z^SS4od+y!*`R}iP
z0O-aKDk6AZ#Y1?3JziuFojqo&Xq^3>XIfhByS{vrNpsbGf8UCp`|Ic}rWx!pUxNiK
zhF~gKV)|(n8DyE1Q?U&ela^Jy1e-}KDjeihtm2G{mvJ_Pb0N0KD|j`8*Hm1<nu^!)
zMhI`JcnfbUc!yEmRq&pK>H}uZbPh=f#&%3ekO!?fLqfxtnKQ=o*;&IruFq!3(l}<N
z^~{uRn@snNva@KeNQjOtpI%5FH&&cU+svAdxoWKRN(e36X3jaB$w<(+IAB>BL(kDF
zu^G0QG)tcu2{rEMS%=n<V*`9>K!VE6sYT0nm_5bqw49VGu}5-zWQ32HG%`|xjaj(`
z<}}KOC<1A;1RTy-I(Hl9WAijNETNV!He}^_wsLHU56;oxP>DIXsN0M=$cNH2G)T+^
z!}0T?8d5q6Gx20dr#wQWds&cyg0Ch651mwsxQ;J9uG_YC#-J5z(^hW9vGZxiqV<%t
zm0i|tUYbFM584J5p)Td<>C?ybWp69gl$E#B#<0mYt7-jS>|WAWbq(7Q(~!g-4UeE(
z!((_{!+!K?ID|e80~pjWjH4Px@uY(HHGF^%CDeD#COW(3N*@Vf21{o2+(L3<cF9OP
z8pbi9;G%|)@UezTJjJ9>G(3%zf=f)ftl>DGQSd2Kt|<6S!{_)y!Iv7o!c_@@F6x9p
z*PMc{*^FyUnOE=)Q?4tx!M?v`#<YU(nDRXZR*r)eo2A!HZF*-Xt_wMJcEvHWR75LJ
zJ<vSHA*Pj_WUZQVY(vjd=SBo}sb`f{J(D*ks9jp9dtFCf1#kDst%-V99H6ks+E9jh
zT@a;S7Ups5`c<hrj0J;sza=&zPW9|GS=a^&+hpBdJ#X1r*4q1GBAt)+o)k>(zV(V=
zm%(zlOGT&&d5dP~=r-Sl&CY|c9q!p{qO&Kg$&BlZ;hn>1Y*?Jft?TnE9m-}plmgK;
z`yunaU`JF>JFIeTbWVlY{zxyj(486KH*o|KI~DZYL3)zDCHk(4--h%v2?50ES<Q_>
z>?B!pCm?}cq)FKAI~ToqOL4h?Ks<cDfM7f#Nd?GUsftHYT|g+_SW|#XN^Jpk@$gIm
z^}nE@F|7QK$aFAXKw}Y2scD&{Xc5h+=_-<1ifBzuSCiCM#C@qEHWkobjxY|D$5{mh
zwFsdRHE1JS2Wedta{_hPiw2ko3t24rS<sz8xv&yUP!<9DZe=lTmU&F=ETD}`s(e}#
zS`g*P7T3)~5&#d=lB}L|*W3+$zYlM&0B<FDTSfSz98P!Gz2U7D;Ozw8TmjyLeH>1A
z<GtZ`?u1*G4uW@9fFHm?4yQZUhbst{YVMV#qlgD8M81{a+bY2OahSvDF8ATWhIY6$
z-&#ax1^9M?$11>waD>C@9pS@;$UXS>BDPe3?<9Dl0{jV#a5%kte7F$#gMPPctpHCF
zd`|`V7>;o`y{9~Qg6nj`gFjK_#dF@x8SXg`_$P#3YM$pV&odZa+vwUOxCVV!dJB54
zyFFJqvWAVm2LxZ)_obKS9m~cyy7mjM<z=V*o9PJU$F8-eIJ-YCvwMjNSLkLcUm^9p
z1&8S3I6~LQuz+mxqdDOtduTR8s=r~|w0s*~C(0!E2#gSERG_FHC4gr!?dBx)QDCg`
zueAqmLXm%j96Z>5!<Xc;F&q-)8bMYCSrg<sLGBb}U65x4`9fKa;6Gp4%xWFvZ-M=&
zC;1rNsN-m+KI)_&Itl8E9{QOxL|Z&bzi>{`b}eFxevO~N8YOy>QoV{9UWQILRj&+`
pG~BMN#U+}tmr8Mx_z7&P>6iXNNa~kJP%Hn}_Or|N6!`@3-2apXB8mV2

diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index 609928c..7133344 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -15,7 +15,7 @@ public class TestClassLambda {
    public int field = 0;
 
    public void testLambda() {
-      List var1 = Arrays.asList(Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), Integer.valueOf(6), Integer.valueOf(7));// 29
+      List var1 = Arrays.asList(new Integer[]{1, 2, 3, 4, 5, 6, 7});// 29
       int var2 = (int)Math.random();// 30
       var1.forEach((var2x) -> {// 32
          int var3 = 2 * var2x.intValue();// 33
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index eae376a..1cc23bc 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -10,55 +10,56 @@ public class TestPrimitives {
       this.printFloat(1.23F);// 11
       this.printDouble(1.23D);// 12
       this.printChar('Z');// 13
-      System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 15
-   }// 16
+      String.format("%b, %d, %d, %d, %c", new Object[]{true, 1, 213, 40000, 'c', 42L});// 15
+      System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 16
+   }// 17
 
    public void printBoolean(boolean b) {
-      System.out.println(String.format("%b", b));// 19
-   }// 20
+      System.out.println(String.format("%b", b));// 20
+   }// 21
 
    public void printByte(byte b) {
-      System.out.println(String.format("%d", b));// 23
-   }// 24
+      System.out.println(String.format("%d", b));// 24
+   }// 25
 
    public void printShort(short s) {
-      System.out.println(String.format("%d", s));// 27
-   }// 28
+      System.out.println(String.format("%d", s));// 28
+   }// 29
 
    public void printInt(int i) {
-      System.out.println(String.format("%d", i));// 31
-   }// 32
+      System.out.println(String.format("%d", i));// 32
+   }// 33
 
    public void printLong(long l) {
-      System.out.println(String.format("%d", l));// 35
-   }// 36
+      System.out.println(String.format("%d", l));// 36
+   }// 37
 
    public void printFloat(float f) {
-      System.out.println(String.format("%f", f));// 39
-   }// 40
+      System.out.println(String.format("%f", f));// 40
+   }// 41
 
    public void printDouble(double d) {
-      System.out.println(String.format("%f", d));// 43
-   }// 44
+      System.out.println(String.format("%f", d));// 44
+   }// 45
 
    public void printChar(char c) {
-      System.out.println(String.format("%c", c));// 47
-   }// 48
+      System.out.println(String.format("%c", c));// 48
+   }// 49
 
    public boolean getBoolean() {
-      return false;// 52
+      return false;// 53
    }
 
    public byte getByte() {
-      return -128;// 56
+      return -128;// 57
    }
 
    public short getShort() {
-      return -32768;// 60
+      return -32768;// 61
    }
 
    public int getInt() {
-      return 42;// 64
+      return 42;// 65
    }
 
    public void printNarrowed() {
@@ -107,120 +108,134 @@ class 'pkg/TestPrimitives' {
       2d      11
       2f      11
       32      12
-      35      12
-      3e      12
-      41      12
-      48      12
-      4b      12
+      3b      12
+      3c      12
+      42      12
+      43      12
+      49      12
+      4c      12
       52      12
-      55      12
+      54      12
+      5a      12
       5c      12
-      5f      12
-      63      12
-      66      12
-      69      13
+      62      12
+      65      12
+      69      12
+      6d      13
+      70      13
+      79      13
+      7c      13
+      83      13
+      86      13
+      8d      13
+      90      13
+      97      13
+      9a      13
+      9e      13
+      a1      13
+      a4      14
    }
 
    method 'printBoolean (Z)V' {
-      0      16
-      3      16
-      c      16
-      10      16
-      13      16
-      16      17
+      0      17
+      3      17
+      c      17
+      10      17
+      13      17
+      16      18
    }
 
    method 'printByte (B)V' {
-      0      20
-      3      20
-      c      20
-      10      20
-      13      20
-      16      21
+      0      21
+      3      21
+      c      21
+      10      21
+      13      21
+      16      22
    }
 
    method 'printShort (S)V' {
-      0      24
-      3      24
-      c      24
-      10      24
-      13      24
-      16      25
+      0      25
+      3      25
+      c      25
+      10      25
+      13      25
+      16      26
    }
 
    method 'printInt (I)V' {
-      0      28
-      3      28
-      c      28
-      10      28
-      13      28
-      16      29
+      0      29
+      3      29
+      c      29
+      10      29
+      13      29
+      16      30
    }
 
    method 'printLong (J)V' {
-      0      32
-      3      32
-      c      32
-      10      32
-      13      32
-      16      33
+      0      33
+      3      33
+      c      33
+      10      33
+      13      33
+      16      34
    }
 
    method 'printFloat (F)V' {
-      0      36
-      3      36
-      c      36
-      10      36
-      13      36
-      16      37
+      0      37
+      3      37
+      c      37
+      10      37
+      13      37
+      16      38
    }
 
    method 'printDouble (D)V' {
-      0      40
-      3      40
-      c      40
-      10      40
-      13      40
-      16      41
+      0      41
+      3      41
+      c      41
+      10      41
+      13      41
+      16      42
    }
 
    method 'printChar (C)V' {
-      0      44
-      3      44
-      c      44
-      10      44
-      13      44
-      16      45
+      0      45
+      3      45
+      c      45
+      10      45
+      13      45
+      16      46
    }
 
    method 'getBoolean ()Z' {
-      0      48
-      1      48
+      0      49
+      1      49
    }
 
    method 'getByte ()B' {
-      0      52
-      2      52
+      0      53
+      2      53
    }
 
    method 'getShort ()S' {
-      0      56
-      3      56
+      0      57
+      3      57
    }
 
    method 'getInt ()I' {
-      0      60
-      2      60
+      0      61
+      2      61
    }
 
    method 'printNarrowed ()V' {
-      2      64
-      5      64
-      6      64
-      b      65
-      e      65
-      f      65
-      12      66
+      2      65
+      5      65
+      6      65
+      b      66
+      e      66
+      f      66
+      12      67
    }
 
    method 'constructor ()V' {
@@ -282,27 +297,27 @@ Lines mapping:
 13 <-> 12
 15 <-> 13
 16 <-> 14
-19 <-> 17
+17 <-> 15
 20 <-> 18
-23 <-> 21
+21 <-> 19
 24 <-> 22
-27 <-> 25
+25 <-> 23
 28 <-> 26
-31 <-> 29
+29 <-> 27
 32 <-> 30
-35 <-> 33
+33 <-> 31
 36 <-> 34
-39 <-> 37
+37 <-> 35
 40 <-> 38
-43 <-> 41
+41 <-> 39
 44 <-> 42
-47 <-> 45
+45 <-> 43
 48 <-> 46
-52 <-> 49
-56 <-> 53
-60 <-> 57
-64 <-> 61
-68 <-> 65
+49 <-> 47
+53 <-> 50
+57 <-> 54
+61 <-> 58
+65 <-> 62
 69 <-> 66
 70 <-> 67
 73 <-> 70
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 39041ef..484eb84 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -12,6 +12,7 @@ public class TestPrimitives {
     printDouble(1.23);
     printChar('Z');
 
+    String.format("%b, %d, %d, %d, %c", true, 1, 213, 40_000, 'c', 42L);
     System.out.println(String.format("%b, %d, %d, %d", getBoolean(), getByte(), getShort(), getInt()));
   }
 

From 9e788b09cb4cac5cd19b3e85963d1f26661e35a1 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Mon, 1 May 2017 12:28:01 +0200
Subject: [PATCH 141/252] Fixed conflicts after recent changes in master

---
 testData/classes/pkg/TestPrimitives.class | Bin 2832 -> 2926 bytes
 testData/results/TestClassLambda.dec      |   2 +-
 testData/results/TestPrimitives.dec       |  14 +++++++-------
 testData/results/TestVarArgCalls.dec      |   4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 022c8c1860db9321f95c8d604faa47ffb5727aa3..2bea08c59f1a52511b968c8e469db716adbad741 100644
GIT binary patch
literal 2926
zcmaKu`*#yX6vw}tY_sWhY11?<MZtm)39+=GpkP6uEy0#b(IA-OYnyJ{g*02!O%d>c
z@Am`oE%=1rJe;FHgd9Ek2l%^xfPaHO_?yRjXE&Q^OXxY-nYoY8%$>P&r+@zU>mLAi
z;71)XJf$Ozr}^^?e@y;NHj$qH&hsd*?z=L7m3vc>eg9lfocsIGbsky#nT}#c!>kS)
zr*xb~Aq-sJuVW6y8YHd5!Mu)VQEJ8l+$hTIxyYY0I#PI!duMf=^X7YA#|wBdikG6e
z5XH+nUcsw6Uc>8AyrJPu_IOLf+X^Ck?4s>Hs34r$a$JEr<V;x#+Q#gnb)-BuX_bzd
zlLeB*$DF)bIBu3~9{WPoowXMfB*x}X&-5R&7TlvHd(L+4MQdR|L3F-k7u^Gef&xQy
z2OXzinMIl<HNlf9lk}TV(Clf?x-^fP8WgHQ1-cMtXPuJE@~n{4bV|0y9w`dVh|t)i
z8L7d>oZ<{SjS3a5KpCw8GX=*KZW*DQCS68Bi<oTKDT`>;)UZ%ak#e}k9GW#t%p4M`
zJgJ6=Ib*p&T(pN2j>aMp42>y{D2@FnNI;8^kU%V*hP2{UV(KGispOooXvUVjQ(SOM
z<-F_Ae0tU?m-1G|=2Pfcy2*W~%th0{-RL!NFLoHXAG-`ZfB^#!VxNIQ3>nDakbzMg
zHgE*vbdbr(-u1~T=|_>o7}Q@di!=S>lc%h_tKl63@8UfT?{oWsh7Y;@NW(>LKh|)`
zz$f@r!)FFQ#}^7(mvRj}imZWSc#Q48G;kazG<?N_uMIqooQBH=uHYL5p(N!&C`plr
zlG7T#Wt;Cbe9!F<ETjdt))&ZI%Q5ewSXSnpf_BNYmT=mlStwiMbk<#zdSfdrC|e~r
zIvZ=oqP_1*jmXBnoQyl_1kMUG@3MI}rG~@~G~^(y-%HI7N=?a@g=8k3L)N9+LpdCo
zc1m-cu)9-|y{8>GDT%y;8<45K)l%-+1=pIR`|gwp+UWsor~fElR&ub+IS!Dnp~U7r
zCuv(fY(JqBbS))2A!T=AxRgp4LnL~E3P9&gV&PjQP2gYCL@FasAf!t-s&;2P>CQ?^
z@x%kzKy@)D3ULeyUlsaprEx#C3bjq?8&H0xP6&PUjR;|w)PUg`U>mm6NWndU^S{2`
zwX|A6C>=XrK{(y6C>5w;(3DOfQb9BwZ>~V6K}!Xz(y@sOTH|f8$nS{d!fF-m*_=vE
zJezB3$6uloiFb%ri{-0GWOLC3I;&Wnt)lzHFIW@5O%u-P3U2rOskgR@b%dba9aZ#X
za}nyTX9_u0u%RAYA6i6+P0*+pMI6oOhK?Q@B`MrqtfC;>=;4XsD%zz@xE5>z)fw6f
z-obI&gb=l>d0ls^VqIcU%cs?aSpr??6v!^m%|{XdJ8>UD6|P@5gKrGr>sG|%!Mh2*
zrXhT{fKy$(HN2+*d@aG(HGuEIUIC|idu#a0)9_Zlp5PlA!1v>TfKwe0;2P+^18>j$
zZRzpzW64o_@J$3yHh>S~pn%i+5WuAa-Q?~0#wwBxwk1XIEe+rgVMM^`-3j2*%6<6e
zD(-3k?<M%w2JkUFEa3E>1#oHQn}cjgG=Og-`1S_yqj*HX>G|^ETrs#(gu*}ZS1J=b
z1;Z;7q2Pwlo9BCO^*zI}3(H-1ORnL-l^#jowa<4|+b>|b?_SAQ4SeZMT`_HXx$6PR
zwLa}cP}mMqd>m^>nrp~KE^FMmM1`$hMp{J*9;D)tp%QXPLUshJIT;{#ku@Xr-;m0w
ZH?ZYIo#bWdD3K0J6g{9kAvXNU{{c#C0l)wN

delta 1307
zcmZ{j*-sNu6vn^l!kymS00I`=A_N*sDHKFhRAf_d-*6YvvMM5?0t%=_MR7qzE3TkE
z=o=v+B!u{&k0w6&VB)KZ|9~&P8soXQ!?b8-nx465=Kj9Zp7Y(G?qPT6^Pl%00Ia|p
zjzk>c@S;|RqcYUVaLh^X<<%#%<Brm?j<<3Zj4S;$k<$C4dO~LPGBoIDWN6}OMhnLY
zoU{X@WgM+IH7nxdXv1lacARmc17&A*oRjEz89F(-&@ERNI4+_`u6jB8a7o8y9anUO
zIQnsw;~K8(7+|<D`DsK8x7spuvf&dbz;b~itQ1&{Vu5ui5hz2szy@p-*o4gj+ps-6
zWAlY>3Jl^F!)<xL!*EyLhZye3`+bH70>gO7@JJwx#~R{2_5O5E<Lp;p7j_HmK@G!*
zM4kxj#Xg3oGI=Jj9|sto3%tNf4K`1`42?20GmHu(4q}YqmE8PVK5dv9u-9q{@vXt`
zV4yA7-V&(j>1+yrcYI0q(qQD301fmnDdvPfI^E0s^em1tz>ZvsLam+1Lx3_3`NrPg
z&S}jbo{B466y5dC+(j)@iW>74NktAD#T2+PU#YrPo@(p|Qc*~5(da{cR%G2AGL6Uu
zmgFi$(r^rNVdc`A8Kg}kW0I=c5d8&<NoR?L&Kj&$Iy7HXC&@x5opdrRbk?I(>5xT~
zPM03rgDfIF7Gwn~6-mBQ<kvZ*m&j}jvI^CTBr_^9;EJv3Co<Q9+=8u&BnK;U$mI=1
z`;|{*fd#n(I~7Tml_YiAuX5_RecbGO#7jj=BjP2S=@Rm}LFO8yJ+Xfrq1l;5*y0%0
zZnAVN3^vbT9rOC}Z{3m@)?u=AivFwXi=vs4y5%u!wC+K}|KE64K=vt~&IxE<E>t0j
QrVu?1$!5JnsvC#@0>-D3{Qv*}

diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index 7133344..bc12180 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -15,7 +15,7 @@ public class TestClassLambda {
    public int field = 0;
 
    public void testLambda() {
-      List var1 = Arrays.asList(new Integer[]{1, 2, 3, 4, 5, 6, 7});// 29
+      List var1 = Arrays.asList(1, 2, 3, 4, 5, 6, 7);// 29
       int var2 = (int)Math.random();// 30
       var1.forEach((var2x) -> {// 32
          int var3 = 2 * var2x.intValue();// 33
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 1cc23bc..705a27d 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -10,7 +10,7 @@ public class TestPrimitives {
       this.printFloat(1.23F);// 11
       this.printDouble(1.23D);// 12
       this.printChar('Z');// 13
-      String.format("%b, %d, %d, %d, %c", new Object[]{true, 1, 213, 40000, 'c', 42L});// 15
+      String.format("%b, %d, %d, %d, %c", true, 1, 213, 40000, 'c', 42L);// 15
       System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 16
    }// 17
 
@@ -63,9 +63,9 @@ public class TestPrimitives {
    }
 
    public void printNarrowed() {
-      this.printByte((byte)this.getInt());// 68
-      this.printShort((short)this.getInt());// 69
-   }// 70
+      this.printByte((byte)this.getInt());// 69
+      this.printShort((short)this.getInt());// 70
+   }// 71
 
    public void constructor() {
       new Byte((byte)1);// 73
@@ -239,8 +239,8 @@ class 'pkg/TestPrimitives' {
    }
 
    method 'constructor ()V' {
-      4      69
-      9      70
+      4      70
+      9      71
    }
 
    method 'compare (C)Z' {
@@ -320,7 +320,7 @@ Lines mapping:
 65 <-> 62
 69 <-> 66
 70 <-> 67
-73 <-> 70
+71 <-> 68
 74 <-> 71
 77 <-> 74
 78 <-> 75
diff --git a/testData/results/TestVarArgCalls.dec b/testData/results/TestVarArgCalls.dec
index 1ccd16a..6cdcd8f 100644
--- a/testData/results/TestVarArgCalls.dec
+++ b/testData/results/TestVarArgCalls.dec
@@ -9,8 +9,8 @@ public class TestVarArgCalls {
       this.printComplex("Test: %[0]s", new String[]{"abc"});// 10
       this.printComplex("Test: %[0]s - %[0]s", new String[]{"abc"}, new String[]{"DEF"});// 11
       String.format("Test");// 13
-      String.format("Test: %d", Integer.valueOf(123));// 14
-      String.format("Test: %d - %s", Integer.valueOf(123), "DEF");// 15
+      String.format("Test: %d", 123);// 14
+      String.format("Test: %d - %s", 123, "DEF");// 15
       Object[] data = new Object[]{"Hello"};// 17
       String.format("Test: %s", (Object)data);// 18
       String.format("Test: %s", (Object[])data);// 19

From d382ba2709c64ac12fe07a8af6606dbb6c5382f1 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Thu, 11 May 2017 22:45:22 +0200
Subject: [PATCH 142/252] Updated TestPrimitives test to match the source

---
 testData/classes/pkg/TestPrimitives.class | Bin 2926 -> 3298 bytes
 testData/results/TestPrimitives.dec       | 113 +++++++++++-----------
 2 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 2bea08c59f1a52511b968c8e469db716adbad741..fb4d81f15880a222a48dc6d7d791e6d17ad99443 100644
GIT binary patch
delta 720
zcmZ{gS!)wf7>1uSGx1DLrjmjRT7}#cYN=I0L_|qIK|x$<YnRk*lBTA%wK0ubTvGR~
z+G^Zt7neqRBSk6Rc;T(!ztA7xjkltnb74C-4#WFB?>Fb2neY3t?ECW4*WaH$0~?r8
zL`f;?NgL@hk}=X9($CFx-ne5<d@@%tlwB16IlH9zZO5!}Jw}eZ^h){^{hUw?kh5VT
zp*TtY-%IKhgA^2}I34B;JI}hDGtr_E{e?O%7`mvqM9I*Q;xboUuDV=vxvsduO~oy4
zyWEl7HHl%#y$@feMXgK^^ymD1M&Q(KTb&fx`OKi8s=45&dw2V}7C+UODQB%><9&}2
zMkNnSeJClL`bhHF)F+as9?uw)Jogx9q8znXZ5d(Gqm?$vlsWXmqn!@POOIE)7Fe|@
zBV9(iCDZ0iMe@efw{t!AE=yF;eGI)1l`IZ&2*DZ<aV+$b7_YG^NM{De-dZy?PtHO!
z>IOI*U=?65z*PZ`1-Rq~OftZw1+M1Lyjl59|DR2x*3B%|x`zmRS;{_QG||9*Hqp#>
zT6E`to~@NEZ4~r+hUj3JBx7{4RwrX-)^@$ob*$G`kF6t3dKD2yIm|}Aj3c_+z>07}
V{K6Fpp+WusjwFOmAJrKP|1av?fUy7o

delta 347
zcmXw#IZFd!5Qd-Kb^SIUTci-d!cveFR)UQXI|X|W@Qg9u8t)j7cwg~IjJJtbtb>xy
z!dCD%*ys<iu@^IlQ#|hsGw%${XW3V2?Ct0I1*j&g@zSC3(JAN>bPED@p)WBnRZo#W
z6Mm2^SnU7Kl|(=4b5ivRLJob3e$4=bnjwZQNY`mb82w-3(~J?;j5Fb3l7=aVX|c`-
zW;K;WB%9Mj{|+u_7FlwLIV?M@XjWO%th3>;sn`<7wqob$HEX1jW~6G@CC;8=U-Uq6
zD4I|tMUNCImt#&8r!Hrlr)sS7+Bg?3O*AVmW$4PKg;qt{CBwCWSrHHf1tG<a%-kyO
YMDOzntI;&P`FH!#_87Dk{$$er3r8JB9smFU

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 705a27d..78922f4 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -68,24 +68,24 @@ public class TestPrimitives {
    }// 71
 
    public void constructor() {
-      new Byte((byte)1);// 73
-   }// 74
+      new Byte((byte)1);// 74
+   }// 75
 
    private boolean compare(char c) {
-      boolean res = c > -1;// 77
-      res = c > 0;// 78
-      res = c > 1;// 79
-      res = c > '\b';// 80
-      res = c > '\t';// 81
-      res = c > '\n';// 82
-      res = c > '\f';// 83
-      res = c > '\r';// 84
-      res = c > ' ';// 85
-      res = c > 'a';// 86
-      res = c > 'Z';// 87
-      res = c > 127;// 88
-      res = c > 255;// 89
-      return res;// 90
+      boolean res = c > -1;// 78
+      res = c > 0;// 79
+      res = c > 1;// 80
+      res = c > '\b';// 81
+      res = c > '\t';// 82
+      res = c > '\n';// 83
+      res = c > '\f';// 84
+      res = c > '\r';// 85
+      res = c > ' ';// 86
+      res = c > 'a';// 87
+      res = c > 'Z';// 88
+      res = c > 127;// 89
+      res = c > 255;// 90
+      return res;// 91
    }
 }
 
@@ -244,45 +244,45 @@ class 'pkg/TestPrimitives' {
    }
 
    method 'compare (C)Z' {
-      1      73
-      2      73
-      a      73
-      c      74
-      14      74
-      16      75
-      17      75
-      1f      75
-      21      76
-      23      76
-      2b      76
-      2d      77
-      2f      77
-      37      77
-      39      78
-      3b      78
-      43      78
-      45      79
-      47      79
-      4f      79
-      51      80
-      53      80
-      5b      80
-      5d      81
-      5f      81
-      67      81
-      69      82
-      6b      82
-      73      82
-      75      83
-      77      83
-      7f      83
-      81      84
-      83      84
-      8b      84
-      8d      85
-      90      85
-      98      85
-      9a      86
+      1      74
+      2      74
+      a      74
+      c      75
+      14      75
+      16      76
+      17      76
+      1f      76
+      21      77
+      23      77
+      2b      77
+      2d      78
+      2f      78
+      37      78
+      39      79
+      3b      79
+      43      79
+      45      80
+      47      80
+      4f      80
+      51      81
+      53      81
+      5b      81
+      5d      82
+      5f      82
+      67      82
+      69      83
+      6b      83
+      73      83
+      75      84
+      77      84
+      7f      84
+      81      85
+      83      85
+      8b      85
+      8d      86
+      90      86
+      98      86
+      9a      87
    }
 }
 
@@ -322,7 +322,7 @@ Lines mapping:
 70 <-> 67
 71 <-> 68
 74 <-> 71
-77 <-> 74
+75 <-> 72
 78 <-> 75
 79 <-> 76
 80 <-> 77
@@ -336,3 +336,4 @@ Lines mapping:
 88 <-> 85
 89 <-> 86
 90 <-> 87
+91 <-> 88

From 5db9ad29c883f331780e161d6c54d277c217bbee Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Fri, 23 Jun 2017 21:43:23 +0200
Subject: [PATCH 143/252] Removed setConstType() from is isBoxingCall() to
 avoid hidden side effect

Const type is now adjusted correctly also when the target is
java.lang.Character or java.lang.Integer
---
 .../modules/decompiler/exps/ConstExprent.java |   8 +-
 .../decompiler/exps/InvocationExprent.java    |   4 +-
 .../java/decompiler/struct/gen/VarType.java   |   2 +
 testData/classes/pkg/TestPrimitives.class     | Bin 3298 -> 3478 bytes
 testData/results/TestPrimitives.dec           | 446 +++++++++---------
 testData/src/pkg/TestPrimitives.java          |   9 +-
 6 files changed, 248 insertions(+), 221 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 612fd37..e77b680 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -369,16 +369,16 @@ public class ConstExprent extends Exprent {
 
   public void adjustConstType(VarType expectedType) {
     // BYTECHAR and SHORTCHAR => CHAR in the CHAR context
-    if (expectedType.equals(VarType.VARTYPE_CHAR) &&
+    if ((expectedType.equals(VarType.VARTYPE_CHAR) || expectedType.equals(VarType.VARTYPE_CHARACTER)) &&
             (constType.equals(VarType.VARTYPE_BYTECHAR) || constType.equals(VarType.VARTYPE_SHORTCHAR))) {
       int intValue = getIntValue();
       if (isPrintableAscii(intValue) || CHAR_ESCAPES.containsKey(intValue)) {
         setConstType(VarType.VARTYPE_CHAR);
       }
     }
-    // CHAR => INT in the INT context
-    else if (expectedType.equals(VarType.VARTYPE_INT) &&
-            constType.equals(VarType.VARTYPE_CHAR)) {
+    // BYTE, BYTECHAR, SHORTCHAR, SHORT, CHAR => INT in the INT context
+    else if ((expectedType.equals(VarType.VARTYPE_INT) || expectedType.equals(VarType.VARTYPE_INTEGER)) &&
+            constType.typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
       setConstType(VarType.VARTYPE_INT);
     }
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 19f913e..e5ff698 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -410,10 +410,10 @@ public class InvocationExprent extends Exprent {
       // special handling for ambiguous types
       if (lstParameters.get(0).type == Exprent.EXPRENT_CONST) {
         // 'Integer.valueOf(1)' has '1' type detected as TYPE_BYTECHAR
+        // 'Integer.valueOf(40_000)' has '40_000' type detected as TYPE_CHAR
+        // so we check the type family instead
         if (lstParameters.get(0).getExprType().typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
           if (classname.equals("java/lang/Integer")) {
-            // 'Integer.valueOf(40_000)' will change to '40_000' and that will be interpreted as 'char' type
-            ((ConstExprent) lstParameters.get(0)).setConstType(VarType.VARTYPE_INT);
             return true;
           }
         }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
index 1eb177f..410cf09 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
@@ -38,6 +38,8 @@ public class VarType {  // TODO: optimize switch
   public static final VarType VARTYPE_STRING = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/String");
   public static final VarType VARTYPE_CLASS = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Class");
   public static final VarType VARTYPE_OBJECT = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Object");
+  public static final VarType VARTYPE_INTEGER = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Integer");
+  public static final VarType VARTYPE_CHARACTER = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Character");
   public static final VarType VARTYPE_VOID = new VarType(CodeConstants.TYPE_VOID);
 
   public final int type;
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index fb4d81f15880a222a48dc6d7d791e6d17ad99443..2af9d832686d5c7f3aa21b8e40aefb219e134e97 100644
GIT binary patch
literal 3478
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
VsMe=ZFsuL8^@%(@Oq&p#{{a}fUoHRu

literal 3298
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

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 78922f4..4456671 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -10,82 +10,87 @@ public class TestPrimitives {
       this.printFloat(1.23F);// 11
       this.printDouble(1.23D);// 12
       this.printChar('Z');// 13
-      String.format("%b, %d, %d, %d, %c", true, 1, 213, 40000, 'c', 42L);// 15
-      System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 16
-   }// 17
+      this.printIntBoxed(40000);// 15
+      String.format("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 17
+      System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 18
+   }// 19
 
    public void printBoolean(boolean b) {
-      System.out.println(String.format("%b", b));// 20
-   }// 21
+      System.out.println(String.format("%b", b));// 22
+   }// 23
 
    public void printByte(byte b) {
-      System.out.println(String.format("%d", b));// 24
-   }// 25
+      System.out.println(String.format("%d", b));// 26
+   }// 27
 
    public void printShort(short s) {
-      System.out.println(String.format("%d", s));// 28
-   }// 29
+      System.out.println(String.format("%d", s));// 30
+   }// 31
 
    public void printInt(int i) {
-      System.out.println(String.format("%d", i));// 32
-   }// 33
+      System.out.println(String.format("%d", i));// 34
+   }// 35
 
    public void printLong(long l) {
-      System.out.println(String.format("%d", l));// 36
-   }// 37
+      System.out.println(String.format("%d", l));// 38
+   }// 39
 
    public void printFloat(float f) {
-      System.out.println(String.format("%f", f));// 40
-   }// 41
+      System.out.println(String.format("%f", f));// 42
+   }// 43
 
    public void printDouble(double d) {
-      System.out.println(String.format("%f", d));// 44
-   }// 45
+      System.out.println(String.format("%f", d));// 46
+   }// 47
 
    public void printChar(char c) {
-      System.out.println(String.format("%c", c));// 48
-   }// 49
+      System.out.println(String.format("%c", c));// 50
+   }// 51
+
+   public void printIntBoxed(Integer i) {
+      System.out.println(String.format("%d", i));// 55
+   }// 56
 
    public boolean getBoolean() {
-      return false;// 53
+      return false;// 60
    }
 
    public byte getByte() {
-      return -128;// 57
+      return -128;// 64
    }
 
    public short getShort() {
-      return -32768;// 61
+      return -32768;// 68
    }
 
    public int getInt() {
-      return 42;// 65
+      return 42;// 72
    }
 
    public void printNarrowed() {
-      this.printByte((byte)this.getInt());// 69
-      this.printShort((short)this.getInt());// 70
-   }// 71
+      this.printByte((byte)this.getInt());// 76
+      this.printShort((short)this.getInt());// 77
+   }// 78
 
    public void constructor() {
-      new Byte((byte)1);// 74
-   }// 75
+      new Byte((byte)1);// 81
+   }// 82
 
    private boolean compare(char c) {
-      boolean res = c > -1;// 78
-      res = c > 0;// 79
-      res = c > 1;// 80
-      res = c > '\b';// 81
-      res = c > '\t';// 82
-      res = c > '\n';// 83
-      res = c > '\f';// 84
-      res = c > '\r';// 85
-      res = c > ' ';// 86
-      res = c > 'a';// 87
-      res = c > 'Z';// 88
-      res = c > 127;// 89
-      res = c > 255;// 90
-      return res;// 91
+      boolean res = c > -1;// 85
+      res = c > 0;// 86
+      res = c > 1;// 87
+      res = c > '\b';// 88
+      res = c > '\t';// 89
+      res = c > '\n';// 90
+      res = c > '\f';// 91
+      res = c > '\r';// 92
+      res = c > ' ';// 93
+      res = c > 'a';// 94
+      res = c > 'Z';// 95
+      res = c > 127;// 96
+      res = c > 255;// 97
+      return res;// 98
    }
 }
 
@@ -107,182 +112,192 @@ class 'pkg/TestPrimitives' {
       29      10
       2d      11
       2f      11
-      32      12
-      3b      12
-      3c      12
-      42      12
-      43      12
-      49      12
-      4c      12
-      52      12
-      54      12
-      5a      12
-      5c      12
-      62      12
-      65      12
-      69      12
-      6d      13
-      70      13
-      79      13
-      7c      13
-      83      13
-      86      13
-      8d      13
-      90      13
-      97      13
-      9a      13
-      9e      13
-      a1      13
-      a4      14
+      33      12
+      38      12
+      3b      13
+      44      13
+      45      13
+      4b      13
+      4c      13
+      52      13
+      55      13
+      5b      13
+      5d      13
+      63      13
+      65      13
+      6b      13
+      6e      13
+      72      13
+      76      14
+      79      14
+      82      14
+      85      14
+      8c      14
+      8f      14
+      96      14
+      99      14
+      a0      14
+      a3      14
+      a7      14
+      aa      14
+      ad      15
    }
 
    method 'printBoolean (Z)V' {
-      0      17
-      3      17
-      c      17
-      10      17
-      13      17
-      16      18
+      0      18
+      3      18
+      c      18
+      10      18
+      13      18
+      16      19
    }
 
    method 'printByte (B)V' {
-      0      21
-      3      21
-      c      21
-      10      21
-      13      21
-      16      22
+      0      22
+      3      22
+      c      22
+      10      22
+      13      22
+      16      23
    }
 
    method 'printShort (S)V' {
-      0      25
-      3      25
-      c      25
-      10      25
-      13      25
-      16      26
+      0      26
+      3      26
+      c      26
+      10      26
+      13      26
+      16      27
    }
 
    method 'printInt (I)V' {
-      0      29
-      3      29
-      c      29
-      10      29
-      13      29
-      16      30
+      0      30
+      3      30
+      c      30
+      10      30
+      13      30
+      16      31
    }
 
    method 'printLong (J)V' {
-      0      33
-      3      33
-      c      33
-      10      33
-      13      33
-      16      34
+      0      34
+      3      34
+      c      34
+      10      34
+      13      34
+      16      35
    }
 
    method 'printFloat (F)V' {
-      0      37
-      3      37
-      c      37
-      10      37
-      13      37
-      16      38
+      0      38
+      3      38
+      c      38
+      10      38
+      13      38
+      16      39
    }
 
    method 'printDouble (D)V' {
-      0      41
-      3      41
-      c      41
-      10      41
-      13      41
-      16      42
+      0      42
+      3      42
+      c      42
+      10      42
+      13      42
+      16      43
    }
 
    method 'printChar (C)V' {
-      0      45
-      3      45
-      c      45
-      10      45
-      13      45
-      16      46
+      0      46
+      3      46
+      c      46
+      10      46
+      13      46
+      16      47
+   }
+
+   method 'printIntBoxed (Ljava/lang/Integer;)V' {
+      0      50
+      3      50
+      d      50
+      10      50
+      13      51
    }
 
    method 'getBoolean ()Z' {
-      0      49
-      1      49
+      0      54
+      1      54
    }
 
    method 'getByte ()B' {
-      0      53
-      2      53
+      0      58
+      2      58
    }
 
    method 'getShort ()S' {
-      0      57
-      3      57
+      0      62
+      3      62
    }
 
    method 'getInt ()I' {
-      0      61
-      2      61
+      0      66
+      2      66
    }
 
    method 'printNarrowed ()V' {
-      2      65
-      5      65
-      6      65
-      b      66
-      e      66
-      f      66
-      12      67
+      2      70
+      5      70
+      6      70
+      b      71
+      e      71
+      f      71
+      12      72
    }
 
    method 'constructor ()V' {
-      4      70
-      9      71
+      4      75
+      9      76
    }
 
    method 'compare (C)Z' {
-      1      74
-      2      74
-      a      74
-      c      75
-      14      75
-      16      76
-      17      76
-      1f      76
-      21      77
-      23      77
-      2b      77
-      2d      78
-      2f      78
-      37      78
-      39      79
-      3b      79
-      43      79
-      45      80
-      47      80
-      4f      80
-      51      81
-      53      81
-      5b      81
-      5d      82
-      5f      82
-      67      82
-      69      83
-      6b      83
-      73      83
-      75      84
-      77      84
-      7f      84
-      81      85
-      83      85
-      8b      85
-      8d      86
-      90      86
-      98      86
-      9a      87
+      1      79
+      2      79
+      a      79
+      c      80
+      14      80
+      16      81
+      17      81
+      1f      81
+      21      82
+      23      82
+      2b      82
+      2d      83
+      2f      83
+      37      83
+      39      84
+      3b      84
+      43      84
+      45      85
+      47      85
+      4f      85
+      51      86
+      53      86
+      5b      86
+      5d      87
+      5f      87
+      67      87
+      69      88
+      6b      88
+      73      88
+      75      89
+      77      89
+      7f      89
+      81      90
+      83      90
+      8b      90
+      8d      91
+      90      91
+      98      91
+      9a      92
    }
 }
 
@@ -296,44 +311,47 @@ Lines mapping:
 12 <-> 11
 13 <-> 12
 15 <-> 13
-16 <-> 14
-17 <-> 15
-20 <-> 18
-21 <-> 19
-24 <-> 22
-25 <-> 23
-28 <-> 26
-29 <-> 27
-32 <-> 30
-33 <-> 31
-36 <-> 34
-37 <-> 35
-40 <-> 38
-41 <-> 39
-44 <-> 42
-45 <-> 43
-48 <-> 46
-49 <-> 47
-53 <-> 50
-57 <-> 54
-61 <-> 58
-65 <-> 62
-69 <-> 66
-70 <-> 67
-71 <-> 68
-74 <-> 71
-75 <-> 72
-78 <-> 75
-79 <-> 76
-80 <-> 77
-81 <-> 78
-82 <-> 79
-83 <-> 80
-84 <-> 81
-85 <-> 82
-86 <-> 83
-87 <-> 84
-88 <-> 85
-89 <-> 86
-90 <-> 87
-91 <-> 88
+17 <-> 14
+18 <-> 15
+19 <-> 16
+22 <-> 19
+23 <-> 20
+26 <-> 23
+27 <-> 24
+30 <-> 27
+31 <-> 28
+34 <-> 31
+35 <-> 32
+38 <-> 35
+39 <-> 36
+42 <-> 39
+43 <-> 40
+46 <-> 43
+47 <-> 44
+50 <-> 47
+51 <-> 48
+55 <-> 51
+56 <-> 52
+60 <-> 55
+64 <-> 59
+68 <-> 63
+72 <-> 67
+76 <-> 71
+77 <-> 72
+78 <-> 73
+81 <-> 76
+82 <-> 77
+85 <-> 80
+86 <-> 81
+87 <-> 82
+88 <-> 83
+89 <-> 84
+90 <-> 85
+91 <-> 86
+92 <-> 87
+93 <-> 88
+94 <-> 89
+95 <-> 90
+96 <-> 91
+97 <-> 92
+98 <-> 93
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 484eb84..9448e4d 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -12,7 +12,9 @@ public class TestPrimitives {
     printDouble(1.23);
     printChar('Z');
 
-    String.format("%b, %d, %d, %d, %c", true, 1, 213, 40_000, 'c', 42L);
+    printIntBoxed(40_000);
+
+    String.format("%b, %d, %d, %d, %c, %d", true, 1, 213, 40_000, 'c', 42L);
     System.out.println(String.format("%b, %d, %d, %d", getBoolean(), getByte(), getShort(), getInt()));
   }
 
@@ -49,6 +51,11 @@ public class TestPrimitives {
   }
 
 
+  public void printIntBoxed(Integer i) {
+    System.out.println(String.format("%d", i));
+  }
+
+
   public boolean getBoolean() {
     return false;
   }

From aa78b7df2808f3e21632bfae8eb8f37b80cb413e Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Fri, 23 Jun 2017 22:37:37 +0200
Subject: [PATCH 144/252] Fixed narrowing cast from 'int' to 'Byte' / 'Short'

---
 .../modules/decompiler/ExprProcessor.java     |  17 +-
 .../decompiler/exps/InvocationExprent.java    |  14 +-
 .../modules/decompiler/exps/NewExprent.java   |   2 +-
 .../java/decompiler/struct/gen/VarType.java   |   2 +
 testData/classes/pkg/TestPrimitives.class     | Bin 3478 -> 5321 bytes
 testData/results/TestPrimitives.dec           | 601 +++++++++++-------
 testData/src/pkg/TestPrimitives.java          |  69 +-
 7 files changed, 472 insertions(+), 233 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 5d41ff5..c21f11d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -877,10 +877,20 @@ public class ExprProcessor implements CodeConstants {
       castAlways ||
       (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
       (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
-      (castNarrowing && isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
+      (castNarrowing && isIntConstant(exprent) && isNarrowedIntType(leftType));
 
     boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
 
+    // cast instead to 'byte' / 'short' when int constant is used as a value for 'Byte' / 'Short'
+    if (castNarrowing && exprent.type == Exprent.EXPRENT_CONST) {
+      if (leftType.equals(VarType.VARTYPE_BYTE_OBJ)) {
+        leftType = VarType.VARTYPE_BYTE;
+      }
+      else if (leftType.equals(VarType.VARTYPE_SHORT_OBJ)) {
+        leftType = VarType.VARTYPE_SHORT;
+      }
+    }
+
     if (cast) buffer.append('(').append(getCastTypeName(leftType)).append(')');
 
     if (quote) buffer.append('(');
@@ -910,4 +920,9 @@ public class ExprProcessor implements CodeConstants {
 
     return false;
   }
+
+  private static boolean isNarrowedIntType(VarType type) {
+    return VarType.VARTYPE_INT.isStrictSuperset(type) ||
+           type.equals(VarType.VARTYPE_BYTE_OBJ) || type.equals(VarType.VARTYPE_SHORT_OBJ);
+  }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index e5ff698..5467955 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -360,11 +360,7 @@ public class InvocationExprent extends Exprent {
         TextBuffer buff = new TextBuffer();
         boolean ambiguous = setAmbiguousParameters.get(i);
 
-        Exprent param = lstParameters.get(i);
-        // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
-        if (param.type == Exprent.EXPRENT_INVOCATION && ((InvocationExprent)param).isBoxingCall()) {
-          param = ((InvocationExprent)param).lstParameters.get(0);
-        }
+        Exprent param = unboxIfNeeded(lstParameters.get(i));
         // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
         ExprProcessor.getCastedExprent(param, descriptor.params[i], buff, indent, true, ambiguous, true, tracer);
 
@@ -385,6 +381,14 @@ public class InvocationExprent extends Exprent {
     return buf;
   }
 
+  public static Exprent unboxIfNeeded(Exprent param) {
+    // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
+    if (param.type == Exprent.EXPRENT_INVOCATION && ((InvocationExprent)param).isBoxingCall()) {
+      param = ((InvocationExprent)param).lstParameters.get(0);
+    }
+    return param;
+  }
+
   private boolean isVarArgCall() {
     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
     if (cl != null) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index d43388c..c153f72 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -326,7 +326,7 @@ public class NewExprent extends Exprent {
           boolean firstParam = true;
           for (int i = start; i < lstParameters.size(); i++) {
             if (sigFields == null || sigFields.get(i) == null) {
-              Exprent expr = lstParameters.get(i);
+              Exprent expr = InvocationExprent.unboxIfNeeded(lstParameters.get(i));
               VarType leftType = constructor.getDescriptor().params[i];
 
               if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
index 410cf09..6589cff 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
@@ -40,6 +40,8 @@ public class VarType {  // TODO: optimize switch
   public static final VarType VARTYPE_OBJECT = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Object");
   public static final VarType VARTYPE_INTEGER = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Integer");
   public static final VarType VARTYPE_CHARACTER = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Character");
+  public static final VarType VARTYPE_BYTE_OBJ = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Byte");
+  public static final VarType VARTYPE_SHORT_OBJ = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Short");
   public static final VarType VARTYPE_VOID = new VarType(CodeConstants.TYPE_VOID);
 
   public final int type;
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 2af9d832686d5c7f3aa21b8e40aefb219e134e97..e0e83c7a4f399a0776e8537c094cfdb40d921ec2 100644
GIT binary patch
literal 5321
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
MQYjBo#)F6c52^>=5dZ)H

literal 3478
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
VsMe=ZFsuL8^@%(@Oq&p#{{a}fUoHRu

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 4456671..3a590f4 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -10,87 +10,133 @@ public class TestPrimitives {
       this.printFloat(1.23F);// 11
       this.printDouble(1.23D);// 12
       this.printChar('Z');// 13
-      this.printIntBoxed(40000);// 15
-      String.format("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 17
-      System.out.println(String.format("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt()));// 18
-   }// 19
+      this.printBooleanBoxed(true);// 15
+      this.printByteBoxed((byte)123);// 16
+      this.printShortBoxed((short)257);// 17
+      this.printIntBoxed(1);// 18
+      this.printIntBoxed(40000);// 19
+      this.printLongBoxed(123L);// 20
+      this.printFloatBoxed(1.23F);// 21
+      this.printDoubleBoxed(1.23D);// 22
+      this.printCharBoxed('Z');// 23
+      System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 25
+      System.out.printf("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt());// 26
+      new TestPrimitives(false, (byte)123, (short)257, 40000, 123L, 3.14F, 1.618D, 'A');// 28
+      new TestPrimitives('A', 1.618D, 3.14F, 123L, 40000, (short)257, (byte)123, false);// 29
+   }// 30
+
+   private TestPrimitives(boolean bool, byte b, short s, int i, long l, float f, double d, char c) {
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 33
+   }// 34
+
+   private TestPrimitives(Character c, Double d, Float f, Long l, Integer i, Short s, Byte b, Boolean bool) {
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 37
+   }// 38
 
    public void printBoolean(boolean b) {
-      System.out.println(String.format("%b", b));// 22
-   }// 23
+      System.out.printf("%b", b);// 41
+   }// 42
 
    public void printByte(byte b) {
-      System.out.println(String.format("%d", b));// 26
-   }// 27
+      System.out.printf("%d", b);// 45
+   }// 46
 
    public void printShort(short s) {
-      System.out.println(String.format("%d", s));// 30
-   }// 31
+      System.out.printf("%d", s);// 49
+   }// 50
 
    public void printInt(int i) {
-      System.out.println(String.format("%d", i));// 34
-   }// 35
+      System.out.printf("%d", i);// 53
+   }// 54
 
    public void printLong(long l) {
-      System.out.println(String.format("%d", l));// 38
-   }// 39
+      System.out.printf("%d", l);// 57
+   }// 58
 
    public void printFloat(float f) {
-      System.out.println(String.format("%f", f));// 42
-   }// 43
+      System.out.printf("%f", f);// 61
+   }// 62
 
    public void printDouble(double d) {
-      System.out.println(String.format("%f", d));// 46
-   }// 47
+      System.out.printf("%f", d);// 65
+   }// 66
 
    public void printChar(char c) {
-      System.out.println(String.format("%c", c));// 50
-   }// 51
+      System.out.printf("%c", c);// 69
+   }// 70
+
+   public void printBooleanBoxed(Boolean b) {
+      System.out.printf("%b", b);// 74
+   }// 75
+
+   public void printByteBoxed(Byte b) {
+      System.out.printf("%d", b);// 78
+   }// 79
+
+   public void printShortBoxed(Short s) {
+      System.out.printf("%d", s);// 82
+   }// 83
 
    public void printIntBoxed(Integer i) {
-      System.out.println(String.format("%d", i));// 55
-   }// 56
+      System.out.printf("%d", i);// 86
+   }// 87
+
+   public void printLongBoxed(Long l) {
+      System.out.printf("%d", l);// 90
+   }// 91
+
+   public void printFloatBoxed(Float f) {
+      System.out.printf("%f", f);// 94
+   }// 95
+
+   public void printDoubleBoxed(Double d) {
+      System.out.printf("%f", d);// 98
+   }// 99
+
+   public void printCharBoxed(Character c) {
+      System.out.printf("%c", c);// 102
+   }// 103
 
    public boolean getBoolean() {
-      return false;// 60
+      return false;// 107
    }
 
    public byte getByte() {
-      return -128;// 64
+      return -128;// 111
    }
 
    public short getShort() {
-      return -32768;// 68
+      return -32768;// 115
    }
 
    public int getInt() {
-      return 42;// 72
+      return 42;// 119
    }
 
    public void printNarrowed() {
-      this.printByte((byte)this.getInt());// 76
-      this.printShort((short)this.getInt());// 77
-   }// 78
+      this.printByte((byte)this.getInt());// 123
+      this.printShort((short)this.getInt());// 124
+   }// 125
 
    public void constructor() {
-      new Byte((byte)1);// 81
-   }// 82
+      new Byte((byte)1);// 128
+   }// 129
 
    private boolean compare(char c) {
-      boolean res = c > -1;// 85
-      res = c > 0;// 86
-      res = c > 1;// 87
-      res = c > '\b';// 88
-      res = c > '\t';// 89
-      res = c > '\n';// 90
-      res = c > '\f';// 91
-      res = c > '\r';// 92
-      res = c > ' ';// 93
-      res = c > 'a';// 94
-      res = c > 'Z';// 95
-      res = c > 127;// 96
-      res = c > 255;// 97
-      return res;// 98
+      boolean res = c > -1;// 132
+      res = c > 0;// 133
+      res = c > 1;// 134
+      res = c > '\b';// 135
+      res = c > '\t';// 136
+      res = c > '\n';// 137
+      res = c > '\f';// 138
+      res = c > '\r';// 139
+      res = c > ' ';// 140
+      res = c > 'a';// 141
+      res = c > 'Z';// 142
+      res = c > 127;// 143
+      res = c > 255;// 144
+      return res;// 145
    }
 }
 
@@ -113,191 +159,285 @@ class 'pkg/TestPrimitives' {
       2d      11
       2f      11
       33      12
-      38      12
+      37      12
       3b      13
-      44      13
-      45      13
-      4b      13
-      4c      13
-      52      13
-      55      13
-      5b      13
-      5d      13
-      63      13
-      65      13
-      6b      13
-      6e      13
-      72      13
-      76      14
-      79      14
-      82      14
-      85      14
-      8c      14
-      8f      14
-      96      14
-      99      14
-      a0      14
-      a3      14
-      a7      14
-      aa      14
-      ad      15
+      40      13
+      44      14
+      4a      14
+      4e      15
+      52      15
+      56      16
+      5b      16
+      5f      17
+      65      17
+      69      18
+      6e      18
+      72      19
+      78      19
+      7c      20
+      81      20
+      84      21
+      87      21
+      90      21
+      91      21
+      97      21
+      98      21
+      9e      21
+      a1      21
+      a7      21
+      a9      21
+      af      21
+      b1      21
+      b7      21
+      ba      21
+      be      21
+      c2      22
+      c5      22
+      ce      22
+      d1      22
+      d8      22
+      db      22
+      e2      22
+      e5      22
+      ec      22
+      ef      22
+      f3      22
+      fb      23
+      fc      23
+      fe      23
+      101      23
+      103      23
+      106      23
+      108      23
+      10b      23
+      115      24
+      11a      24
+      120      24
+      125      24
+      12b      24
+      130      24
+      136      24
+      13b      24
+      143      25
+   }
+
+   method '<init> (ZBSIJFDC)V' {
+      4      28
+      7      28
+      11      28
+      18      28
+      1f      28
+      27      28
+      2f      28
+      37      28
+      40      28
+      49      28
+      4d      28
+      51      29
+   }
+
+   method '<init> (Ljava/lang/Character;Ljava/lang/Double;Ljava/lang/Float;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Short;Ljava/lang/Byte;Ljava/lang/Boolean;)V' {
+      4      32
+      7      32
+      35      32
+      39      33
    }
 
    method 'printBoolean (Z)V' {
-      0      18
-      3      18
-      c      18
-      10      18
-      13      18
-      16      19
+      0      36
+      3      36
+      c      36
+      10      36
+      14      37
    }
 
    method 'printByte (B)V' {
-      0      22
-      3      22
-      c      22
-      10      22
-      13      22
-      16      23
+      0      40
+      3      40
+      c      40
+      10      40
+      14      41
    }
 
    method 'printShort (S)V' {
-      0      26
-      3      26
-      c      26
-      10      26
-      13      26
-      16      27
+      0      44
+      3      44
+      c      44
+      10      44
+      14      45
    }
 
    method 'printInt (I)V' {
-      0      30
-      3      30
-      c      30
-      10      30
-      13      30
-      16      31
+      0      48
+      3      48
+      c      48
+      10      48
+      14      49
    }
 
    method 'printLong (J)V' {
-      0      34
-      3      34
-      c      34
-      10      34
-      13      34
-      16      35
+      0      52
+      3      52
+      c      52
+      10      52
+      14      53
    }
 
    method 'printFloat (F)V' {
-      0      38
-      3      38
-      c      38
-      10      38
-      13      38
-      16      39
+      0      56
+      3      56
+      c      56
+      10      56
+      14      57
    }
 
    method 'printDouble (D)V' {
-      0      42
-      3      42
-      c      42
-      10      42
-      13      42
-      16      43
+      0      60
+      3      60
+      c      60
+      10      60
+      14      61
    }
 
    method 'printChar (C)V' {
-      0      46
-      3      46
-      c      46
-      10      46
-      13      46
-      16      47
+      0      64
+      3      64
+      c      64
+      10      64
+      14      65
+   }
+
+   method 'printBooleanBoxed (Ljava/lang/Boolean;)V' {
+      0      68
+      3      68
+      d      68
+      11      69
+   }
+
+   method 'printByteBoxed (Ljava/lang/Byte;)V' {
+      0      72
+      3      72
+      d      72
+      11      73
+   }
+
+   method 'printShortBoxed (Ljava/lang/Short;)V' {
+      0      76
+      3      76
+      d      76
+      11      77
    }
 
    method 'printIntBoxed (Ljava/lang/Integer;)V' {
-      0      50
-      3      50
-      d      50
-      10      50
-      13      51
+      0      80
+      3      80
+      d      80
+      11      81
+   }
+
+   method 'printLongBoxed (Ljava/lang/Long;)V' {
+      0      84
+      3      84
+      d      84
+      11      85
+   }
+
+   method 'printFloatBoxed (Ljava/lang/Float;)V' {
+      0      88
+      3      88
+      d      88
+      11      89
+   }
+
+   method 'printDoubleBoxed (Ljava/lang/Double;)V' {
+      0      92
+      3      92
+      d      92
+      11      93
+   }
+
+   method 'printCharBoxed (Ljava/lang/Character;)V' {
+      0      96
+      3      96
+      d      96
+      11      97
    }
 
    method 'getBoolean ()Z' {
-      0      54
-      1      54
+      0      100
+      1      100
    }
 
    method 'getByte ()B' {
-      0      58
-      2      58
+      0      104
+      2      104
    }
 
    method 'getShort ()S' {
-      0      62
-      3      62
+      0      108
+      3      108
    }
 
    method 'getInt ()I' {
-      0      66
-      2      66
+      0      112
+      2      112
    }
 
    method 'printNarrowed ()V' {
-      2      70
-      5      70
-      6      70
-      b      71
-      e      71
-      f      71
-      12      72
+      2      116
+      5      116
+      6      116
+      b      117
+      e      117
+      f      117
+      12      118
    }
 
    method 'constructor ()V' {
-      4      75
-      9      76
+      4      121
+      9      122
    }
 
    method 'compare (C)Z' {
-      1      79
-      2      79
-      a      79
-      c      80
-      14      80
-      16      81
-      17      81
-      1f      81
-      21      82
-      23      82
-      2b      82
-      2d      83
-      2f      83
-      37      83
-      39      84
-      3b      84
-      43      84
-      45      85
-      47      85
-      4f      85
-      51      86
-      53      86
-      5b      86
-      5d      87
-      5f      87
-      67      87
-      69      88
-      6b      88
-      73      88
-      75      89
-      77      89
-      7f      89
-      81      90
-      83      90
-      8b      90
-      8d      91
-      90      91
-      98      91
-      9a      92
+      1      125
+      2      125
+      a      125
+      c      126
+      14      126
+      16      127
+      17      127
+      1f      127
+      21      128
+      23      128
+      2b      128
+      2d      129
+      2f      129
+      37      129
+      39      130
+      3b      130
+      43      130
+      45      131
+      47      131
+      4f      131
+      51      132
+      53      132
+      5b      132
+      5d      133
+      5f      133
+      67      133
+      69      134
+      6b      134
+      73      134
+      75      135
+      77      135
+      7f      135
+      81      136
+      83      136
+      8b      136
+      8d      137
+      90      137
+      98      137
+      9a      138
    }
 }
 
@@ -311,47 +451,78 @@ Lines mapping:
 12 <-> 11
 13 <-> 12
 15 <-> 13
-17 <-> 14
-18 <-> 15
-19 <-> 16
-22 <-> 19
-23 <-> 20
+16 <-> 14
+17 <-> 15
+18 <-> 16
+19 <-> 17
+20 <-> 18
+21 <-> 19
+22 <-> 20
+23 <-> 21
+25 <-> 22
 26 <-> 23
-27 <-> 24
-30 <-> 27
-31 <-> 28
-34 <-> 31
-35 <-> 32
-38 <-> 35
-39 <-> 36
-42 <-> 39
-43 <-> 40
-46 <-> 43
-47 <-> 44
-50 <-> 47
-51 <-> 48
-55 <-> 51
-56 <-> 52
-60 <-> 55
-64 <-> 59
-68 <-> 63
-72 <-> 67
-76 <-> 71
-77 <-> 72
+28 <-> 24
+29 <-> 25
+30 <-> 26
+33 <-> 29
+34 <-> 30
+37 <-> 33
+38 <-> 34
+41 <-> 37
+42 <-> 38
+45 <-> 41
+46 <-> 42
+49 <-> 45
+50 <-> 46
+53 <-> 49
+54 <-> 50
+57 <-> 53
+58 <-> 54
+61 <-> 57
+62 <-> 58
+65 <-> 61
+66 <-> 62
+69 <-> 65
+70 <-> 66
+74 <-> 69
+75 <-> 70
 78 <-> 73
-81 <-> 76
+79 <-> 74
 82 <-> 77
-85 <-> 80
+83 <-> 78
 86 <-> 81
 87 <-> 82
-88 <-> 83
-89 <-> 84
 90 <-> 85
 91 <-> 86
-92 <-> 87
-93 <-> 88
 94 <-> 89
 95 <-> 90
-96 <-> 91
-97 <-> 92
 98 <-> 93
+99 <-> 94
+102 <-> 97
+103 <-> 98
+107 <-> 101
+111 <-> 105
+115 <-> 109
+119 <-> 113
+123 <-> 117
+124 <-> 118
+125 <-> 119
+128 <-> 122
+129 <-> 123
+132 <-> 126
+133 <-> 127
+134 <-> 128
+135 <-> 129
+136 <-> 130
+137 <-> 131
+138 <-> 132
+139 <-> 133
+140 <-> 134
+141 <-> 135
+142 <-> 136
+143 <-> 137
+144 <-> 138
+145 <-> 139
+Not mapped:
+32
+36
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 9448e4d..99b4fa1 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -12,47 +12,94 @@ public class TestPrimitives {
     printDouble(1.23);
     printChar('Z');
 
+    printBooleanBoxed(true);
+    printByteBoxed((byte) 123);
+    printShortBoxed((short) 257);
+    printIntBoxed(1);
     printIntBoxed(40_000);
+    printLongBoxed(123L);
+    printFloatBoxed(1.23F);
+    printDoubleBoxed(1.23);
+    printCharBoxed('Z');
 
-    String.format("%b, %d, %d, %d, %c, %d", true, 1, 213, 40_000, 'c', 42L);
-    System.out.println(String.format("%b, %d, %d, %d", getBoolean(), getByte(), getShort(), getInt()));
+    System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40_000, 'c', 42L);
+    System.out.printf("%b, %d, %d, %d", getBoolean(), getByte(), getShort(), getInt());
+
+    new TestPrimitives(false, (byte) 123, (short) 257, 40_000, 123L, 3.14f, 1.618, 'A');
+    new TestPrimitives('A', 1.618, 3.14f, 123L, 40_000, (short) 257, (byte) 123, false);
+  }
+
+  private TestPrimitives(boolean bool, byte b, short s, int i, long l, float f, double d, char c) {
+    System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);
+  }
+
+  private TestPrimitives(Character c, Double d, Float f, Long l, Integer i, Short s, Byte b, Boolean bool) {
+    System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);
   }
 
   public void printBoolean(boolean b) {
-    System.out.println(String.format("%b", b));
+    System.out.printf("%b", b);
   }
 
   public void printByte(byte b) {
-    System.out.println(String.format("%d", b));
+    System.out.printf("%d", b);
   }
 
   public void printShort(short s) {
-    System.out.println(String.format("%d", s));
+    System.out.printf("%d", s);
   }
 
   public void printInt(int i) {
-    System.out.println(String.format("%d", i));
+    System.out.printf("%d", i);
   }
 
   public void printLong(long l) {
-    System.out.println(String.format("%d", l));
+    System.out.printf("%d", l);
   }
 
   public void printFloat(float f) {
-    System.out.println(String.format("%f", f));
+    System.out.printf("%f", f);
   }
 
   public void printDouble(double d) {
-    System.out.println(String.format("%f", d));
+    System.out.printf("%f", d);
   }
 
   public void printChar(char c) {
-    System.out.println(String.format("%c", c));
+    System.out.printf("%c", c);
   }
 
 
+  public void printBooleanBoxed(Boolean b) {
+    System.out.printf("%b", b);
+  }
+
+  public void printByteBoxed(Byte b) {
+    System.out.printf("%d", b);
+  }
+
+  public void printShortBoxed(Short s) {
+    System.out.printf("%d", s);
+  }
+
   public void printIntBoxed(Integer i) {
-    System.out.println(String.format("%d", i));
+    System.out.printf("%d", i);
+  }
+
+  public void printLongBoxed(Long l) {
+    System.out.printf("%d", l);
+  }
+
+  public void printFloatBoxed(Float f) {
+    System.out.printf("%f", f);
+  }
+
+  public void printDoubleBoxed(Double d) {
+    System.out.printf("%f", d);
+  }
+
+  public void printCharBoxed(Character c) {
+    System.out.printf("%c", c);
   }
 
 

From 39db41ee8bac1e4891f3ccda981e01dc2b51d347 Mon Sep 17 00:00:00 2001
From: Dmitry Cherniachenko <d.cherniachenko@gmail.com>
Date: Fri, 23 Jun 2017 23:22:32 +0200
Subject: [PATCH 145/252] Omit unnecessary unboxing calls in decompiled code

---
 .../decompiler/exps/InvocationExprent.java    |  24 +
 testData/classes/pkg/TestPrimitives.class     | Bin 5321 -> 6439 bytes
 testData/obfuscated/aj.java                   |   2 +-
 testData/obfuscated/o.java                    |   2 +-
 testData/results/TestClassLambda.dec          |   2 +-
 testData/results/TestPrimitives.dec           | 731 ++++++++++--------
 testData/src/pkg/TestPrimitives.java          |  22 +
 7 files changed, 467 insertions(+), 316 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 5467955..4cd7b67 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -267,6 +267,12 @@ public class InvocationExprent extends Exprent {
         else if (instance != null) {
           TextBuffer res = instance.toJava(indent, tracer);
 
+          if (isUnboxingCall()) {
+            // we don't print the unboxing call - no need to bother with the instance wrapping / casting
+            buf.append(res);
+            return buf;
+          }
+
           VarType rightType = instance.getExprType();
           VarType leftType = new VarType(CodeConstants.TYPE_OBJECT, 0, classname);
 
@@ -460,6 +466,24 @@ public class InvocationExprent extends Exprent {
     return null;
   }
 
+  private static final Map<String, String> UNBOXING_METHODS;
+
+  static {
+    UNBOXING_METHODS = new HashMap<>();
+    UNBOXING_METHODS.put("booleanValue", "java/lang/Boolean");
+    UNBOXING_METHODS.put("byteValue", "java/lang/Byte");
+    UNBOXING_METHODS.put("shortValue", "java/lang/Short");
+    UNBOXING_METHODS.put("intValue", "java/lang/Integer");
+    UNBOXING_METHODS.put("longValue", "java/lang/Long");
+    UNBOXING_METHODS.put("floatValue", "java/lang/Float");
+    UNBOXING_METHODS.put("doubleValue", "java/lang/Double");
+    UNBOXING_METHODS.put("charValue", "java/lang/Character");
+  }
+
+  private boolean isUnboxingCall() {
+    return !isStatic && lstParameters.size() == 0 && classname.equals(UNBOXING_METHODS.get(name));
+  }
+
   private BitSet getAmbiguousParameters() {
     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
     if (cl == null) return EMPTY_BIT_SET;
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index e0e83c7a4f399a0776e8537c094cfdb40d921ec2..fa6cc59684414f119896ce8f8f09b6349647834f 100644
GIT binary patch
literal 6439
zcmb7I33yyp75?wcWZui<wVh0sHcbm*38d4KHf@2D6q+WX(2~-^ltRKfNvG*Rl1V3%
zvQ(rfsDLPo0!l%FBB+Rf_!=o7iYp>+px}<UptvI<iok#Fdo%A%n4w?$@h<0{x#vIY
zJ@?)`@y0`s0$8e=B3Ow}%kUW)J}bjL75qv5ZI{{SLMv_=+a=V!;T136TYJ&-$K5Nl
z&&zOM1oz_sp}r8oNqA7GFGgTvw@{N2d<hQ;wI>Md?2O=HJR;LaBlt2N6Y47wd=-xi
z^|c7v@O7cSVd9&D`z;y1ZQ==m{*DY!n)t4uKPAKW1pWIm{6K(zD8r9TJT2JI$nayq
z{)r6F8hB3Ne=5VzM90r%_(dgtiC>xcwSnjJKF1^Y4PG$uTUqcs8GbLrA7psZz#l`M
z$G`G;c*SckBwl^$xtYTKlMFAJ__K+>nE0!SzeTVNe>d?D6aO^vvWb70c*VfK#e-KB
z%&}~GG`DhiSRvRlZ=*t}JF_XJFrzm;nmTb}WFVE@kQ^8$C)S%8Ob%~MX45ivnW5a4
z^teK8@7Q@m3pb?3bL+F|k#sJ-Ej8Yu5MG`hP3MkLsA}o&N~~V9s;6747|3L(PxbQ~
z;Mc{EAS%Hx&2Ke7`F#z)&HPsJ+r+Pj-ypwkh3i^+&rNPiE*wsd4lV57lFTLtbE#~H
zkJ*!%pqYNos^LsB=V$b0Mu+_K)uXx8P%%nkOD0<+({*942(*i?q>`f@;#Zwdy=Rj|
z&a>4uOQG7wbSzVd`gqzng&H3#Z(p&nV`8zewz60_Z>WN$Q|`{0@RoitzS7~+Jz;eT
zE23E%Uw8@OIrTzIgtOWc6mx~O#uL<D32&9~sx+A6zA$?{S&5afba7Pst?SBMkYeWR
z{n^etBJ$G<M!PF(idIUlWZ4YQ5qDj!f1MLSSvXBEq<5th=fm$Q7N<)o*17W(>p+xJ
z?Brb*MzvxmI_}Ckzlm<yc&a64?!sCAg<jps+Q?9fuILKY`<pw?5SGp|_d9o<$+??i
zGPni9Wa#{I%AF_>uIH@qmU$)X(c+?lW`&tW%L+fRBRBy*F`3O~&X>$q4Q58ibJ>Z(
zT!tlJ3}!~gl387W-ScQ{Fq>jyn3l*T2hUrZ9CMpaB$1iO4yIP6r7hJIcb!(*Y8EE2
z&BFP(z`}*N$ijBK%fiKYw}nfv!@{L_kA?T*G6Vmy@EZPW;c~oBsQ+1bKR#gKb(#F%
z!WFpEz#B4o)52BwpuydP*OanwH9lmhfJ}lGK8$M&6_QDXg==x0P+<$#<0C9<dY2N0
zVJQ<g(5JS=OJrVYsR(Z3eDUE&%Dl=V?8k+gW~u4eDbx&0MO8IH+FBi<n5Ak|t^8DH
zsd_b&{(HTp5NHeixXe<sRD*?EaI1w+;FE@$ZK*~zhr6kHU_n#!Cf_$GG>g!KS~qZR
zYA|Q0xt7{b?az%?EMwuLxWU4WxXHrD#ORx`lYQ>(hk#gex(w{+6`Pa8<IGsa(nb77
zr<Sy~E#<VW^@z4*vSx$AfyH`U8(SA|CgqGg00PZCH3DLBpqb}Gpqaesp6ycI0(SxX
zq>r252FAAJ@I-1I1?$=QeC3>PEQ~4ppZ^ExBkUp`n7d(W*%N*1oIX;dwXk#Q*(`la
z^Sz|VaHogXu!s6q>RwW$-0iEi?5n<YPA@4+V!qkdvDx}oy1hhU7CWwwUnn2?dZ@pr
zByzkX40ZU|da<$woWO3Bs45)1H$f+sl>_|0E7H6dk$hMq<8m0gLVGjN3$U3U%?s_#
zI5*an!|dy>9yUQ<L-uB3KKPN%a>wvQd2=~rFWwchQMF0mSUlk#9?FAk^B#v6AKxBL
zTsWRfjj(}aCU_dVmydL2;d;5zF=wgd2s7#QhhjFHygqNZ2bPyG?{r^LIE^5m`(l_5
z9DtR)UCO^XP)J|{$5Vj7B&L%>AQBJRQ1R$?8-aMWQZ|Bm5{lQN!iEu#nKmjpiP*5>
z(S94#;vov#n89_Eh}x(Yxk<!q)W}b@HtOQBdY2%|Bxc%}MW9JE*qAL?lW4Rthj5da
zYh%B7Z2w6#**HK<i5)nJgKQiu2F02uafppW#VX;q*qCP{r0KYg`P#q*lQ_&qtC$%h
zz0k%Yv2_pH`l9{2vDn5Ev6}0by5b}cceoGWh}e<Q@FQ5(7ZkS=eIaon(N|H8XEYJk
zt|a=5=pc<v^qI9diXJ6wbet;E%MC3|$fF&3QpYeZgdnwoaY^)rNp%XE2<^ejzF>4a
zV-~AtbYfk#=#H-3jbrsM(UsIf4kHxnV!)jEX&am<>!1gzYByGCiP&*Y?DBET$1HZd
z6EERY|NPi$Cr+_7PK<PXs8`}6+V5wL1hA3gl{k=N7!@#31rsq;ViqFUpR;BjuM02@
zi!lT3h@u<SSj!cspay557F$q<t*GaDJ`<Or0oPzQcA^n?v;H2$Ts(&T@FbC*MH616
zo|kbD-axZjjziQ|w5Y2vPd$RTdI|FbmDF@9EwP+R#cAl%HuAu7su)je3xSj4yK#bK
zqc>{mbTm4-nByd3u9Jm2C$&bslq54b(_nxTebMkNmS!UfqmGq1S7*tK#&qy8idKZM
zkPos&+M+WU5o&cU66y?`DOQp?3uiNqLY;%8mOU8*7^J-LHX+5h3bh$Sv|gw!NHfYp
zos07r=YX8Xu7?jZ52CAms)r3GYqh~(nKgu2VGR{5(S{JcI!ruTAl}R`>B(YRvIIwA
zsn3)4f+y{?VMKe<PP<06C+)N~qdjS-{bSmbcKWncd(uunv$T>n()V%gQ#<34qfbh%
zd9EjGxklnrCwW>M^3o)m!V9;!4;;x-TBZ%GcZ3QC)=`OsTFK?H6!eJ&=;##x9q0~1
zFE0yywua`F^qrw&C81Xky0Z+l6oXjJi|#u^J6&RGK)MOtQwCb9OQ3muE<hVPUpm%q
zK-glPt~C|<I6@y^23pEhpm`}TK>O0T&WZIwvX4ro@dQHmmVuV~7ieDf3(!8RUFbt)
zXO@CqN9grspk+e|G#?NJXrI;V3l%bTuR9fzAoPYZ(6U1Xn$HmzdW~DxF<)Iz-FXh~
zY3!AKKHONLsADYZoW|wjrWCH5!_v5C5ckZoxZ@g^@1%XkJ%_l-GPttmB@TRY?KAEs
z;-<>rN>>qFzTWm3cMEaTWpJf$2`(RkrEuM9D;?iq;*ONTmCh)*d{gc-?ig{mmcf<Y
zE4X~2mcn&QxU{`F;!c#ob-KHf*P)BMK<nYzAH0W+*SP_N$pateh0~XO=k!(bq;w?@
zb0ve(9aBXw_K5}yqI`(DqOGoIsCoyc%3kV|4HabhetnzT_*Bu$eWIRPKCoTUMXp-s
zQg`1Jf3NUKhYO1NGM_4~@2yj%uP!NlTmHt4V;Mt<YK`1PJFk`Ntq|AqZtHbq=dy7v
zkNoR+sk+_=SyM3R_5$QGHhF=J?7>NWq1`z7ZRh9>M7q(35^+%ixC6T!x6}$6CRd!B
z8w0ywgziEpcy!~f1uEn*qo$9p^wAL?ZTaYFKDx<ACw+9kkG{mCtMO)GGDq?p)OXW%
zzFWXDs^T9s>R1v@{PW2I=64zYg3`lGt;cP=d)&^u%N^{fyLfEf$qw}?{te_V9fl^y
uRW}TDTHm?&XD;@IJK048Tni%3uIyB=!&IG$M5O$GRh_a+@1jfqcfSQNDJOye

literal 5321
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
MQYjBo#)F6c52^>=5dZ)H

diff --git a/testData/obfuscated/aj.java b/testData/obfuscated/aj.java
index 4ced9b7..f0d84c1 100644
--- a/testData/obfuscated/aj.java
+++ b/testData/obfuscated/aj.java
@@ -105,7 +105,7 @@ public class aj implements am {
                Entry var6 = (Entry)var5.next();
                Long var7 = (Long)this.b.get(var6.getKey());
                if (var7 != null) {
-                  double var8 = (double)((((Long)var6.getValue()).longValue() - var7.longValue()) * 10L) / (double)var3;
+                  double var8 = (double)(((Long)var6.getValue() - var7) * 10L) / (double)var3;
                   var1.a((Object)(new ar(h[1], (String)var6.getKey(), "%", var8 * 100.0D)));
                }
             }
diff --git a/testData/obfuscated/o.java b/testData/obfuscated/o.java
index 226c629..8e00c49 100644
--- a/testData/obfuscated/o.java
+++ b/testData/obfuscated/o.java
@@ -154,7 +154,7 @@ public class o {
 
       try {
          if (this.a instanceof Boolean) {
-            return ((Boolean)this.a).booleanValue();
+            return (Boolean)this.a;
          }
       } catch (IllegalArgumentException var3) {
          throw var3;
diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index bc12180..daeb7e1 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -18,7 +18,7 @@ public class TestClassLambda {
       List var1 = Arrays.asList(1, 2, 3, 4, 5, 6, 7);// 29
       int var2 = (int)Math.random();// 30
       var1.forEach((var2x) -> {// 32
-         int var3 = 2 * var2x.intValue();// 33
+         int var3 = 2 * var2x;// 33
          System.out.println(var3 + var2 + this.field);// 34
       });// 35
    }// 36
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 3a590f4..043ed9f 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -19,124 +19,143 @@ public class TestPrimitives {
       this.printFloatBoxed(1.23F);// 21
       this.printDoubleBoxed(1.23D);// 22
       this.printCharBoxed('Z');// 23
-      System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 25
-      System.out.printf("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt());// 26
-      new TestPrimitives(false, (byte)123, (short)257, 40000, 123L, 3.14F, 1.618D, 'A');// 28
-      new TestPrimitives('A', 1.618D, 3.14F, 123L, 40000, (short)257, (byte)123, false);// 29
-   }// 30
+      this.printBoolean(Boolean.valueOf("true"));// 25
+      this.printByte(Byte.valueOf("123"));// 26
+      this.printShort(Short.valueOf("257"));// 27
+      this.printInt(Integer.valueOf("123"));// 28
+      this.printLong(Long.valueOf("123"));// 29
+      this.printFloat(Float.valueOf("1.23"));// 30
+      this.printDouble(Double.valueOf("1.23"));// 31
+      this.printChar(new Character('Z'));// 32
+      this.printInt(this.getInteger());// 34
+      this.printChar(this.getCharacter());// 35
+      System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 37
+      System.out.printf("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt());// 38
+      new TestPrimitives(false, (byte)123, (short)257, 40000, 123L, 3.14F, 1.618D, 'A');// 40
+      new TestPrimitives('A', 1.618D, 3.14F, 123L, 40000, (short)257, (byte)123, false);// 41
+      new TestPrimitives(Boolean.valueOf("false"), Byte.valueOf("123"), Short.valueOf("257"), Integer.valueOf("40000"), Long.valueOf("123"), Float.valueOf("3.14"), Double.valueOf("1.618"), new Character('A'));// 42 43
+   }// 44
 
    private TestPrimitives(boolean bool, byte b, short s, int i, long l, float f, double d, char c) {
-      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 33
-   }// 34
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 47
+   }// 48
 
    private TestPrimitives(Character c, Double d, Float f, Long l, Integer i, Short s, Byte b, Boolean bool) {
-      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 37
-   }// 38
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 51
+   }// 52
 
    public void printBoolean(boolean b) {
-      System.out.printf("%b", b);// 41
-   }// 42
+      System.out.printf("%b", b);// 55
+   }// 56
 
    public void printByte(byte b) {
-      System.out.printf("%d", b);// 45
-   }// 46
+      System.out.printf("%d", b);// 59
+   }// 60
 
    public void printShort(short s) {
-      System.out.printf("%d", s);// 49
-   }// 50
+      System.out.printf("%d", s);// 63
+   }// 64
 
    public void printInt(int i) {
-      System.out.printf("%d", i);// 53
-   }// 54
+      System.out.printf("%d", i);// 67
+   }// 68
 
    public void printLong(long l) {
-      System.out.printf("%d", l);// 57
-   }// 58
+      System.out.printf("%d", l);// 71
+   }// 72
 
    public void printFloat(float f) {
-      System.out.printf("%f", f);// 61
-   }// 62
+      System.out.printf("%f", f);// 75
+   }// 76
 
    public void printDouble(double d) {
-      System.out.printf("%f", d);// 65
-   }// 66
+      System.out.printf("%f", d);// 79
+   }// 80
 
    public void printChar(char c) {
-      System.out.printf("%c", c);// 69
-   }// 70
+      System.out.printf("%c", c);// 83
+   }// 84
 
    public void printBooleanBoxed(Boolean b) {
-      System.out.printf("%b", b);// 74
-   }// 75
+      System.out.printf("%b", b);// 88
+   }// 89
 
    public void printByteBoxed(Byte b) {
-      System.out.printf("%d", b);// 78
-   }// 79
+      System.out.printf("%d", b);// 92
+   }// 93
 
    public void printShortBoxed(Short s) {
-      System.out.printf("%d", s);// 82
-   }// 83
+      System.out.printf("%d", s);// 96
+   }// 97
 
    public void printIntBoxed(Integer i) {
-      System.out.printf("%d", i);// 86
-   }// 87
+      System.out.printf("%d", i);// 100
+   }// 101
 
    public void printLongBoxed(Long l) {
-      System.out.printf("%d", l);// 90
-   }// 91
+      System.out.printf("%d", l);// 104
+   }// 105
 
    public void printFloatBoxed(Float f) {
-      System.out.printf("%f", f);// 94
-   }// 95
+      System.out.printf("%f", f);// 108
+   }// 109
 
    public void printDoubleBoxed(Double d) {
-      System.out.printf("%f", d);// 98
-   }// 99
+      System.out.printf("%f", d);// 112
+   }// 113
 
    public void printCharBoxed(Character c) {
-      System.out.printf("%c", c);// 102
-   }// 103
+      System.out.printf("%c", c);// 116
+   }// 117
 
    public boolean getBoolean() {
-      return false;// 107
+      return false;// 121
    }
 
    public byte getByte() {
-      return -128;// 111
+      return -128;// 125
    }
 
    public short getShort() {
-      return -32768;// 115
+      return -32768;// 129
    }
 
    public int getInt() {
-      return 42;// 119
+      return 42;// 133
+   }
+
+   public Integer getInteger() {
+      return 40000;// 137
+   }
+
+   public Character getCharacter() {
+      return 'Z';// 141
    }
 
    public void printNarrowed() {
-      this.printByte((byte)this.getInt());// 123
-      this.printShort((short)this.getInt());// 124
-   }// 125
+      this.printByte((byte)this.getInt());// 145
+      this.printShort((short)this.getInt());// 146
+   }// 147
 
    public void constructor() {
-      new Byte((byte)1);// 128
-   }// 129
+      new Byte((byte)1);// 150
+   }// 151
 
    private boolean compare(char c) {
-      boolean res = c > -1;// 132
-      res = c > 0;// 133
-      res = c > 1;// 134
-      res = c > '\b';// 135
-      res = c > '\t';// 136
-      res = c > '\n';// 137
-      res = c > '\f';// 138
-      res = c > '\r';// 139
-      res = c > ' ';// 140
-      res = c > 'a';// 141
-      res = c > 'Z';// 142
-      res = c > 127;// 143
-      res = c > 255;// 144
-      return res;// 145
+      boolean res = c > -1;// 154
+      res = c > 0;// 155
+      res = c > 1;// 156
+      res = c > '\b';// 157
+      res = c > '\t';// 158
+      res = c > '\n';// 159
+      res = c > '\f';// 160
+      res = c > '\r';// 161
+      res = c > ' ';// 162
+      res = c > 'a';// 163
+      res = c > 'Z';// 164
+      res = c > 127;// 165
+      res = c > 255;// 166
+      return res;// 167
    }
 }
 
@@ -176,268 +195,340 @@ class 'pkg/TestPrimitives' {
       78      19
       7c      20
       81      20
-      84      21
+      85      21
       87      21
-      90      21
-      91      21
-      97      21
-      98      21
-      9e      21
-      a1      21
-      a7      21
-      a9      21
-      af      21
-      b1      21
-      b7      21
-      ba      21
-      be      21
-      c2      22
-      c5      22
-      ce      22
-      d1      22
-      d8      22
-      db      22
-      e2      22
-      e5      22
-      ec      22
-      ef      22
-      f3      22
-      fb      23
-      fc      23
-      fe      23
-      101      23
-      103      23
-      106      23
-      108      23
-      10b      23
-      115      24
-      11a      24
-      120      24
-      125      24
-      12b      24
-      130      24
-      136      24
-      13b      24
-      143      25
+      8a      21
+      8d      21
+      91      22
+      93      22
+      96      22
+      99      22
+      9d      23
+      9f      23
+      a2      23
+      a5      23
+      a9      24
+      ab      24
+      ae      24
+      b1      24
+      b5      25
+      b7      25
+      ba      25
+      bd      25
+      c1      26
+      c3      26
+      c6      26
+      c9      26
+      cd      27
+      cf      27
+      d2      27
+      d5      27
+      dd      28
+      e2      28
+      e5      28
+      ea      29
+      ed      29
+      f0      29
+      f5      30
+      f8      30
+      fb      30
+      fe      31
+      101      31
+      10a      31
+      10b      31
+      111      31
+      112      31
+      118      31
+      11b      31
+      121      31
+      123      31
+      129      31
+      12b      31
+      131      31
+      134      31
+      138      31
+      13c      32
+      13f      32
+      148      32
+      14b      32
+      152      32
+      155      32
+      15c      32
+      15f      32
+      166      32
+      169      32
+      16d      32
+      175      33
+      176      33
+      178      33
+      17b      33
+      17d      33
+      180      33
+      182      33
+      185      33
+      18f      34
+      194      34
+      19a      34
+      19f      34
+      1a5      34
+      1aa      34
+      1b0      34
+      1b5      34
+      1c1      35
+      1c3      35
+      1c6      35
+      1c9      35
+      1cb      35
+      1ce      35
+      1d1      35
+      1d3      35
+      1d6      35
+      1d9      35
+      1db      35
+      1de      35
+      1e1      35
+      1e3      35
+      1e6      35
+      1e9      35
+      1eb      35
+      1ee      35
+      1f1      35
+      1f3      35
+      1f6      35
+      1fd      35
+      202      35
+      209      36
    }
 
    method '<init> (ZBSIJFDC)V' {
-      4      28
-      7      28
-      11      28
-      18      28
-      1f      28
-      27      28
-      2f      28
-      37      28
-      40      28
-      49      28
-      4d      28
-      51      29
+      4      39
+      7      39
+      11      39
+      18      39
+      1f      39
+      27      39
+      2f      39
+      37      39
+      40      39
+      49      39
+      4d      39
+      51      40
    }
 
    method '<init> (Ljava/lang/Character;Ljava/lang/Double;Ljava/lang/Float;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Short;Ljava/lang/Byte;Ljava/lang/Boolean;)V' {
-      4      32
-      7      32
-      35      32
-      39      33
+      4      43
+      7      43
+      35      43
+      39      44
    }
 
    method 'printBoolean (Z)V' {
-      0      36
-      3      36
-      c      36
-      10      36
-      14      37
+      0      47
+      3      47
+      c      47
+      10      47
+      14      48
    }
 
    method 'printByte (B)V' {
-      0      40
-      3      40
-      c      40
-      10      40
-      14      41
+      0      51
+      3      51
+      c      51
+      10      51
+      14      52
    }
 
    method 'printShort (S)V' {
-      0      44
-      3      44
-      c      44
-      10      44
-      14      45
+      0      55
+      3      55
+      c      55
+      10      55
+      14      56
    }
 
    method 'printInt (I)V' {
-      0      48
-      3      48
-      c      48
-      10      48
-      14      49
+      0      59
+      3      59
+      c      59
+      10      59
+      14      60
    }
 
    method 'printLong (J)V' {
-      0      52
-      3      52
-      c      52
-      10      52
-      14      53
+      0      63
+      3      63
+      c      63
+      10      63
+      14      64
    }
 
    method 'printFloat (F)V' {
-      0      56
-      3      56
-      c      56
-      10      56
-      14      57
+      0      67
+      3      67
+      c      67
+      10      67
+      14      68
    }
 
    method 'printDouble (D)V' {
-      0      60
-      3      60
-      c      60
-      10      60
-      14      61
+      0      71
+      3      71
+      c      71
+      10      71
+      14      72
    }
 
    method 'printChar (C)V' {
-      0      64
-      3      64
-      c      64
-      10      64
-      14      65
+      0      75
+      3      75
+      c      75
+      10      75
+      14      76
    }
 
    method 'printBooleanBoxed (Ljava/lang/Boolean;)V' {
-      0      68
-      3      68
-      d      68
-      11      69
+      0      79
+      3      79
+      d      79
+      11      80
    }
 
    method 'printByteBoxed (Ljava/lang/Byte;)V' {
-      0      72
-      3      72
-      d      72
-      11      73
+      0      83
+      3      83
+      d      83
+      11      84
    }
 
    method 'printShortBoxed (Ljava/lang/Short;)V' {
-      0      76
-      3      76
-      d      76
-      11      77
+      0      87
+      3      87
+      d      87
+      11      88
    }
 
    method 'printIntBoxed (Ljava/lang/Integer;)V' {
-      0      80
-      3      80
-      d      80
-      11      81
+      0      91
+      3      91
+      d      91
+      11      92
    }
 
    method 'printLongBoxed (Ljava/lang/Long;)V' {
-      0      84
-      3      84
-      d      84
-      11      85
+      0      95
+      3      95
+      d      95
+      11      96
    }
 
    method 'printFloatBoxed (Ljava/lang/Float;)V' {
-      0      88
-      3      88
-      d      88
-      11      89
+      0      99
+      3      99
+      d      99
+      11      100
    }
 
    method 'printDoubleBoxed (Ljava/lang/Double;)V' {
-      0      92
-      3      92
-      d      92
-      11      93
+      0      103
+      3      103
+      d      103
+      11      104
    }
 
    method 'printCharBoxed (Ljava/lang/Character;)V' {
-      0      96
-      3      96
-      d      96
-      11      97
+      0      107
+      3      107
+      d      107
+      11      108
    }
 
    method 'getBoolean ()Z' {
-      0      100
-      1      100
+      0      111
+      1      111
    }
 
    method 'getByte ()B' {
-      0      104
-      2      104
+      0      115
+      2      115
    }
 
    method 'getShort ()S' {
-      0      108
-      3      108
+      0      119
+      3      119
    }
 
    method 'getInt ()I' {
-      0      112
-      2      112
+      0      123
+      2      123
+   }
+
+   method 'getInteger ()Ljava/lang/Integer;' {
+      0      127
+      2      127
+      5      127
+   }
+
+   method 'getCharacter ()Ljava/lang/Character;' {
+      0      131
+      2      131
+      5      131
    }
 
    method 'printNarrowed ()V' {
-      2      116
-      5      116
-      6      116
-      b      117
-      e      117
-      f      117
-      12      118
+      2      135
+      5      135
+      6      135
+      b      136
+      e      136
+      f      136
+      12      137
    }
 
    method 'constructor ()V' {
-      4      121
-      9      122
+      4      140
+      9      141
    }
 
    method 'compare (C)Z' {
-      1      125
-      2      125
-      a      125
-      c      126
-      14      126
-      16      127
-      17      127
-      1f      127
-      21      128
-      23      128
-      2b      128
-      2d      129
-      2f      129
-      37      129
-      39      130
-      3b      130
-      43      130
-      45      131
-      47      131
-      4f      131
-      51      132
-      53      132
-      5b      132
-      5d      133
-      5f      133
-      67      133
-      69      134
-      6b      134
-      73      134
-      75      135
-      77      135
-      7f      135
-      81      136
-      83      136
-      8b      136
-      8d      137
-      90      137
-      98      137
-      9a      138
+      1      144
+      2      144
+      a      144
+      c      145
+      14      145
+      16      146
+      17      146
+      1f      146
+      21      147
+      23      147
+      2b      147
+      2d      148
+      2f      148
+      37      148
+      39      149
+      3b      149
+      43      149
+      45      150
+      47      150
+      4f      150
+      51      151
+      53      151
+      5b      151
+      5d      152
+      5f      152
+      67      152
+      69      153
+      6b      153
+      73      153
+      75      154
+      77      154
+      7f      154
+      81      155
+      83      155
+      8b      155
+      8d      156
+      90      156
+      98      156
+      9a      157
    }
 }
 
@@ -461,68 +552,82 @@ Lines mapping:
 23 <-> 21
 25 <-> 22
 26 <-> 23
-28 <-> 24
-29 <-> 25
-30 <-> 26
-33 <-> 29
+27 <-> 24
+28 <-> 25
+29 <-> 26
+30 <-> 27
+31 <-> 28
+32 <-> 29
 34 <-> 30
-37 <-> 33
-38 <-> 34
-41 <-> 37
-42 <-> 38
-45 <-> 41
-46 <-> 42
-49 <-> 45
-50 <-> 46
-53 <-> 49
-54 <-> 50
-57 <-> 53
-58 <-> 54
-61 <-> 57
-62 <-> 58
-65 <-> 61
-66 <-> 62
-69 <-> 65
-70 <-> 66
-74 <-> 69
-75 <-> 70
-78 <-> 73
-79 <-> 74
-82 <-> 77
-83 <-> 78
-86 <-> 81
-87 <-> 82
-90 <-> 85
-91 <-> 86
-94 <-> 89
-95 <-> 90
-98 <-> 93
-99 <-> 94
-102 <-> 97
-103 <-> 98
-107 <-> 101
-111 <-> 105
-115 <-> 109
-119 <-> 113
-123 <-> 117
-124 <-> 118
-125 <-> 119
-128 <-> 122
-129 <-> 123
-132 <-> 126
-133 <-> 127
-134 <-> 128
-135 <-> 129
-136 <-> 130
-137 <-> 131
-138 <-> 132
-139 <-> 133
-140 <-> 134
-141 <-> 135
-142 <-> 136
-143 <-> 137
-144 <-> 138
-145 <-> 139
+35 <-> 31
+37 <-> 32
+38 <-> 33
+40 <-> 34
+41 <-> 35
+42 <-> 36
+43 <-> 36
+44 <-> 37
+47 <-> 40
+48 <-> 41
+51 <-> 44
+52 <-> 45
+55 <-> 48
+56 <-> 49
+59 <-> 52
+60 <-> 53
+63 <-> 56
+64 <-> 57
+67 <-> 60
+68 <-> 61
+71 <-> 64
+72 <-> 65
+75 <-> 68
+76 <-> 69
+79 <-> 72
+80 <-> 73
+83 <-> 76
+84 <-> 77
+88 <-> 80
+89 <-> 81
+92 <-> 84
+93 <-> 85
+96 <-> 88
+97 <-> 89
+100 <-> 92
+101 <-> 93
+104 <-> 96
+105 <-> 97
+108 <-> 100
+109 <-> 101
+112 <-> 104
+113 <-> 105
+116 <-> 108
+117 <-> 109
+121 <-> 112
+125 <-> 116
+129 <-> 120
+133 <-> 124
+137 <-> 128
+141 <-> 132
+145 <-> 136
+146 <-> 137
+147 <-> 138
+150 <-> 141
+151 <-> 142
+154 <-> 145
+155 <-> 146
+156 <-> 147
+157 <-> 148
+158 <-> 149
+159 <-> 150
+160 <-> 151
+161 <-> 152
+162 <-> 153
+163 <-> 154
+164 <-> 155
+165 <-> 156
+166 <-> 157
+167 <-> 158
 Not mapped:
-32
-36
+46
+50
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 99b4fa1..8167339 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -22,11 +22,25 @@ public class TestPrimitives {
     printDoubleBoxed(1.23);
     printCharBoxed('Z');
 
+    printBoolean(Boolean.valueOf("true"));
+    printByte(Byte.valueOf("123"));
+    printShort(Short.valueOf("257"));
+    printInt(Integer.valueOf("123"));
+    printLong(Long.valueOf("123"));
+    printFloat(Float.valueOf("1.23"));
+    printDouble(Double.valueOf("1.23"));
+    printChar(new Character('Z'));
+
+    printInt(getInteger());
+    printChar(getCharacter());
+
     System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40_000, 'c', 42L);
     System.out.printf("%b, %d, %d, %d", getBoolean(), getByte(), getShort(), getInt());
 
     new TestPrimitives(false, (byte) 123, (short) 257, 40_000, 123L, 3.14f, 1.618, 'A');
     new TestPrimitives('A', 1.618, 3.14f, 123L, 40_000, (short) 257, (byte) 123, false);
+    new TestPrimitives(Boolean.valueOf("false"), Byte.valueOf("123"), Short.valueOf("257"), Integer.valueOf("40000"), Long.valueOf("123"),
+                       Float.valueOf("3.14"), Double.valueOf("1.618"), new Character('A'));
   }
 
   private TestPrimitives(boolean bool, byte b, short s, int i, long l, float f, double d, char c) {
@@ -119,6 +133,14 @@ public class TestPrimitives {
     return 42;
   }
 
+  public Integer getInteger() {
+    return 40_000;
+  }
+
+  public Character getCharacter() {
+    return 'Z';
+  }
+
   public void printNarrowed() {
     printByte((byte)getInt());
     printShort((short)getInt());

From 893450cdb32713511dd32075701fd28500a46266 Mon Sep 17 00:00:00 2001
From: Alexandru-Constantin Bledea <contact@apixandru.com>
Date: Wed, 30 Aug 2017 12:08:26 +0300
Subject: [PATCH 146/252] [Fernflower] autoboxing primitives should not always
 be  ignored

---
 .../decompiler/exps/InvocationExprent.java    |  13 +++++++++++--
 testData/classes/pkg/TestPrimitives.class     | Bin 6439 -> 6576 bytes
 testData/results/TestPrimitives.dec           |  12 ++++++++++++
 testData/src/pkg/TestPrimitives.java          |   5 +++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 4cd7b67..a53576d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -61,6 +61,7 @@ public class InvocationExprent extends Exprent {
   private String name;
   private String classname;
   private boolean isStatic;
+  private boolean canIgnoreBoxing = true;
   private int functype = TYP_GENERAL;
   private Exprent instance;
   private MethodDescriptor descriptor;
@@ -84,7 +85,6 @@ public class InvocationExprent extends Exprent {
     name = cn.elementname;
     classname = cn.classname;
     this.bootstrapArguments = bootstrapArguments;
-
     switch (opcode) {
       case CodeConstants.opc_invokestatic:
         invocationTyp = INVOKE_STATIC;
@@ -155,6 +155,7 @@ public class InvocationExprent extends Exprent {
     name = expr.getName();
     classname = expr.getClassname();
     isStatic = expr.isStatic();
+    canIgnoreBoxing = expr.canIgnoreBoxing;
     functype = expr.getFunctype();
     instance = expr.getInstance();
     if (instance != null) {
@@ -217,8 +218,12 @@ public class InvocationExprent extends Exprent {
 
     tracer.addMapping(bytecode);
 
+    if (instance instanceof InvocationExprent) {
+      ((InvocationExprent) instance).markUsingBoxingResult();
+    }
+
     if (isStatic) {
-      if (isBoxingCall()) {
+      if (isBoxingCall() && canIgnoreBoxing) {
         // process general "boxing" calls, e.g. 'Object[] data = { true }' or 'Byte b = 123'
         // here 'byte' and 'short' values do not need an explicit narrowing type cast
         ExprProcessor.getCastedExprent(lstParameters.get(0), descriptor.params[0], buf, indent, false, false, false, tracer);
@@ -441,6 +446,10 @@ public class InvocationExprent extends Exprent {
     return false;
   }
 
+  public void markUsingBoxingResult() {
+    canIgnoreBoxing = false;
+  }
+
   // TODO: move to CodeConstants ???
   private static String getClassNameForPrimitiveType(int type) {
     switch (type) {
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index fa6cc59684414f119896ce8f8f09b6349647834f..1dad0d2fa50e49c17bf63e6886a417c2e77226d6 100644
GIT binary patch
delta 2730
zcmZ{ld2mxz6vn@sguIu>rL<{Ffr7SxIKxOw3k(>XDY4GL49o~E$gadTwt;j@lY$@y
z)QYHx5CIXYf+#8l!75ZxbaZe*1#!n60XM`A5phA!xe4hj^yQB;=iZm!Ip;3tyPFEP
z4UX<RyK4`CA>tAPUNp1W!e%R*r#jIm{>|snHb+rY?MC*tJBv<k&6sz1l=|1xJk?_0
z89dA04g=${lf700&tVsPyA3>#7uefl2iA==@FHH~;qoP2qI>ZwyRR82!0YV2p<^G1
zdy~yuI^O1p``H}O@eT()$mU%R`W~D2Io=0sKGgA%ftT?yn?nZn;uAKXYWR%9f6nF$
z&haIiuUt5c=+`=qXgGRqtpf}k!#6s<<$rv~=6g0jusN>bN5{y~r(SUuojFo^djFv;
zo;|_lCmlcQ_(jLBI({=S94B@BuH%%BKXjbd@u!9}yoA4aQGW~QwV^<D*c%MCG>XlR
zK0U+!`mi?=uDP;iZlJoN*cS|z`0FBpkiT4@Q-d!Ui4Ao2k2YYA#9Z7cF%R=4Zo&eI
zn-P^*h(!{&;8uy-(5T@biGOic;&v=%?>~t<utXD}fe;dR;x0|tcwm>f8%s6e;6W#e
zd$3FsP9A6y_hPvwbRM`QRv;#$<Qfw9VWog09E$k)TW3iTR}0t+3J3GJixeqXL*v4s
z!+6|Pid3v+FHH(Jn%GO1B12?Skb=B8)J=*k(Vai_kfNu^7D%7vYw+a<ebp8D#g)F0
zuPp2j^^%x|Mk#uU-VzVuA&G~vUK1Bdak0pWRcU$7Tq*j9zOnUMdci8Jmbf2lBp%@O
z>(C_NuAN<xKY_M-TqsZ#2nQPc^&E0Ko2u9`E!RE`6JsuYtUir4S@c6w%VgbW&!zLK
z^wn1u*OdE_OQ$_twMB0TOu$64*R&kyoNW`6V#m8I%brXhB~8L+U<#(v$i_MNZ?Tmr
zWzk7AlLBf4<iUY_x)g)J%yhWOmLwSVX5d<mL*8|mNm1DI;d;fEpbX{2^PC?yfbVY!
zDo_bcc>&CVuDsa@!ca9-sT$^V9b>AYkYWtR<rreB!IP}PgW0H7HFyv}jjF*zS!z`c
z9?D#&YVc4sAytEiDy)Z-GJB}%u&TyGD~V7w0(5~@4c^rLLwO&#E?^ikXiIqyx~Xwy
zGJht;;5`t0>lL}K9XW!?D=f*GilkOakUhQb(j6EvX**@Ip)G$AMHy)kh4-8DQ?H$i
z5(}nDQ}x9}Uu8k_88J;ws^~3g=5>!Ea<m1>XUZgXwjy=6nH)ppSPPQx0FxvKiY#kK
zUQOgU3zF{)lcXVv+|!OMC31oV$#;xN5*$VLNbhUfp~*<26Ky+Rck+DQbiNTql0Yf4
zt{pj@$QhPoSdpY=9gs7L^jVO6L%CX#z7EK8BK;O5-*P5NCp#c3i40hf+$l_ws4DVc
zhIxmAL{?dl+-*#f0(U^x5?N<Ka>p`Bg009!nSE8~$Ga{}WW<7ucfA0KD3jDLm#Ik9
zH}>Xa_c&<|)R#%cqppf8o?zuokOLE>J#}F-wLzlu;_LzwYfrKy*a<c-!8+0w;{3de
zOspfxlFna{cR(8&jpuDNv2A(jNlCDS5_z5OZmr1JcHWAYm}qA*GrdLU)2UNi(Yqa;
zL!p*-h;N9$Br$JRKa)H!r$=E0+;sG9o1C6Z`AD3hn8Qhs`7n&#7(d0a6D1dj+$xH+
z+7zYjaoUJS<AsYNIvjeKVn?$!&||i^d(owwHAjj4+C)~+;l$g$GhOD#NS<xj6g$zq
vfd2Y;T;7TCQbd+^S9U8>cA)fvayHX@(5%XdYrZQP-i0R;n*SsPuwnE6cetO$

delta 2524
zcmZ{l4Nz276vzK}cis1R-1vq?pu!<yMh#lf(bgI;o6#AasesfF(-lZ0G{nVBvPIL(
z%1mE@CG=@oNhDELT9(<T74}{BZC3UjWv2F_opX2HeH4!w&Ytt${hf2(z2}^}rD#)O
zaQCroI{=Ij*#^eqK^70O*vz7H5WV8RX0{%76?ZgjWUb3xe6TBJ@xJk0Y(2tai-B%D
z%36<s3-K6hj~m#ECs=#Zz*E@9+IA<<USi;BJi}&ihk<AD9IHDGJda(hy<otL7g>8r
z$II;a6&A1R*v-CQWAVC<H`skIi#_cAO%`vl=eJqBqvKun{T_?=+4l!5KGd+6-G9X5
zV<SjGKH*58#^5u2uHy?0`%ZlIPy=6LzmBhX!PhLlVR3-Pw;H~4l}tFa%UyhQf7#*Q
zy&iu0J&PZ7{HWt69Y5>%#lUFv>G)O0Z#oX@_+7^#4S(<_92U@fmWdvhS>etJHesQ}
z6<8#3B^FCG<0^?IxLP8J7Kx=;CUFgxYd9it6n{#rz_qOXC9x9MY51Fse<W7ndJV_e
zI4*GmZqx+G5JF-#ZqkH<4X4B!+^h)~8-pa)Vx0_<>XtBZi-0T8*i^&sG%0kn3OK!m
zMQq1NVPHMkg(F9?9V^N2?W~<7MI72$i<crnB$5+veh5mEB3Y#Ht5hk{ghwE`&cD!K
zQ172NyI@?cztLY6sA<fSsK9b5(#2qj4%{JeC+^Zjh7_41%WTu~hn+0NDdJRtxZGL8
zvvaFY{7c-5R*5#Om$;3S*?@MlPxI&%n8rTq&3Ju?vjXL2kv@rj7xk>v{mwKDp_3Y|
ziaQGeWhf_kQBRD_bco4jZrqy8DfCj(LpTgf#l>Vf$lWwvX6}ir3QndcaiDTWK3piE
z13eSWR3e6CX_#TH64TiaX_sIId0}lP{E98bEL0KC&#F-auDw!RirLVVR*N~%l~#w#
zV5l7GRSw<p6D>Iul8+*sg%Oq<e32Y{sKZ>9gAcWsr*iO7l*?5PK8oC+a_~_$^HmN$
z%CHe`itMAT7pQD}^d$kxMu3V{<<OjP`bgdf&I=fY6xveWgEVEQM&hTE58ea86|P8c
zVusn5AT9J5qR+OaXDFIlBTQT4786-wL-IazT<WJVnK3q{Y%9i0>83m#h-N>Iyqss_
zh0ln+P(vy&2NJFE#}hfhhU7D4lDb%t=O$Uni9}AaA-M*aq}EqtM?dm>A}_EZxn`K8
zd7;Q7{m3#R%WX)mF(zraD6%X$$8thbkw|?IJ>R6r`6ki%1{6udNRgZSk(ESFw<Q-S
zk|x&x<V+&{HY8UlXG>#l0J56M8XJ<UoJpFA1CX^u&aol6Q<$Uys>s+>>kicuIoF2d
zZex<B?Eqv0k@Iax?pP*iI4g2{YL4psP}c>BY_cIkT`zb<GD#IbTzR6(cXmeV-%Zaz
z*G^>OQD1~6p5VC}CeH|y&V-guD(7(TgxDn())`@G9EaKbFzZTe!GGf}wXm)TOH=%R
zafe3HoKV~q7B(7}t`BC-<7u8e?(fjrRhG5xNF2Il)Y@}A*0rk#Tzhxuk}#V+rxiq}
z|5}>&>ySjJ6Wzb$i2r-SOs^+%SajC364Pc`AH8Aj#YUA+N_r>VLp#%p^Vn;)n$sJ?
eUO{(Us8eI93h$%Na^QY5Z?HE;V3Ru42mS@RGI}`x

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 043ed9f..8809dcc 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -157,6 +157,10 @@ public class TestPrimitives {
       res = c > 255;// 166
       return res;// 167
    }
+
+   void testAutoBoxingCallRequired(boolean value) {
+      Boolean.valueOf(value).hashCode();// 171
+   }// 172
 }
 
 class 'pkg/TestPrimitives' {
@@ -530,6 +534,12 @@ class 'pkg/TestPrimitives' {
       98      156
       9a      157
    }
+
+   method 'testAutoBoxingCallRequired (Z)V' {
+      1      161
+      4      161
+      8      162
+   }
 }
 
 Lines mapping:
@@ -628,6 +638,8 @@ Lines mapping:
 165 <-> 156
 166 <-> 157
 167 <-> 158
+171 <-> 162
+172 <-> 163
 Not mapped:
 46
 50
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 8167339..55bd806 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -166,4 +166,9 @@ public class TestPrimitives {
     res = (c > 255);
     return res;
   }
+
+  void testAutoBoxingCallRequired(boolean value) {
+    Boolean.valueOf(value).hashCode();
+  }
+
 }

From 7f63baab37acec7e6c9946365943e2a1c70b2dc3 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 27 Sep 2017 16:02:42 +0700
Subject: [PATCH 147/252] Collections.addAll applied; some more warnings fixed

---
 .../modules/decompiler/FinallyProcessor.java  |  3 +-
 .../modules/decompiler/SequenceHelper.java    |  4 +--
 .../decompiler/SimplifyExprentsHelper.java    | 34 +++++--------------
 .../deobfuscator/ExceptionDeobfuscator.java   |  3 +-
 .../decompiler/exps/FunctionExprent.java      |  3 +-
 5 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index 0123691..cbd42a7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -898,8 +898,7 @@ public class FinallyProcessor {
       newblock.setSeq(seq);
       newblock.getInstrOldOffsets().addAll(oldOffsets);
 
-      List<BasicBlock> lstTemp = new ArrayList<>();
-      lstTemp.addAll(sample.getSuccs());
+      List<BasicBlock> lstTemp = new ArrayList<>(sample.getSuccs());
 
       // move successors
       for (BasicBlock suc : lstTemp) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
index 05c7bd5..b96d3a5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
@@ -18,7 +18,6 @@ package org.jetbrains.java.decompiler.modules.decompiler;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -39,8 +38,7 @@ public class SequenceHelper {
 
     if (stat.type == Statement.TYPE_SEQUENCE) {
 
-      List<Statement> lst = new ArrayList<>();
-      lst.addAll(stat.getStats());
+      List<Statement> lst = new ArrayList<>(stat.getStats());
 
       boolean unfolded = false;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index 0be7d59..0e7e139 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -15,30 +15,12 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -49,6 +31,9 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
+import java.util.*;
+import java.util.Map.Entry;
+
 public class SimplifyExprentsHelper {
 
   static final MatchEngine class14Builder = new MatchEngine();
@@ -813,8 +798,7 @@ public class SimplifyExprentsHelper {
                 }
 
                 if (found) {
-                  List<Exprent> data = new ArrayList<>();
-                  data.addAll(stif.getFirst().getExprents());
+                  List<Exprent> data = new ArrayList<>(stif.getFirst().getExprents());
 
                   data.add(new AssignmentExprent(ifvar, new FunctionExprent(FunctionExprent.FUNCTION_IIF,
                                                                             Arrays.asList(
@@ -859,8 +843,7 @@ public class SimplifyExprentsHelper {
                 return false;
               }
 
-              List<Exprent> data = new ArrayList<>();
-              data.addAll(stif.getFirst().getExprents());
+              List<Exprent> data = new ArrayList<>(stif.getFirst().getExprents());
 
               data.add(new ExitExprent(ifex.getExitType(), new FunctionExprent(FunctionExprent.FUNCTION_IIF,
                                                                                Arrays.asList(
@@ -926,9 +909,8 @@ public class SimplifyExprentsHelper {
       FieldExprent fieldexpr = (FieldExprent)class14Builder.getVariableValue("$field$");
 
       assfirst.replaceExprent(assfirst.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null));
-      
-      List<Exprent> data = new ArrayList<>();
-      data.addAll(stat.getFirst().getExprents());
+
+      List<Exprent> data = new ArrayList<>(stat.getFirst().getExprents());
 
       stat.setExprents(data);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index 0826e8b..9e46ce3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -172,9 +172,8 @@ public class ExceptionDeobfuscator {
       BasicBlock emptyblock = new BasicBlock(++graph.last_id);
       graph.getBlocks().addWithKey(emptyblock, emptyblock.id);
 
-      List<BasicBlock> lstTemp = new ArrayList<>();
       // only exception predecessors considered
-      lstTemp.addAll(handler.getPredExceptions());
+      List<BasicBlock> lstTemp = new ArrayList<>(handler.getPredExceptions());
 
       // replace predecessors
       for (BasicBlock pred : lstTemp) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index 0cc0025..02e6371 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -413,8 +413,7 @@ public class FunctionExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<>();
-    lst.addAll(lstOperands);
+    List<Exprent> lst = new ArrayList<>(lstOperands);
     return lst;
   }
 

From d85e0a6561961671e120fded8e2952cf27ff20cf Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 27 Sep 2017 16:22:43 +0200
Subject: [PATCH 148/252] [java-decompiler] migrates to Gradle

Simplifies CI (the outer IDEA project no longer bundles JUnit and AssertJ .jars).
---
 .gitignore   |  2 ++
 build.gradle | 24 +++++++++++++++++++++
 build.xml    | 59 ----------------------------------------------------
 3 files changed, 26 insertions(+), 59 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 build.gradle
 delete mode 100644 build.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a065e50
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.gradle/
+/build/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..e6483db
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'java'
+
+compileJava {
+  sourceCompatibility '1.8'
+  targetCompatibility '1.8'
+}
+
+sourceSets {
+  main.java.srcDirs 'src'
+  test.java.srcDirs 'test'
+}
+
+repositories { jcenter() }
+dependencies {
+  testCompile 'junit:junit:4.+'
+  testCompile 'org.assertj:assertj-core:3.+'
+}
+
+jar {
+  archiveName 'fernflower.jar'
+  manifest {
+    attributes 'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler'
+  }
+}
\ No newline at end of file
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 0b00f6c..0000000
--- a/build.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Fernflower" default="dist" basedir=".">
-
-  <target name="init">
-    <property name="src" value="${basedir}/src"/>
-    <property name="out" value="${basedir}/out/production"/>
-    <property name="dist" value="${basedir}/fernflower.jar"/>
-    <property name="test-src" value="${basedir}/test"/>
-    <property name="test-out" value="${basedir}/out/test"/>
-  </target>
-
-  <!-- external dependencies, adjust to your own -->
-  <path id="junit">
-    <file name="${basedir}/../../../lib/junit-4.12.jar"/>
-    <file name="${basedir}/../../../lib/hamcrest-core-1.3.jar"/>
-    <file name="${basedir}/../../../lib/dev/assertj-core-3.6.1.jar"/>
-  </path>
-
-  <target name="clean" depends="init">
-    <delete includeemptydirs="true" failonerror="false">
-      <fileset dir="${out}"/>
-      <fileset dir="${test-out}"/>
-      <fileset file="${dist}"/>
-    </delete>
-  </target>
-
-  <target name="compile" depends="init,clean">
-    <mkdir dir="${out}"/>
-    <javac srcdir="${src}" destdir="${out}" source="1.8" target="1.8" encoding="UTF-8" debug="true" includeantruntime="false"/>
-  </target>
-
-  <target name="dist" depends="init,compile">
-    <jar jarfile="${dist}" compress="true" basedir="${out}" includes="**/*.class">
-      <manifest>
-        <attribute name="Main-Class" value="org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="test-compile" depends="init,compile">
-    <mkdir dir="${test-out}"/>
-    <javac srcdir="${test-src}" destdir="${test-out}" source="1.8" target="1.8" encoding="UTF-8" debug="true" includeantruntime="false">
-      <classpath path="${out}"/>
-      <classpath refid="junit"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="init,test-compile">
-    <junit printsummary="true" failureproperty="tests.failed" fork="true">
-      <classpath path="${test-out}:${out}"/>
-      <classpath refid="junit"/>
-      <batchtest>
-        <fileset dir="${test-src}" includes="**/*Test.java"/>
-      </batchtest>
-    </junit>
-    <fail if="tests.failed" message="Tests failed."/>
-  </target>
-
-</project>

From d594bab7cdf6eb3606c35fcfb7a878a9efb8b03a Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 27 Sep 2017 17:47:53 +0200
Subject: [PATCH 149/252] [java-decompiler] adds Gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 54706 bytes
 gradle/wrapper/gradle-wrapper.properties |   6 +
 gradlew                                  | 172 +++++++++++++++++++++++
 gradlew.bat                              |  84 +++++++++++
 4 files changed, 262 insertions(+)
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..cd13592d068005179bd9e3c58ef9024b2a14337f
GIT binary patch
literal 54706
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

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..a85339c
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Sep 27 17:39:43 CEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From faaab500e3c3247c5b6f7a01a04014ab5f2dc4d1 Mon Sep 17 00:00:00 2001
From: Maxim Degtyarev <mdegtyarev@gmail.com>
Date: Sun, 15 Oct 2017 08:16:02 +0300
Subject: [PATCH 150/252] RESERVED_WINDOWS_NAMESPACE contains duplicate entries
 of `aux` and doesn't contain `con` which is reserved name too.

---
 .../java/decompiler/modules/renamer/ConverterHelper.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 4625fe7..2a984a7 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -29,7 +29,7 @@ public class ConverterHelper implements IIdentifierRenamer {
     "final", "interface", "short", "true", "char", "finally", "long", "static", "try", "class", "float", "native", "strictfp", "void",
     "const", "for", "new", "super", "volatile", "continue", "goto", "null", "switch", "while", "default", "assert", "enum"));
   private static final Set<String> RESERVED_WINDOWS_NAMESPACE = new HashSet<>(Arrays.asList(
-    "aux", "prn", "aux", "nul",
+    "con", "prn", "aux", "nul",
     "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9",
     "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9"));
 

From e7854376b8a6225403943290d5d57d26bffa119b Mon Sep 17 00:00:00 2001
From: Maxim Degtyarev <mdegtyarev@gmail.com>
Date: Wed, 18 Oct 2017 09:43:38 +0300
Subject: [PATCH 151/252] [PATCH] Fix POP2 opcode handling bug with two
 category 1 values at  the stack top.

---
 .../modules/decompiler/ExprProcessor.java     |  27 ++++++---------
 .../java/decompiler/SingleClassesTest.java    |  20 +++--------
 .../classes/pkg/TestPop2OneDoublePop2.class   | Bin 0 -> 459 bytes
 .../classes/pkg/TestPop2OneLongPop2.class     | Bin 0 -> 455 bytes
 testData/classes/pkg/TestPop2TwoIntPop2.class | Bin 0 -> 459 bytes
 .../classes/pkg/TestPop2TwoIntTwoPop.class    | Bin 0 -> 468 bytes
 testData/results/TestPop2OneDoublePop2.dec    |  27 +++++++++++++++
 testData/results/TestPop2OneLongPop2.dec      |  27 +++++++++++++++
 testData/results/TestPop2TwoIntPop2.dec       |  30 ++++++++++++++++
 testData/results/TestPop2TwoIntTwoPop.dec     |  31 +++++++++++++++++
 testData/src/pkg/TestPop2OneDoublePop2.jasm   |  30 ++++++++++++++++
 testData/src/pkg/TestPop2OneLongPop2.jasm     |  30 ++++++++++++++++
 testData/src/pkg/TestPop2TwoIntPop2.jasm      |  31 +++++++++++++++++
 testData/src/pkg/TestPop2TwoIntTwoPop.jasm    |  32 ++++++++++++++++++
 14 files changed, 254 insertions(+), 31 deletions(-)
 create mode 100644 testData/classes/pkg/TestPop2OneDoublePop2.class
 create mode 100644 testData/classes/pkg/TestPop2OneLongPop2.class
 create mode 100644 testData/classes/pkg/TestPop2TwoIntPop2.class
 create mode 100644 testData/classes/pkg/TestPop2TwoIntTwoPop.class
 create mode 100644 testData/results/TestPop2OneDoublePop2.dec
 create mode 100644 testData/results/TestPop2OneLongPop2.dec
 create mode 100644 testData/results/TestPop2TwoIntPop2.dec
 create mode 100644 testData/results/TestPop2TwoIntTwoPop.dec
 create mode 100644 testData/src/pkg/TestPop2OneDoublePop2.jasm
 create mode 100644 testData/src/pkg/TestPop2OneLongPop2.jasm
 create mode 100644 testData/src/pkg/TestPop2TwoIntPop2.jasm
 create mode 100644 testData/src/pkg/TestPop2TwoIntTwoPop.jasm

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index c21f11d..48e7d3f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -618,8 +604,17 @@ public class ExprProcessor implements CodeConstants {
           stack.pop();
           break;
         case opc_pop:
-        case opc_pop2:
           stack.pop();
+          break;
+        case opc_pop2:
+          if (stack.getByOffset(-1).getExprType().stackSize == 1) {
+            // Since value at the top of the stack is a value of category 1 (JVMS9 2.11.1)
+            // we should remove one more item from the stack.
+            // See JVMS9 pop2 chapter.
+            stack.pop();
+          }
+          stack.pop();
+          break;
       }
     }
   }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index fd48f0d..2e6c819 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -111,6 +97,10 @@ public class SingleClassesTest {
   @Test public void testLambdaParams() { doTest("pkg/TestLambdaParams"); }
   @Test public void testInterfaceMethods() { doTest("pkg/TestInterfaceMethods"); }
   @Test public void testConstType() { doTest("pkg/TestConstType"); }
+  @Test public void testPop2OneDoublePop2() { doTest("pkg/TestPop2OneDoublePop2"); }
+  @Test public void testPop2OneLongPop2() { doTest("pkg/TestPop2OneLongPop2"); }
+  @Test public void testPop2TwoIntPop2() { doTest("pkg/TestPop2TwoIntPop2"); }
+  @Test public void testPop2TwoIntTwoPop() { doTest("pkg/TestPop2TwoIntTwoPop"); }
 
   // TODO: fix all below
   //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
diff --git a/testData/classes/pkg/TestPop2OneDoublePop2.class b/testData/classes/pkg/TestPop2OneDoublePop2.class
new file mode 100644
index 0000000000000000000000000000000000000000..1c41f76d4015c89f2a7ae036961398cd0a22e871
GIT binary patch
literal 459
zcmZuu%SyvQ6g`uqjfrWkeYZZK3!%C&Aa0~0LPaPPTWAr%)wB*FHILFJf}h|I_#e7Z
zaN!5Ibm5n{6U001q7<CPeayY*oI7_ue&5~!9AaB-Ju06DHei`pLC!=PM)K6C{q&n(
z-wbLPM><Rk1(X;vBYwwij|Yz38H~g*VyO1TH0p-qgH9mM!g$~bne31F)VH9ctRtgi
zouOF2ZZFWiXyOJ=WA~DwGQM@}e@Pf}GlU!3U22aAB)HF@`P>aGY@x_t_QH5F6z8rd
z81%7h^8y;XE~&M8OS-~bc$ua_<z{$8sI|5mh>O@Ch)JK*{5m$5UfR2#MuKFM$8O+8
zC#WGso03NXlT(nbP_{#!kx%TsLVcoumP0lTb!JHj8Zvl5mZCZ2h;Ae#^$aD;@<?30
eKwChoNK&y#1SKR;Ce;cIBDLtd81ht8u=)o*MqSnb

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestPop2OneLongPop2.class b/testData/classes/pkg/TestPop2OneLongPop2.class
new file mode 100644
index 0000000000000000000000000000000000000000..d19cfdea2a46b3b7e417add8e0508dc082b58568
GIT binary patch
literal 455
zcmZuuOG*Pl5Pdx}$(V8SG5^F5xDcWX2gHp;+z3J-m_ULEt|qY=I?nWjq$79)FW^0N
zq2R&;Wa)v_>SPfD*5Xxly?Rwe_5A1a3&1J%%+`zXox(OU4mMFp{F2Ryb&!S2Q0?=n
z>c-=fj^yoF20A<*`O}EOjAzP*!%!JN1l~V&HqtIis4(P4{-f`Oz6`w1V8n;Y#RjT2
zwiwEdyY`Chsfmz5^YDhDu*izo>rzS)!F?KPMZS<Oc2Q<<dhu*B<X0l(4E9);g_8Da
zXt~vBX;)e{UvJYS`ZB&JRkkf8zn(<{KI!{|klWZ<+qU;KRh-5q&xI7~0{ckOm9!aP
zdJDoDy$;AT@`<Aln6DHt)Cn^%7f6F(A%|z=373*H%4kXY4Mv_7VcotXxsukAB(h8m
VDoCJ8_o~tCI$ZiHh9YqW>_1`cU$p=L

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestPop2TwoIntPop2.class b/testData/classes/pkg/TestPop2TwoIntPop2.class
new file mode 100644
index 0000000000000000000000000000000000000000..f227a65ae207f9e2744053b06eeed016dd8f4270
GIT binary patch
literal 459
zcmZWm-AV#M6#iyc-P~5QHUG+lE&}bMh3L-kCI|#6L6M-V(FPgYofRF69-$ZLJ?f&s
z3m?GC9!NTC7b4BYcmC#l-<dPZ)qDZq5*4%gZv2?Qd_k~WC2@pZ8#~C@aFAp$!<n{V
zJ8)58$c*?i_k6B~-d%qr2HJszqJ=a=zWUJGR6BYi)v#XcF=W?S8G3C>X(|XFFvJ2b
zm4jns8SG9tn+(K_^aX=8j;{HNq^q@_g&a|jpN3vnOm#aPUvyu>rdoRph5yO(5uZl%
z)n=rf`x|LnyiVoo@R79kT2hJIS<n}gF7NxoLV4?ro!6-r#Fn^{O6mqqa6qexjsX_U
zPFSMolq@3~Kl?`fgB*rK!Zc{7gd~I*GI%4Kq9|%<P$p_ge<J2G*L02hFC;d-6<REi
ZCx!yzC{k2Hl2~o}pcKl~yH9lk`Cq)vTV4PF

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestPop2TwoIntTwoPop.class b/testData/classes/pkg/TestPop2TwoIntTwoPop.class
new file mode 100644
index 0000000000000000000000000000000000000000..419a512c6b8725267050c3ad8e7546307c79ee05
GIT binary patch
literal 468
zcmZuu-AV#M6#iyc-P|^{HUCP3g21|HA-XfV5duL<Q1YUy)dm^cofRF69-$ZLJ?f&s
z3m?GC9!NT47a}wl-<k9GeP_-rma{p4OB|YwcjLzdW^;nYGKm9h+t@<JhJz%78BLW1
z+kuM$LuTkd`(EJ7fp^y%^1gClp=cq+kgq;8*V(oj3puEr-ZNxZQ4x793Moo(KV*o7
zzK{+o$T8UMXgcom8xe2@YoyBpX<?6{IC>g*9X?U5Xmrtei5gN7l0$=4HF@d3<oVE_
zXo+e=m*oD&+8m%p>3Z}?dg-Q+{B|1l__*Wu0&bza@y_<^L~&wETnQ=EHI9&__2^@O
z>G=su<eiXZWaDSwh=0(9VV^Js+AARmA%+az$nKD*Tj~_iE$L6hT;`gt(d~XAv2H$I
dDdmZxfH;b@>k^VgYwKS^nP@9SuuBvM^1rgOUH$+7

literal 0
HcmV?d00001

diff --git a/testData/results/TestPop2OneDoublePop2.dec b/testData/results/TestPop2OneDoublePop2.dec
new file mode 100644
index 0000000..95ceaee
--- /dev/null
+++ b/testData/results/TestPop2OneDoublePop2.dec
@@ -0,0 +1,27 @@
+package pkg;
+
+public class TestPop2OneDoublePop2 {
+   public static void main(String... var0) {
+      double var10002 = 3.14159265358D;// 24
+      System.out.println(1234567890);// 22 23 26
+   }// 27
+}
+
+class 'pkg/TestPop2OneDoublePop2' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      5
+      3      5
+      5      4
+      9      5
+      c      6
+   }
+}
+
+Lines mapping:
+22 <-> 6
+23 <-> 6
+24 <-> 5
+26 <-> 6
+27 <-> 7
+Not mapped:
+25
diff --git a/testData/results/TestPop2OneLongPop2.dec b/testData/results/TestPop2OneLongPop2.dec
new file mode 100644
index 0000000..2d78133
--- /dev/null
+++ b/testData/results/TestPop2OneLongPop2.dec
@@ -0,0 +1,27 @@
+package pkg;
+
+public class TestPop2OneLongPop2 {
+   public static void main(String... var0) {
+      long var10002 = -889275714L;// 24
+      System.out.println(1234567890);// 22 23 26
+   }// 27
+}
+
+class 'pkg/TestPop2OneLongPop2' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      5
+      3      5
+      5      4
+      9      5
+      c      6
+   }
+}
+
+Lines mapping:
+22 <-> 6
+23 <-> 6
+24 <-> 5
+26 <-> 6
+27 <-> 7
+Not mapped:
+25
diff --git a/testData/results/TestPop2TwoIntPop2.dec b/testData/results/TestPop2TwoIntPop2.dec
new file mode 100644
index 0000000..9d1583c
--- /dev/null
+++ b/testData/results/TestPop2TwoIntPop2.dec
@@ -0,0 +1,30 @@
+package pkg;
+
+public class TestPop2TwoIntPop2 {
+   public static void main(String... var0) {
+      char var10002 = '쫾';// 24
+      char var10003 = '몾';// 25
+      System.out.println(1234567890);// 22 23 27
+   }// 28
+}
+
+class 'pkg/TestPop2TwoIntPop2' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      6
+      3      6
+      5      4
+      7      5
+      a      6
+      d      7
+   }
+}
+
+Lines mapping:
+22 <-> 7
+23 <-> 7
+24 <-> 5
+25 <-> 6
+27 <-> 7
+28 <-> 8
+Not mapped:
+26
diff --git a/testData/results/TestPop2TwoIntTwoPop.dec b/testData/results/TestPop2TwoIntTwoPop.dec
new file mode 100644
index 0000000..aaa360b
--- /dev/null
+++ b/testData/results/TestPop2TwoIntTwoPop.dec
@@ -0,0 +1,31 @@
+package pkg;
+
+public class TestPop2TwoIntTwoPop {
+   public static void main(String... var0) {
+      char var10002 = '쫾';// 24
+      char var10003 = '몾';// 25
+      System.out.println(1234567890);// 22 23 28
+   }// 29
+}
+
+class 'pkg/TestPop2TwoIntTwoPop' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      6
+      3      6
+      5      4
+      7      5
+      b      6
+      e      7
+   }
+}
+
+Lines mapping:
+22 <-> 7
+23 <-> 7
+24 <-> 5
+25 <-> 6
+28 <-> 7
+29 <-> 8
+Not mapped:
+26
+27
diff --git a/testData/src/pkg/TestPop2OneDoublePop2.jasm b/testData/src/pkg/TestPop2OneDoublePop2.jasm
new file mode 100644
index 0000000..6f7d5f6
--- /dev/null
+++ b/testData/src/pkg/TestPop2OneDoublePop2.jasm
@@ -0,0 +1,30 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2OneDoublePop2
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc2_w double 3.14159265358D;
+		pop2;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2OneDoublePop2
diff --git a/testData/src/pkg/TestPop2OneLongPop2.jasm b/testData/src/pkg/TestPop2OneLongPop2.jasm
new file mode 100644
index 0000000..62d3179
--- /dev/null
+++ b/testData/src/pkg/TestPop2OneLongPop2.jasm
@@ -0,0 +1,30 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2OneLongPop2
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc2_w long 0xCAFEBABE;
+		pop2;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2OneLongPop2
diff --git a/testData/src/pkg/TestPop2TwoIntPop2.jasm b/testData/src/pkg/TestPop2TwoIntPop2.jasm
new file mode 100644
index 0000000..4f2ce8e
--- /dev/null
+++ b/testData/src/pkg/TestPop2TwoIntPop2.jasm
@@ -0,0 +1,31 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2TwoIntPop2
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc int 0xCAFE;
+		ldc int 0xBABE;
+		pop2;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2TwoIntPop2
diff --git a/testData/src/pkg/TestPop2TwoIntTwoPop.jasm b/testData/src/pkg/TestPop2TwoIntTwoPop.jasm
new file mode 100644
index 0000000..c9292da
--- /dev/null
+++ b/testData/src/pkg/TestPop2TwoIntTwoPop.jasm
@@ -0,0 +1,32 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2TwoIntTwoPop
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc int 0xCAFE;
+		ldc int 0xBABE;
+		pop;
+		pop;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2TwoIntTwoPop

From c241278aee53b3db7eaecb87b1e0012b88b88f09 Mon Sep 17 00:00:00 2001
From: Alexandru-Constantin Bledea <contact@apixandru.com>
Date: Wed, 25 Oct 2017 19:42:06 +0300
Subject: [PATCH 152/252] [PATCH] [Fernflower] prevent null to be cast as
 short/byte

---
 .../modules/decompiler/ExprProcessor.java     |   2 +-
 .../modules/decompiler/exps/ConstExprent.java |   4 ++
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestPrimitiveNarrowing.class  | Bin 0 -> 805 bytes
 testData/results/TestPrimitiveNarrowing.dec   |  64 ++++++++++++++++++
 testData/src/pkg/TestPrimitiveNarrowing.java  |  24 +++++++
 6 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 testData/classes/pkg/TestPrimitiveNarrowing.class
 create mode 100644 testData/results/TestPrimitiveNarrowing.dec
 create mode 100644 testData/src/pkg/TestPrimitiveNarrowing.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 48e7d3f..6a03bf4 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -877,7 +877,7 @@ public class ExprProcessor implements CodeConstants {
     boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
 
     // cast instead to 'byte' / 'short' when int constant is used as a value for 'Byte' / 'Short'
-    if (castNarrowing && exprent.type == Exprent.EXPRENT_CONST) {
+    if (castNarrowing && exprent.type == Exprent.EXPRENT_CONST && !((ConstExprent) exprent).isNull()) {
       if (leftType.equals(VarType.VARTYPE_BYTE_OBJ)) {
         leftType = VarType.VARTYPE_BYTE;
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index e77b680..cfd300d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -247,6 +247,10 @@ public class ConstExprent extends Exprent {
     throw new RuntimeException("invalid constant type: " + constType);
   }
 
+  public boolean isNull() {
+    return CodeConstants.TYPE_NULL == constType.type;
+  }
+
   private static String convertStringToJava(String value, boolean ascii) {
     char[] arr = value.toCharArray();
     StringBuilder buffer = new StringBuilder(arr.length);
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 2e6c819..11d393e 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -32,6 +32,7 @@ public class SingleClassesTest {
     fixture = null;
   }
 
+  @Test public void testPrimitiveNarrowing() { doTest("pkg/TestPrimitiveNarrowing"); }
   @Test public void testClassFields() { doTest("pkg/TestClassFields"); }
   @Test public void testInterfaceFields() { doTest("pkg/TestInterfaceFields"); }
   @Test public void testClassLambda() { doTest("pkg/TestClassLambda"); }
diff --git a/testData/classes/pkg/TestPrimitiveNarrowing.class b/testData/classes/pkg/TestPrimitiveNarrowing.class
new file mode 100644
index 0000000000000000000000000000000000000000..dc7c0c533580ea09f0e605b8ade813c72a9fb526
GIT binary patch
literal 805
zcmaixT~AX%5Qg9FcTW#eT0APE^5F$wLc=x4g(fB@4Vpk|yxf+xT{xU$4%-rc7FQ5R
z`~m(b!#m3{G^pWXXJ=;jeRg){*YB&J0JiWtKou_nl<`u`D=|w|EX%%9#i~MO$0pY8
zD$K8SkMu-$Vx0^-`=c~-+v`1r();w#D9m<kV)n)-eUlyNe#}g(n+|l`)0vexPnO)s
zo+>PMzaI}f2j<j$&g_YGc4GE)mZfJl8Ez|-CpsPzG56Pt3Jse~2zEA22r8~g4Yf1t
zM(=(&O4`#^O3D`*9-41@9J}5vw>ic2cZe0l$HbYT$rPe#N}lzg_LTBZUZE~x-x7sj
zKOJWS^TA3Fp8xxco6^V-HMBxJ!P5{6sE24{USZ+?jS)dzp?NojPyHh^a9HB7svIY{
zLoR`3(0j|hAlZ!zsB=06G-!j{Buc0tWE|!33?4BO$Sj(a)-Z=wj@m`hpGE2t1+F4j
z=^Ev)>H?K7!e$F;BVR(D?11_P`5_)-hCY9nv)=gIRNR$R;Su<#loNViQ5G?(NrN5|
Yw(kj_c_EwnkTAL@Y*NUn(H5|H1BW4z1ONa4

literal 0
HcmV?d00001

diff --git a/testData/results/TestPrimitiveNarrowing.dec b/testData/results/TestPrimitiveNarrowing.dec
new file mode 100644
index 0000000..1e5d30c
--- /dev/null
+++ b/testData/results/TestPrimitiveNarrowing.dec
@@ -0,0 +1,64 @@
+package pkg;
+
+class TestPrimitiveNarrowing {
+   TestPrimitiveNarrowing(Short value) {
+   }// 6
+
+   static void invocations() {
+      withInteger((Integer)null);// 9
+      withShort((Short)null);// 10
+      withByte((Byte)null);// 11
+      new TestPrimitiveNarrowing((Short)null);// 12
+   }// 13
+
+   static void withByte(Byte defaultValue) {
+   }// 16
+
+   static void withInteger(Integer defaultValue) {
+   }// 19
+
+   static void withShort(Short defaultValue) {
+   }// 22
+}
+
+class 'pkg/TestPrimitiveNarrowing' {
+   method '<init> (Ljava/lang/Short;)V' {
+      4      4
+   }
+
+   method 'invocations ()V' {
+      0      7
+      1      7
+      4      8
+      5      8
+      8      9
+      9      9
+      10      10
+      15      11
+   }
+
+   method 'withByte (Ljava/lang/Byte;)V' {
+      0      14
+   }
+
+   method 'withInteger (Ljava/lang/Integer;)V' {
+      0      17
+   }
+
+   method 'withShort (Ljava/lang/Short;)V' {
+      0      20
+   }
+}
+
+Lines mapping:
+6 <-> 5
+9 <-> 8
+10 <-> 9
+11 <-> 10
+12 <-> 11
+13 <-> 12
+16 <-> 15
+19 <-> 18
+22 <-> 21
+Not mapped:
+5
diff --git a/testData/src/pkg/TestPrimitiveNarrowing.java b/testData/src/pkg/TestPrimitiveNarrowing.java
new file mode 100644
index 0000000..672ceb8
--- /dev/null
+++ b/testData/src/pkg/TestPrimitiveNarrowing.java
@@ -0,0 +1,24 @@
+package pkg;
+
+class TestPrimitiveNarrowing {
+
+  TestPrimitiveNarrowing(Short value) {
+  }
+
+  static void invocations() {
+    withInteger(null);
+    withShort(null);
+    withByte(null);
+    new TestPrimitiveNarrowing(null);
+  }
+
+  static void withByte(Byte defaultValue) {
+  }
+
+  static void withInteger(Integer defaultValue) {
+  }
+
+  static void withShort(Short defaultValue) {
+  }
+
+}

From 97ff04b51c42fd3a10c8f68f720f4e088991502a Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Wed, 25 Oct 2017 21:11:40 +0300
Subject: [PATCH 153/252] fixed line numbers in case of decompile error

---
 .../jetbrains/java/decompiler/main/ClassWriter.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 764b4d4..4a4f67d 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -827,11 +827,16 @@ public class ClassWriter {
 
         if (root != null && !methodWrapper.decompiledWithErrors) { // check for existence
           try {
-            TextBuffer code = root.toJava(indent + 1, tracer);
+            // to restore in case of an exception
+            BytecodeMappingTracer codeTracer = new BytecodeMappingTracer(tracer.getCurrentSourceLine());
+            TextBuffer code = root.toJava(indent + 1, codeTracer);
 
             hideMethod = (clinit || dinit || hideConstructor(wrapper, init, throwsExceptions, paramCount)) && code.length() == 0;
 
             buffer.append(code);
+
+            tracer.setCurrentSourceLine(codeTracer.getCurrentSourceLine());
+            tracer.addTracer(codeTracer);
           }
           catch (Throwable ex) {
             DecompilerContext.getLogger()
@@ -848,8 +853,7 @@ public class ClassWriter {
           buffer.appendLineSeparator();
           tracer.incrementCurrentSourceLine();
         }
-
-        if (root != null) {
+        else if (root != null) {
           tracer.addMapping(root.getDummyExit().bytecode);
         }
         buffer.appendIndent(indent).append('}').appendLineSeparator();

From fda661d76d77942d46441d83f3e5351c58f30b39 Mon Sep 17 00:00:00 2001
From: Nicholas Sherlock <n.sherlock@gmail.com>
Date: Fri, 24 Nov 2017 22:29:47 +1300
Subject: [PATCH 154/252] FernFlower: Rename classes whose filenames will
 exceed 255 characters

---
 .../java/decompiler/modules/renamer/ConverterHelper.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 2a984a7..27998cb 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -42,7 +42,7 @@ public class ConverterHelper implements IIdentifierRenamer {
   public boolean toBeRenamed(Type elementType, String className, String element, String descriptor) {
     String value = elementType == Type.ELEMENT_CLASS ? className : element;
     return value == null || value.length() == 0 || value.length() <= 2 || KEYWORDS.contains(value) || Character.isDigit(value.charAt(0))
-      || elementType == Type.ELEMENT_CLASS && RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase());
+      || elementType == Type.ELEMENT_CLASS && (RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase()) || value.length() > 255 - ".class".length());
   }
 
   // TODO: consider possible conflicts with not renamed classes, fields and methods!

From 6bcc6a511f6dd658cae80d70380e02cd8a6809b9 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 28 Nov 2017 12:30:01 +0100
Subject: [PATCH 155/252] Cleanup (warning; formatting)

---
 .../modules/renamer/ConverterHelper.java      | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 27998cb..606da45 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -1,28 +1,14 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
 import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 
 public class ConverterHelper implements IIdentifierRenamer {
-
   private static final Set<String> KEYWORDS = new HashSet<>(Arrays.asList(
     "abstract", "do", "if", "package", "synchronized", "boolean", "double", "implements", "private", "this", "break", "else", "import",
     "protected", "throw", "byte", "extends", "instanceof", "public", "throws", "case", "false", "int", "return", "transient", "catch",
@@ -41,15 +27,19 @@ public class ConverterHelper implements IIdentifierRenamer {
   @Override
   public boolean toBeRenamed(Type elementType, String className, String element, String descriptor) {
     String value = elementType == Type.ELEMENT_CLASS ? className : element;
-    return value == null || value.length() == 0 || value.length() <= 2 || KEYWORDS.contains(value) || Character.isDigit(value.charAt(0))
-      || elementType == Type.ELEMENT_CLASS && (RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase()) || value.length() > 255 - ".class".length());
+    return value == null ||
+           value.length() <= 2 ||
+           Character.isDigit(value.charAt(0)) ||
+           KEYWORDS.contains(value) ||
+           elementType == Type.ELEMENT_CLASS && (
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
+             value.length() > 255 - ".class".length());
   }
 
   // TODO: consider possible conflicts with not renamed classes, fields and methods!
   // We should get all relevant information here.
   @Override
   public String getNextClassName(String fullName, String shortName) {
-
     if (shortName == null) {
       return "class_" + (classCounter++);
     }
@@ -64,7 +54,6 @@ public class ConverterHelper implements IIdentifierRenamer {
     }
     else {
       String name = shortName.substring(index);
-
       if (setNonStandardClassNames.contains(name)) {
         return "Inner" + name + "_" + (classCounter++);
       }
@@ -96,4 +85,4 @@ public class ConverterHelper implements IIdentifierRenamer {
   public static String replaceSimpleClassName(String fullName, String newName) {
     return fullName.substring(0, fullName.lastIndexOf('/') + 1) + newName;
   }
-}
+}
\ No newline at end of file

From 7521c17abacd4640658049449b3e9bb392066875 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 28 Nov 2017 12:32:07 +0100
Subject: [PATCH 156/252] [java decompiler] updates copyright comment

---
 .../java/decompiler/code/CodeConstants.java   | 16 +---
 .../java/decompiler/code/ConstantsUtil.java   | 16 +---
 .../decompiler/code/ExceptionHandler.java     | 16 +---
 .../java/decompiler/code/ExceptionTable.java  | 16 +---
 .../code/FullInstructionSequence.java         | 16 +---
 .../java/decompiler/code/IfInstruction.java   | 16 +---
 .../java/decompiler/code/Instruction.java     | 16 +---
 .../decompiler/code/InstructionSequence.java  | 16 +---
 .../java/decompiler/code/JumpInstruction.java | 16 +---
 .../code/SimpleInstructionSequence.java       | 16 +---
 .../decompiler/code/SwitchInstruction.java    | 16 +---
 .../java/decompiler/code/cfg/BasicBlock.java  | 16 +---
 .../decompiler/code/cfg/ControlFlowGraph.java | 16 +---
 .../code/cfg/ExceptionRangeCFG.java           | 16 +---
 .../code/interpreter/InstructionImpact.java   | 16 +---
 .../decompiler/code/interpreter/Util.java     | 16 +---
 .../code/optinstructions/ALOAD.java           | 16 +---
 .../code/optinstructions/ANEWARRAY.java       | 16 +---
 .../code/optinstructions/ASTORE.java          | 16 +---
 .../code/optinstructions/BIPUSH.java          | 16 +---
 .../code/optinstructions/CHECKCAST.java       | 16 +---
 .../code/optinstructions/DLOAD.java           | 16 +---
 .../code/optinstructions/DSTORE.java          | 16 +---
 .../code/optinstructions/FLOAD.java           | 16 +---
 .../code/optinstructions/FSTORE.java          | 16 +---
 .../code/optinstructions/GETFIELD.java        | 16 +---
 .../code/optinstructions/GETSTATIC.java       | 16 +---
 .../decompiler/code/optinstructions/GOTO.java | 16 +---
 .../code/optinstructions/GOTO_W.java          | 16 +---
 .../decompiler/code/optinstructions/IINC.java | 16 +---
 .../code/optinstructions/ILOAD.java           | 16 +---
 .../code/optinstructions/INSTANCEOF.java      | 16 +---
 .../code/optinstructions/INVOKEDYNAMIC.java   | 16 +---
 .../code/optinstructions/INVOKEINTERFACE.java | 16 +---
 .../code/optinstructions/INVOKESPECIAL.java   | 16 +---
 .../code/optinstructions/INVOKESTATIC.java    | 16 +---
 .../code/optinstructions/INVOKEVIRTUAL.java   | 16 +---
 .../code/optinstructions/ISTORE.java          | 16 +---
 .../decompiler/code/optinstructions/JSR.java  | 16 +---
 .../code/optinstructions/JSR_W.java           | 16 +---
 .../decompiler/code/optinstructions/LDC.java  | 16 +---
 .../code/optinstructions/LDC2_W.java          | 16 +---
 .../code/optinstructions/LDC_W.java           | 16 +---
 .../code/optinstructions/LLOAD.java           | 16 +---
 .../code/optinstructions/LOOKUPSWITCH.java    | 16 +---
 .../code/optinstructions/LSTORE.java          | 16 +---
 .../code/optinstructions/MULTIANEWARRAY.java  | 16 +---
 .../decompiler/code/optinstructions/NEW.java  | 16 +---
 .../code/optinstructions/NEWARRAY.java        | 16 +---
 .../code/optinstructions/PUTFIELD.java        | 16 +---
 .../code/optinstructions/PUTSTATIC.java       | 16 +---
 .../decompiler/code/optinstructions/RET.java  | 16 +---
 .../code/optinstructions/SIPUSH.java          | 16 +---
 .../code/optinstructions/TABLESWITCH.java     | 16 +---
 .../java/decompiler/main/AssertProcessor.java | 16 +---
 .../main/ClassReference14Processor.java       | 16 +---
 .../java/decompiler/main/ClassWriter.java     | 16 +---
 .../decompiler/main/ClassesProcessor.java     | 16 +---
 .../decompiler/main/DecompilerContext.java    | 16 +---
 .../java/decompiler/main/EnumProcessor.java   | 16 +---
 .../java/decompiler/main/Fernflower.java      | 16 +---
 .../decompiler/main/InitializerProcessor.java | 16 +---
 .../java/decompiler/main/TextBuffer.java      | 16 +---
 .../collectors/BytecodeMappingTracer.java     | 16 +---
 .../main/collectors/BytecodeSourceMapper.java | 16 +---
 .../main/collectors/CounterContainer.java     | 16 +---
 .../main/collectors/ImportCollector.java      | 16 +---
 .../main/collectors/VarNamesCollector.java    | 16 +---
 .../main/decompiler/BaseDecompiler.java       | 16 +---
 .../main/decompiler/ConsoleDecompiler.java    | 16 +---
 .../main/decompiler/PrintStreamLogger.java    | 16 +---
 .../main/extern/IBytecodeProvider.java        | 16 +---
 .../main/extern/IFernflowerLogger.java        | 16 +---
 .../main/extern/IFernflowerPreferences.java   | 16 +---
 .../main/extern/IIdentifierRenamer.java       | 16 +---
 .../decompiler/main/extern/IResultSaver.java  | 16 +---
 .../decompiler/main/rels/ClassWrapper.java    | 16 +---
 .../decompiler/main/rels/LambdaProcessor.java | 16 +---
 .../main/rels/MethodProcessorRunnable.java    | 18 +---
 .../decompiler/main/rels/MethodWrapper.java   | 16 +---
 .../main/rels/NestedClassProcessor.java       | 16 +---
 .../main/rels/NestedMemberAccess.java         | 16 +---
 .../modules/code/DeadCodeHelper.java          | 16 +---
 .../modules/decompiler/ClasspathHelper.java   | 16 +---
 .../modules/decompiler/ClearStructHelper.java | 16 +---
 .../decompiler/ConcatenationHelper.java       | 16 +---
 .../modules/decompiler/DecHelper.java         | 16 +---
 .../modules/decompiler/DomHelper.java         | 16 +---
 .../decompiler/EliminateLoopsHelper.java      | 16 +---
 .../modules/decompiler/ExitHelper.java        | 16 +---
 .../modules/decompiler/ExprentStack.java      | 16 +---
 .../modules/decompiler/FinallyProcessor.java  | 16 +---
 .../modules/decompiler/IdeaNotNullHelper.java | 16 +---
 .../modules/decompiler/IfHelper.java          | 16 +---
 .../decompiler/InlineSingleBlockHelper.java   | 16 +---
 .../modules/decompiler/LabelHelper.java       | 16 +---
 .../modules/decompiler/LoopExtractHelper.java | 16 +---
 .../modules/decompiler/LowBreakHelper.java    | 16 +---
 .../modules/decompiler/MergeHelper.java       | 16 +---
 .../modules/decompiler/PPandMMHelper.java     | 16 +---
 .../decompiler/PrimitiveExprsList.java        | 16 +---
 .../decompiler/SecondaryFunctionsHelper.java  | 16 +---
 .../modules/decompiler/SequenceHelper.java    | 16 +---
 .../decompiler/SimplifyExprentsHelper.java    | 38 +++-----
 .../decompiler/StackVarsProcessor.java        | 16 +---
 .../modules/decompiler/StatEdge.java          | 16 +---
 .../decompiler/StrongConnectivityHelper.java  | 22 +----
 .../modules/decompiler/SwitchHelper.java      | 16 +---
 .../decompiler/decompose/DominatorEngine.java | 16 +---
 .../DominatorTreeExceptionFilter.java         | 16 +---
 .../FastExtendedPostdominanceHelper.java      | 30 ++----
 .../decompose/GenericDominatorEngine.java     | 16 +---
 .../modules/decompiler/decompose/IGraph.java  | 16 +---
 .../decompiler/decompose/IGraphNode.java      | 16 +---
 .../deobfuscator/ExceptionDeobfuscator.java   | 16 +---
 .../IrreducibleCFGDeobfuscator.java           | 16 +---
 .../decompiler/exps/AnnotationExprent.java    | 16 +---
 .../modules/decompiler/exps/ArrayExprent.java | 16 +---
 .../decompiler/exps/AssertExprent.java        | 16 +---
 .../decompiler/exps/AssignmentExprent.java    | 16 +---
 .../modules/decompiler/exps/ConstExprent.java | 18 +---
 .../modules/decompiler/exps/ExitExprent.java  | 26 ++---
 .../modules/decompiler/exps/Exprent.java      | 18 +---
 .../modules/decompiler/exps/FieldExprent.java | 26 ++---
 .../decompiler/exps/FunctionExprent.java      | 26 ++---
 .../modules/decompiler/exps/IfExprent.java    | 16 +---
 .../decompiler/exps/InvocationExprent.java    | 16 +---
 .../decompiler/exps/MonitorExprent.java       | 16 +---
 .../modules/decompiler/exps/NewExprent.java   | 16 +---
 .../decompiler/exps/SwitchExprent.java        | 16 +---
 .../decompiler/exps/TypeAnnotation.java       | 16 +---
 .../modules/decompiler/exps/VarExprent.java   | 28 ++----
 .../decompiler/sforms/DirectGraph.java        | 16 +---
 .../modules/decompiler/sforms/DirectNode.java | 16 +---
 .../sforms/FlattenStatementsHelper.java       | 16 +---
 .../sforms/SSAConstructorSparseEx.java        | 16 +---
 .../sforms/SSAUConstructorSparseEx.java       | 16 +---
 .../decompiler/stats/BasicBlockStatement.java | 16 +---
 .../decompiler/stats/CatchAllStatement.java   | 16 +---
 .../decompiler/stats/CatchStatement.java      | 16 +---
 .../modules/decompiler/stats/DoStatement.java | 16 +---
 .../decompiler/stats/DummyExitStatement.java  | 16 +---
 .../decompiler/stats/GeneralStatement.java    | 16 +---
 .../modules/decompiler/stats/IfStatement.java | 26 ++---
 .../decompiler/stats/RootStatement.java       | 16 +---
 .../decompiler/stats/SequenceStatement.java   | 16 +---
 .../modules/decompiler/stats/Statement.java   | 34 ++-----
 .../modules/decompiler/stats/Statements.java  | 16 +---
 .../decompiler/stats/SwitchStatement.java     | 16 +---
 .../stats/SynchronizedStatement.java          | 16 +---
 .../decompiler/vars/CheckTypesResult.java     | 16 +---
 .../decompiler/vars/VarDefinitionHelper.java  | 16 +---
 .../modules/decompiler/vars/VarProcessor.java | 16 +---
 .../decompiler/vars/VarTypeProcessor.java     | 16 +---
 .../decompiler/vars/VarVersionEdge.java       | 18 +---
 .../decompiler/vars/VarVersionNode.java       | 16 +---
 .../decompiler/vars/VarVersionPair.java       | 16 +---
 .../decompiler/vars/VarVersionsGraph.java     | 16 +---
 .../decompiler/vars/VarVersionsProcessor.java | 16 +---
 .../modules/renamer/ClassWrapperNode.java     | 16 +---
 .../modules/renamer/IdentifierConverter.java  | 16 +---
 .../modules/renamer/PoolInterceptor.java      | 16 +---
 .../java/decompiler/struct/ContextUnit.java   | 16 +---
 .../decompiler/struct/IDecompiledData.java    | 16 +---
 .../java/decompiler/struct/StructClass.java   | 16 +---
 .../java/decompiler/struct/StructContext.java | 16 +---
 .../java/decompiler/struct/StructField.java   | 16 +---
 .../java/decompiler/struct/StructMember.java  | 16 +---
 .../java/decompiler/struct/StructMethod.java  | 16 +---
 .../attr/StructAnnDefaultAttribute.java       | 16 +---
 .../attr/StructAnnotationAttribute.java       | 16 +---
 .../StructAnnotationParameterAttribute.java   | 16 +---
 .../attr/StructBootstrapMethodsAttribute.java | 16 +---
 .../attr/StructConstantValueAttribute.java    | 16 +---
 .../attr/StructEnclosingMethodAttribute.java  | 16 +---
 .../attr/StructExceptionsAttribute.java       | 16 +---
 .../struct/attr/StructGeneralAttribute.java   | 16 +---
 .../attr/StructGenericSignatureAttribute.java | 16 +---
 .../attr/StructInnerClassesAttribute.java     | 16 +---
 .../attr/StructLineNumberTableAttribute.java  | 16 +---
 .../StructLocalVariableTableAttribute.java    | 16 +---
 ...StructLocalVariableTypeTableAttribute.java | 16 +---
 .../attr/StructSourceFileAttribute.java       | 16 +---
 .../attr/StructTypeAnnotationAttribute.java   | 16 +---
 .../struct/consts/ConstantPool.java           | 16 +---
 .../struct/consts/LinkConstant.java           | 16 +---
 .../struct/consts/PooledConstant.java         | 18 +---
 .../struct/consts/PrimitiveConstant.java      | 16 +---
 .../struct/consts/VariableTypeEnum.java       | 16 +---
 .../java/decompiler/struct/gen/DataPoint.java | 16 +---
 .../struct/gen/FieldDescriptor.java           | 16 +---
 .../struct/gen/MethodDescriptor.java          | 16 +---
 .../struct/gen/NewClassNameBuilder.java       | 16 +---
 .../java/decompiler/struct/gen/VarType.java   | 16 +---
 .../gen/generics/GenericClassDescriptor.java  | 16 +---
 .../gen/generics/GenericFieldDescriptor.java  | 16 +---
 .../struct/gen/generics/GenericMain.java      | 16 +---
 .../gen/generics/GenericMethodDescriptor.java | 16 +---
 .../struct/gen/generics/GenericType.java      | 16 +---
 .../decompiler/struct/lazy/LazyLoader.java    | 16 +---
 .../decompiler/struct/match/IMatchable.java   | 22 +----
 .../decompiler/struct/match/MatchEngine.java  | 94 ++++++++-----------
 .../decompiler/struct/match/MatchNode.java    | 40 +++-----
 .../decompiler/util/DataInputFullStream.java  | 16 +---
 .../decompiler/util/FastFixedSetFactory.java  | 16 +---
 .../java/decompiler/util/FastSetFactory.java  | 16 +---
 .../decompiler/util/FastSparseSetFactory.java | 16 +---
 .../java/decompiler/util/InterpreterUtil.java | 16 +---
 .../java/decompiler/util/ListStack.java       | 16 +---
 .../decompiler/util/SFormsFastMapDirect.java  | 16 +---
 .../java/decompiler/util/TextUtil.java        | 16 +---
 .../decompiler/util/VBStyleCollection.java    | 16 +---
 .../decompiler/BulkDecompilationTest.java     | 16 +---
 .../decompiler/DecompilerTestFixture.java     | 16 +---
 214 files changed, 329 insertions(+), 3325 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/CodeConstants.java b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
index 7718ac3..b9c0bd5 100644
--- a/src/org/jetbrains/java/decompiler/code/CodeConstants.java
+++ b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 public interface CodeConstants {
diff --git a/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java b/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
index b9a30a5..d8ec68d 100644
--- a/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
+++ b/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.code.optinstructions.*;
diff --git a/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java b/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
index 2927294..c9d56da 100644
--- a/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
+++ b/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/src/org/jetbrains/java/decompiler/code/ExceptionTable.java b/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
index 533fa55..7d17367 100644
--- a/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
+++ b/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.code.interpreter.Util;
diff --git a/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
index ae5d4f2..b568a24 100644
--- a/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
diff --git a/src/org/jetbrains/java/decompiler/code/IfInstruction.java b/src/org/jetbrains/java/decompiler/code/IfInstruction.java
index 1d4bf6c..090cf6e 100644
--- a/src/org/jetbrains/java/decompiler/code/IfInstruction.java
+++ b/src/org/jetbrains/java/decompiler/code/IfInstruction.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import java.io.DataOutputStream;
diff --git a/src/org/jetbrains/java/decompiler/code/Instruction.java b/src/org/jetbrains/java/decompiler/code/Instruction.java
index d77f3b4..edd13b3 100644
--- a/src/org/jetbrains/java/decompiler/code/Instruction.java
+++ b/src/org/jetbrains/java/decompiler/code/Instruction.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import java.io.DataOutputStream;
diff --git a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
index ec22827..5d4751f 100644
--- a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.code.interpreter.Util;
diff --git a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
index 44f4ff9..c27607b 100644
--- a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
+++ b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 /*
diff --git a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
index 5963509..8f2f541 100644
--- a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
diff --git a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
index 6aa6a7f..aa54f58 100644
--- a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
+++ b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 /*
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
index 55d7462..3f82b8a 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 8fccd04..cf25306 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
 import org.jetbrains.java.decompiler.code.*;
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
index 84640d7..922358d 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java b/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
index 553ad84..a26d87b 100644
--- a/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
+++ b/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.interpreter;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/code/interpreter/Util.java b/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
index bf1e5eb..488f4ce 100644
--- a/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
+++ b/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.interpreter;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
index 7923b84..dd9a082 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
index d514ffe..f9f1a2e 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
index 046f34a..5db4d35 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
index 2ccebd4..2db51be 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java b/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
index 9a42f65..8497884 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
index fa97db2..bb9c931 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
index 10e1283..f6efd5e 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
index c775ec8..1d47019 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
index c76b374..77dafbc 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
index 6b95aaf..27f69b4 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
index c1401a6..ab76504 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
index 97374c0..14bce2e 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.JumpInstruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
index 56ba9e8..2de6914 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.JumpInstruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
index 05b446c..204f453 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
index d328e23..b4bd0ea 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
index f93d5b8..b55440a 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
index 917c5bd..9c2e50a 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
index 51259ff..7aa9000 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
index 2436803..b3247ca 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
index f036a1d..4ada3dd 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
index ca3bcd3..677b8d3 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
index 4ee2d49..c8512ce 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
index bb000a7..5bfbf28 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.JumpInstruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
index fb04ed9..465e5fb 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.JumpInstruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
index ae7b3c6..ee7e9fd 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
index 6ba1964..341c852 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
index 71e5fe0..1f524b1 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
index 8381d8c..4b655cb 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
index 4183168..d68c84b 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.SwitchInstruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
index bed5f7e..24f79e0 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
index b6835e8..c5e418e 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java b/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
index 2e8854f..1262c61 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
index f2f8e4d..236474c 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
index c1e3e92..3466b16 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
index 0fe0240..7bc67ea 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java b/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
index 93f62ff..a55ef59 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
index 08b10a5..873e86a 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.Instruction;
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
index 0b41ecf..f96f158 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
+++ b/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.optinstructions;
 
 import org.jetbrains.java.decompiler.code.SwitchInstruction;
diff --git a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
index e7942eb..64fee99 100644
--- a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 3ccc2d7..3bc780f 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 4a4f67d..ad96ccd 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index a743f98..27d4fd8 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
index 39619ce..9cda69f 100644
--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper;
diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
index 7e83fe9..08598e8 100644
--- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index e355ee9..8953a6d 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index 18a13d9..b929d0d 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/TextBuffer.java b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
index 4e0b09a..58564d7 100644
--- a/src/org/jetbrains/java/decompiler/main/TextBuffer.java
+++ b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
index 18e1b78..449c5df 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.struct.attr.StructLineNumberTableAttribute;
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
index 8531f50..199485f 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java b/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
index 3fa3fd2..ebc8bd2 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 public class CounterContainer {
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index ee3933c..3cf2e4e 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
index c7ae714..5d03d2e 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import java.util.Collection;
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
index 07b8578..2ac560f 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.Fernflower;
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 8925ad7..d6db351 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
index 5ed82ed..cbc03fd 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
index adf3270..ac72d7c 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 import java.io.IOException;
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
index 23d5c63..c9ece03 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 public abstract class IFernflowerLogger {
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index c1ceecd..c8d927a 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
index 5513528..59d7be7 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 public interface IIdentifierRenamer {
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
index 269f1c5..fad1ddc 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 import java.util.jar.Manifest;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 3a3346e..82ffedd 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
index 3b2e74d..eff8bf7 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 4b47425..4ab1596 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -140,7 +126,7 @@ public class MethodProcessorRunnable implements Runnable {
     proc.processStatement(root, cl);
 
     SequenceHelper.condenseSequences(root);
-    
+
     while (true) {
       StackVarsProcessor stackProc = new StackVarsProcessor();
       stackProc.simplifyStackVars(root, mt, cl);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
index 8fc8fe2..4fabf23 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 0858c68..e08cee0 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index 5be55d0..1f723d3 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
index 2522489..6f50c61 100644
--- a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.code;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
index df73c29..6e1155d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
index 30d39fb..ede1dda 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
index aea5afa..8bc7bdb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
index 3dc4cf0..2c1e9d0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
index 144db3b..04737c8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
index 0b145a6..1efe1e5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
index 26a3b23..8b522ad 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
index c4cded2..78b84bf 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index cbd42a7..5ee6fd5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.*;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
index d6f917d..a7b4113 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index 0b5d14e..7d6df79 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
index 205e25c..6fb86db 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
index bba1484..7d79f81 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
index 1fac826..1c1de82 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
index 67e9248..75f4cb2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
index 0bc723d..f0eda8e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
index 2371a72..d73535f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
index fff1841..d3ce7d7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
index 4c5abe7..740c2bb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
index b96d3a5..4fe4127 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index 0e7e139..ffdfa21 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -37,7 +23,7 @@ import java.util.Map.Entry;
 public class SimplifyExprentsHelper {
 
   static final MatchEngine class14Builder = new MatchEngine();
-  
+
   private final boolean firstInvocation;
 
   public SimplifyExprentsHelper(boolean firstInvocation) {
@@ -884,26 +870,26 @@ public class SimplifyExprentsHelper {
           "   exprent type:var index:$var$\n" +
           "   exprent type:field name:$fieldname$\n" +
           " statement type:sequence statsize:2\n" +
-          "  statement type:trycatch\n" +  
+          "  statement type:trycatch\n" +
           "   statement type:basicblock exprsize:1\n" +
           "    exprent type:assignment\n" +
           "     exprent type:var index:$var$\n" +
           "     exprent type:invocation invclass:java/lang/Class signature:forName(Ljava/lang/String;)Ljava/lang/Class;\n" +
           "      exprent position:0 type:constant consttype:string constvalue:$classname$\n" +
           "   statement type:basicblock exprsize:1\n" +
-          "    exprent type:exit exittype:throw\n" + 
-          "  statement type:basicblock exprsize:1\n" + 
-          "   exprent type:assignment\n" + 
+          "    exprent type:exit exittype:throw\n" +
+          "  statement type:basicblock exprsize:1\n" +
+          "   exprent type:assignment\n" +
           "    exprent type:field name:$fieldname$ ret:$field$\n" +
           "    exprent type:var index:$var$"
         );
   }
-  
+
   private static boolean collapseInlinedClass14(Statement stat) {
 
     boolean ret = class14Builder.match(stat);
     if(ret) {
-      
+
       String class_name = (String)class14Builder.getVariableValue("$classname$");
       AssignmentExprent assfirst = (AssignmentExprent)class14Builder.getVariableValue("$assignfield$");
       FieldExprent fieldexpr = (FieldExprent)class14Builder.getVariableValue("$field$");
@@ -915,15 +901,15 @@ public class SimplifyExprentsHelper {
       stat.setExprents(data);
 
       SequenceHelper.destroyAndFlattenStatement(stat);
-      
+
       ClassWrapper wrapper = (ClassWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_WRAPPER);
       if (wrapper != null) {
         wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldexpr.getName(), fieldexpr.getDescriptor().descriptorString));
       }
-      
+
     }
-    
+
     return ret;
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index ea52cb3..23dce62 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
index 8d5e762..19ed25e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
index 047accd..efc0886 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -25,7 +11,7 @@ import java.util.List;
 
 //  --------------------------------------------------------------------
 //    Algorithm
-//  -------------------------------------------------------------------- 
+//  --------------------------------------------------------------------
 //  DFS(G)
 //  {
 //  make a new vertex x with edges x->v for all v
@@ -58,8 +44,8 @@ import java.util.List;
 //      remove v from G
 //      until v=p
 //  }
-//  }	
-//  -------------------------------------------------------------------- 
+//  }
+//  --------------------------------------------------------------------
 
 public class StrongConnectivityHelper {
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
index 6bf5975..9015e3d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
index 608d56c..0d908a2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
index 0cee74c..2cebb3a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
index 9a4e046..174774f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -92,7 +78,7 @@ public class FastExtendedPostdominanceHelper {
       Set<Statement> setVisited = new HashSet<>();
 
       setVisited.add(stack.getFirst());
-      
+
       while (!stack.isEmpty()) {
 
         Statement stat = stack.removeFirst();
@@ -110,17 +96,17 @@ public class FastExtendedPostdominanceHelper {
           setPostdoms.complement(path);
           continue;
         }
-        
+
         for (StatEdge edge : stat.getSuccessorEdges(StatEdge.TYPE_REGULAR)) {
-          
+
           Statement edge_destination = edge.getDestination();
-          
+
           if(!setVisited.contains(edge_destination)) {
-            
+
             stack.add(edge_destination);
             stackPath.add(path.getCopy());
-            
-            setVisited.add(edge_destination); 
+
+            setVisited.add(edge_destination);
           }
         }
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
index d1830f3..df89130 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
index faaf4c6..6ad7439 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import java.util.List;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
index 19d59b5..8dd357b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import java.util.List;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index 9e46ce3..bf3d550 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.deobfuscator;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
index 9ab65e0..78eb38d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.deobfuscator;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
index c17d921..cb0b9c2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
index 3590b48..6309ace 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
index af95d15..14c0425 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
index 4374ff8..57aa324 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index cfd300d..58e0b1c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -403,7 +389,7 @@ public class ConstExprent extends Exprent {
   public boolean isBoolPermitted() {
     return boolPermitted;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index 0f16b66..d5f3880 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -153,25 +139,25 @@ public class ExitExprent extends Exprent {
   public VarType getRetType() {
     return retType;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
   public boolean match(MatchNode matchNode, MatchEngine engine) {
 
     if(!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_EXITTYPE);
     if(type != null) {
       if(this.exitType != type.intValue()) {
         return false;
       }
     }
-    
+
     return true;
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index a786423..0f8bbb4 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -138,7 +124,7 @@ public class Exprent implements IMatchable {
       }
     }
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 6d549b1..8fe2a4f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -196,30 +182,30 @@ public class FieldExprent extends Exprent {
   public String getName() {
     return name;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
   public boolean match(MatchNode matchNode, MatchEngine engine) {
 
     if(!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_FIELD_NAME);
     if(rule != null) {
       if(rule.isVariable()) {
         if(!engine.checkAndSetVariableValue((String)rule.value, this.name)) {
           return false;
         }
-      } else { 
+      } else {
         if(!rule.value.equals(this.name)) {
           return false;
         }
       }
     }
-    
+
     return true;
   }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index 02e6371..d164f16 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -618,25 +604,25 @@ public class FunctionExprent extends Exprent {
   public void setImplicitType(VarType implicitType) {
     this.implicitType = implicitType;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
   public boolean match(MatchNode matchNode, MatchEngine engine) {
 
     if(!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_FUNCTYPE);
     if(type != null) {
       if(this.funcType != type.intValue()) {
         return false;
       }
     }
-    
+
     return true;
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
index d1537bd..d8f3023 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index a53576d..6886540 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
index 1546064..ceff5ce 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index c153f72..5538546 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
index cadf94f..cd5b472 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
index 93ab87b..0836731 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 public class TypeAnnotation {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index d31f809..16b489f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -260,31 +246,31 @@ public class VarExprent extends Exprent {
   public void setStack(boolean stack) {
     this.stack = stack;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
   public boolean match(MatchNode matchNode, MatchEngine engine) {
 
     if(!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_VAR_INDEX);
     if(rule != null) {
       if(rule.isVariable()) {
         if(!engine.checkAndSetVariableValue((String)rule.value, this.index)) {
           return false;
         }
-      } else { 
+      } else {
         if(this.index != Integer.valueOf((String)rule.value).intValue()) {
           return false;
         }
       }
     }
-    
+
     return true;
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index 413cdf6..6f33885 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
index b71330a..c48d14a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
index 43c63f6..23ce01a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
index 19ef39a..ec130b6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
index fe22e61..8901bd6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
index 334637c..290038d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index c6f90d8..ff10e0d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index db6b79d..c2587c4 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
index 3339218..63b7de5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
index f74e745..0b6e58b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import java.util.Collection;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
index b2321e5..84b835a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index 9639e18..a9fd4b0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
@@ -424,18 +410,18 @@ public class IfStatement extends Statement {
   public StatEdge getElseEdge() {
     return elseedge;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
   public IMatchable findObject(MatchNode matchNode, int index) {
 
     IMatchable object = super.findObject(matchNode, index);
     if(object != null) {
       return object;
     }
-    
+
     if(matchNode.getType() == MatchNode.MATCHNODE_EXPRENT) {
       String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
       if("head".equals(position)) {
@@ -458,8 +444,8 @@ public class IfStatement extends Statement {
         return false;
       }
     }
-        
+
     return true;
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
index 7193f9a..a7421d9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
index 7d2ee43..8eca0bd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.main.TextBuffer;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index a199c28..6249205 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -859,15 +845,15 @@ public class Statement implements IMatchable {
   public String toString() {
     return id.toString();
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
   public IMatchable findObject(MatchNode matchNode, int index) {
-    
+
     int node_type = matchNode.getType();
-    
+
     if (node_type == MatchNode.MATCHNODE_STATEMENT && !this.stats.isEmpty()) {
       String position = (String)matchNode.getRuleValue(MatchProperties.STATEMENT_POSITION);
       if(position != null) {
@@ -892,11 +878,11 @@ public class Statement implements IMatchable {
   }
 
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-    
+
     if(matchNode.getType() != MatchNode.MATCHNODE_STATEMENT) {
       return false;
     }
-    
+
     for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
       switch(rule.getKey()) {
       case STATEMENT_TYPE:
@@ -927,10 +913,10 @@ public class Statement implements IMatchable {
         }
         break;
       }
-      
+
     }
-    
+
     return true;
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
index 52b7eda..ea4c19c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
index bcef5fe..ada82b5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.SwitchInstruction;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
index e097571..7010283 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
index 883a684..3fce94d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
index 0cad643..8dd708d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 5f21ff2..aa73cf1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
index a96fc1b..ec401d1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
index a871fec..347a6b6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
@@ -1,21 +1,7 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
-public class VarVersionEdge { // FIXME: can be removed? 
+public class VarVersionEdge { // FIXME: can be removed?
 
   public static final int EDGE_GENERAL = 0;
   public static final int EDGE_PHANTOM = 1;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
index d0010ca..540de93 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
index ab9e5d4..40a3759 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 5fd619c..dce2a2b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
index 6300289..b959750 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
index ce2a5c1..3267742 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
 import org.jetbrains.java.decompiler.struct.StructClass;
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
index 223065a..ca0fff5 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
index 9b4b6c6..277a3ca 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
 import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
index 38c9487..f9cd2af 100644
--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java b/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
index f309b0e..b3b38dd 100644
--- a/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
+++ b/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 public interface IDecompiledData {
diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
index fafd5f8..5815c89 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
index f11e4a4..f82f165 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
diff --git a/src/org/jetbrains/java/decompiler/struct/StructField.java b/src/org/jetbrains/java/decompiler/struct/StructField.java
index 87ba1d8..6c85ca4 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructField.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructField.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index 585fcb2..7a3afc4 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index c86ea02..0c482d7 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.*;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
index 93a660f..891ffba 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
index 500e63c..dec6b28 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
index 4c2f804..d3f0de5 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
index e3e203f..8511b91 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
index 9dc636e..a7e5cc1 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
index f869f96..2998467 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
index 0ac54c8..5c09e93 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index 1e8894a..77d6297 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
index a6a1c2b..d3de832 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
index d55adec..e02a084 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
index f21cf97..4a0f103 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
index 0a06ea0..1c80ef0 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
index 719b333..331d680 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
index 85a7dff..e33b266 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
index e7d7ac0..a202940 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index 68dffc6..2bd2d53 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
index 5d37f0f..d4daa40 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
 import java.io.DataOutputStream;
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
index d3d30c0..7a3d9b0 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -25,7 +11,7 @@ import java.io.IOException;
     	u1 tag;
     	u1 info[];
     }
-    
+
 */
 
 public class PooledConstant implements CodeConstants, VariableTypeEnum {
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
index 4cd4dd8..8a12c8a 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
 import java.io.DataOutputStream;
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java b/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
index 7950d5b..7770972 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
 public interface VariableTypeEnum {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
index e067999..f3d8562 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
index a2fd20c..765820c 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
index 3b5abb4..41f3ae8 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java b/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java
index 5f03ccd..32b8a5e 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 public interface NewClassNameBuilder {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
index 6589cff..5bb88b5 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
index 077814c..ad623a2 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import java.util.ArrayList;
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
index 598d17b..9b85579 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 public class GenericFieldDescriptor {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index a5760a3..324441b 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
index 2d38084..7fce57a 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import java.util.ArrayList;
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
index ee71f5b..4b213a0 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
index e0bf3cb..eaf5615 100644
--- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.lazy;
 
 import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
diff --git a/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java b/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
index 95f149e..6e038f8 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
 
@@ -25,7 +11,7 @@ public interface IMatchable {
     STATEMENT_EXPRSIZE,
     STATEMENT_POSITION,
     STATEMENT_IFTYPE,
-    
+
     EXPRENT_TYPE,
     EXPRENT_RET,
     EXPRENT_POSITION,
@@ -39,9 +25,9 @@ public interface IMatchable {
     EXPRENT_VAR_INDEX,
     EXPRENT_FIELD_NAME,
   }
-  
+
   IMatchable findObject(MatchNode matchNode, int index);
 
   boolean match(MatchNode matchNode, MatchEngine engine);
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
index a222d67..e2f0d81 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
 import java.util.ArrayList;
@@ -35,9 +21,9 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 public class MatchEngine {
 
   private MatchNode rootNode = null;
-  
+
   private final Map<String, Object> variables = new HashMap<>();
-  
+
   private static final Map<String, MatchProperties> stat_properties = new HashMap<>();
   private static final Map<String, MatchProperties> expr_properties = new HashMap<>();
   private static final Map<String, Integer> stat_type = new HashMap<>();
@@ -46,7 +32,7 @@ public class MatchEngine {
   private static final Map<String, Integer> expr_exit_type = new HashMap<>();
   private static final Map<String, Integer> stat_if_type = new HashMap<>();
   private static final Map<String, VarType> expr_const_type = new HashMap<>();
-  
+
   static {
     stat_properties.put("type", MatchProperties.STATEMENT_TYPE);
     stat_properties.put("ret", MatchProperties.STATEMENT_RET);
@@ -54,7 +40,7 @@ public class MatchEngine {
     stat_properties.put("statsize", MatchProperties.STATEMENT_STATSIZE);
     stat_properties.put("exprsize", MatchProperties.STATEMENT_EXPRSIZE);
     stat_properties.put("iftype", MatchProperties.STATEMENT_IFTYPE);
-    
+
     expr_properties.put("type", MatchProperties.EXPRENT_TYPE);
     expr_properties.put("ret", MatchProperties.EXPRENT_RET);
     expr_properties.put("position", MatchProperties.EXPRENT_POSITION);
@@ -67,14 +53,14 @@ public class MatchEngine {
     expr_properties.put("parameter", MatchProperties.EXPRENT_INVOCATION_PARAMETER);
     expr_properties.put("index", MatchProperties.EXPRENT_VAR_INDEX);
     expr_properties.put("name", MatchProperties.EXPRENT_FIELD_NAME);
-    
+
     stat_type.put("if", Statement.TYPE_IF);
     stat_type.put("do", Statement.TYPE_DO);
     stat_type.put("switch", Statement.TYPE_SWITCH);
     stat_type.put("trycatch", Statement.TYPE_TRYCATCH);
     stat_type.put("basicblock", Statement.TYPE_BASICBLOCK);
     stat_type.put("sequence", Statement.TYPE_SEQUENCE);
-    
+
     expr_type.put("array", Exprent.EXPRENT_ARRAY);
     expr_type.put("assignment", Exprent.EXPRENT_ASSIGNMENT);
     expr_type.put("constant", Exprent.EXPRENT_CONST);
@@ -89,9 +75,9 @@ public class MatchEngine {
     expr_type.put("var", Exprent.EXPRENT_VAR);
     expr_type.put("annotation", Exprent.EXPRENT_ANNOTATION);
     expr_type.put("assert", Exprent.EXPRENT_ASSERT);
-    
+
     expr_func_type.put("eq", FunctionExprent.FUNCTION_EQ);
-    
+
     expr_exit_type.put("return", ExitExprent.EXIT_RETURN);
     expr_exit_type.put("throw", ExitExprent.EXIT_THROW);
 
@@ -101,44 +87,44 @@ public class MatchEngine {
     expr_const_type.put("null", VarType.VARTYPE_NULL);
     expr_const_type.put("string", VarType.VARTYPE_STRING);
   }
-  
+
 
   public void parse(String description) {
-    
-    // each line is a separate statement/exprent 
+
+    // each line is a separate statement/exprent
     String[] lines = description.split("\n");
 
-    int depth = 0; 
+    int depth = 0;
     LinkedList<MatchNode> stack = new LinkedList<>();
-    
+
     for(String line : lines) {
-      
+
       List<String> properties = new ArrayList<>(Arrays.asList(line.split("\\s+"))); // split on any number of whitespaces
       if(properties.get(0).isEmpty()) {
         properties.remove(0);
       }
-      
+
       int node_type = "statement".equals(properties.get(0)) ? MatchNode.MATCHNODE_STATEMENT : MatchNode.MATCHNODE_EXPRENT;
-      
+
       // create new node
       MatchNode matchNode = new MatchNode(node_type);
       for(int i = 1; i < properties.size(); ++i) {
         String[] values = properties.get(i).split(":");
-        
+
         MatchProperties property = (node_type == MatchNode.MATCHNODE_STATEMENT ? stat_properties : expr_properties).get(values[0]);
         if(property == null) { // unknown property defined
           throw new RuntimeException("Unknown matching property");
         } else {
-          
+
           Object value = null;
           int parameter = 0;
-          
+
           String strValue = values[1];
           if(values.length == 3) {
             parameter = Integer.parseInt(values[1]);
             strValue = values[2];
           }
-          
+
           switch(property) {
           case STATEMENT_TYPE:
             value = stat_type.get(strValue);
@@ -181,74 +167,74 @@ public class MatchEngine {
           matchNode.addRule(property, new RuleValue(parameter, value));
         }
       }
-      
+
       if(stack.isEmpty()) { // first line, root node
         stack.push(matchNode);
       } else {
-      
-        // return to the correct parent on the stack  
+
+        // return to the correct parent on the stack
         int new_depth = line.lastIndexOf(' ', depth) + 1;
         for(int i = new_depth; i <= depth; ++i) {
           stack.pop();
         }
-  
+
         // insert new node
         stack.getFirst().addChild(matchNode);
         stack.push(matchNode);
-        
-        depth = new_depth; 
+
+        depth = new_depth;
       }
     }
-    
+
     this.rootNode = stack.getLast();
   }
-  
+
   public boolean match(IMatchable object) {
     variables.clear();
     return match(this.rootNode, object);
   }
-  
+
   private boolean match(MatchNode matchNode, IMatchable object) {
-    
-    if(!object.match(matchNode, this)) { 
+
+    if(!object.match(matchNode, this)) {
       return false;
     }
-    
+
     int expr_index = 0;
     int stat_index = 0;
 
     for(MatchNode childNode : matchNode.getChildren()) {
       boolean isStatement = childNode.getType() == MatchNode.MATCHNODE_STATEMENT;
-      
+
       IMatchable childObject = object.findObject(childNode, isStatement ? stat_index : expr_index);
       if(childObject == null || !match(childNode, childObject)) {
         return false;
       }
-      
+
       if(isStatement) {
         stat_index++;
       } else {
         expr_index++;
       }
     }
-    
+
     return true;
   }
 
   public boolean checkAndSetVariableValue(String name, Object value) {
-    
+
     Object old_value = variables.get(name);
     if(old_value == null) {
       variables.put(name, value);
     } else if(!old_value.equals(value)) {
       return false;
     }
-    
+
     return true;
   }
-  
+
   public Object getVariableValue(String name) {
     return variables.get(name);
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
index 8d52aa9..7320954 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
 import java.util.ArrayList;
@@ -27,32 +13,32 @@ public class MatchNode {
   public static class RuleValue {
     public final int parameter;
     public final Object value;
-    
+
     public RuleValue(int parameter, Object value) {
       this.parameter = parameter;
       this.value = value;
     }
-    
+
     public boolean isVariable() {
       String strValue = value.toString();
       return (strValue.charAt(0) == '$' && strValue.charAt(strValue.length() - 1) == '$');
     }
-    
+
     public String toString() {
       return value.toString();
     }
   }
-  
+
   public static final int MATCHNODE_STATEMENT = 0;
   public static final int MATCHNODE_EXPRENT = 1;
-  
+
   private final int type;
-  
+
   private final Map<MatchProperties, RuleValue> rules = new HashMap<>();
-  
+
   private final List<MatchNode> children = new ArrayList<>();
-  
-  
+
+
   public MatchNode(int type) {
     this.type = type;
   }
@@ -60,7 +46,7 @@ public class MatchNode {
   public void addChild(MatchNode child) {
     children.add(child);
   }
-  
+
   public void addRule(MatchProperties property, RuleValue value) {
     rules.put(property, value);
   }
@@ -76,10 +62,10 @@ public class MatchNode {
   public Map<MatchProperties, RuleValue> getRules() {
     return rules;
   }
-  
+
   public Object getRuleValue(MatchProperties property) {
     RuleValue rule = rules.get(property);
     return rule == null ? null : rule.value;
   }
-  
+
 }
diff --git a/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java b/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
index ac71e20..286f315 100644
--- a/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
+++ b/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
index cd568a8..ab374c8 100644
--- a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.*;
diff --git a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
index 94ddfce..b58901d 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.Collection;
diff --git a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
index 563a404..4748312 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.Collection;
diff --git a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
index a70f0b3..1d29253 100644
--- a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.io.*;
diff --git a/src/org/jetbrains/java/decompiler/util/ListStack.java b/src/org/jetbrains/java/decompiler/util/ListStack.java
index b4aa978..3502045 100644
--- a/src/org/jetbrains/java/decompiler/util/ListStack.java
+++ b/src/org/jetbrains/java/decompiler/util/ListStack.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.ArrayList;
diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
index 0537e4e..d5e95fc 100644
--- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
+++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 21f10e4..c8a74b0 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
diff --git a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
index f4d6d5a..1d4a46c 100644
--- a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
+++ b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.ArrayList;
diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
index 4e2fda3..bd39a8a 100644
--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+++ b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index 2dbcce6..5b7cc41 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;

From fbc3165138e0cc3c0c13808f6528615fd1a6c1f2 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 28 Nov 2017 15:42:02 +0100
Subject: [PATCH 157/252] [java decompiler] updates Gradle project

---
 .editorconfig                            | 6 ++++++
 .gitignore                               | 1 +
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..8286f5f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=false
+indent_style=space
+indent_size=2
diff --git a/.gitignore b/.gitignore
index a065e50..3537b26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+/.idea/
 /.gradle/
 /build/
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a85339c..657de85 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 27 17:39:43 CEST 2017
+#Tue Nov 28 14:11:56 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip

From 71d8f4d68914f1f946abdb29ed81f02ef7890191 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 28 Nov 2017 19:22:17 +0100
Subject: [PATCH 158/252] [java decompiler] reworks setting/accessing
 decompiler context

---
 .../decompiler/main/ClassesProcessor.java     |  23 +-
 .../decompiler/main/DecompilerContext.java    | 196 +++++++++---------
 .../java/decompiler/main/Fernflower.java      |  68 +++---
 .../main/collectors/CounterContainer.java     |   5 +-
 .../main/decompiler/BaseDecompiler.java       |   7 +-
 .../main/decompiler/ConsoleDecompiler.java    |   6 -
 .../decompiler/main/rels/ClassWrapper.java    |  19 +-
 .../main/rels/MethodProcessorRunnable.java    |   9 +-
 .../modules/decompiler/exps/Exprent.java      |   2 +-
 .../decompiler/stats/CatchAllStatement.java   |   7 +-
 .../decompiler/stats/CatchStatement.java      |   5 +-
 .../decompiler/vars/VarDefinitionHelper.java  |   5 +-
 .../modules/decompiler/vars/VarProcessor.java |   5 +
 .../modules/renamer/IdentifierConverter.java  |  40 +---
 .../modules/renamer/PoolInterceptor.java      |  21 +-
 .../decompiler/DecompilerTestFixture.java     |   7 +-
 16 files changed, 197 insertions(+), 228 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 27d4fd8..f073f97 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -3,7 +3,6 @@ package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper;
-import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
@@ -28,6 +27,7 @@ import java.util.Map.Entry;
 public class ClassesProcessor {
   public static final int AVERAGE_CLASS_SIZE = 16 * 1024;
 
+  private final StructContext context;
   private final Map<String, ClassNode> mapRootClasses = new HashMap<>();
 
   private static class Inner {
@@ -41,6 +41,10 @@ public class ClassesProcessor {
   }
 
   public ClassesProcessor(StructContext context) {
+    this.context = context;
+  }
+
+  public void loadClasses(IIdentifierRenamer renamer) {
     Map<String, Inner> mapInnerClasses = new HashMap<>();
     Map<String, Set<String>> mapNestedClassReferences = new HashMap<>();
     Map<String, Set<String>> mapEnclosingClassReferences = new HashMap<>();
@@ -64,12 +68,11 @@ public class ClassesProcessor {
               if (savedName != null) {
                 simpleName = savedName;
               }
-              else if (simpleName != null && DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
-                IIdentifierRenamer renamer = DecompilerContext.getPoolInterceptor().getHelper();
-                if (renamer.toBeRenamed(IIdentifierRenamer.Type.ELEMENT_CLASS, simpleName, null, null)) {
-                  simpleName = renamer.getNextClassName(innerName, simpleName);
-                  mapNewSimpleNames.put(innerName, simpleName);
-                }
+              else if (simpleName != null &&
+                       renamer != null &&
+                       renamer.toBeRenamed(IIdentifierRenamer.Type.ELEMENT_CLASS, simpleName, null, null)) {
+                simpleName = renamer.getNextClassName(innerName, simpleName);
+                mapNewSimpleNames.put(innerName, simpleName);
               }
 
               Inner rec = new Inner();
@@ -223,9 +226,7 @@ public class ClassesProcessor {
     DecompilerContext.getLogger().startReadingClass(cl.qualifiedName);
     try {
       ImportCollector importCollector = new ImportCollector(root);
-      DecompilerContext.setImportCollector(importCollector);
-      DecompilerContext.setCounterContainer(new CounterContainer());
-      DecompilerContext.setBytecodeSourceMapper(new BytecodeSourceMapper());
+      DecompilerContext.startClass(importCollector);
 
       new LambdaProcessor().processClass(root);
 
@@ -418,4 +419,4 @@ public class ClassesProcessor {
       public boolean is_content_method_static;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
index 9cda69f..f75d751 100644
--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -4,142 +4,142 @@ package org.jetbrains.java.decompiler.main;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
-import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
 import org.jetbrains.java.decompiler.struct.StructContext;
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 public class DecompilerContext {
   public static final String CURRENT_CLASS = "CURRENT_CLASS";
   public static final String CURRENT_CLASS_WRAPPER = "CURRENT_CLASS_WRAPPER";
   public static final String CURRENT_CLASS_NODE = "CURRENT_CLASS_NODE";
   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
-  public static final String CURRENT_VAR_PROCESSOR = "CURRENT_VAR_PROCESSOR";
 
-  private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<>();
+  private static volatile DecompilerContext currentContext = null;
 
   private final Map<String, Object> properties;
-  private StructContext structContext;
+  private final IFernflowerLogger logger;
+  private final StructContext structContext;
+  private final ClassesProcessor classProcessor;
+  private final PoolInterceptor poolInterceptor;
   private ImportCollector importCollector;
-  private VarNamesCollector varNamescollector;
+  private VarProcessor varProcessor;
   private CounterContainer counterContainer;
-  private ClassesProcessor classProcessor;
-  private PoolInterceptor poolInterceptor;
-  private IFernflowerLogger logger;
   private BytecodeSourceMapper bytecodeSourceMapper;
 
-  private DecompilerContext(Map<String, Object> properties) {
+  private DecompilerContext(Map<String, Object> properties,
+                            IFernflowerLogger logger,
+                            StructContext structContext,
+                            ClassesProcessor classProcessor,
+                            PoolInterceptor interceptor) {
     this.properties = properties;
+    this.logger = logger;
+    this.structContext = structContext;
+    this.classProcessor = classProcessor;
+    this.poolInterceptor = interceptor;
+    this.counterContainer = new CounterContainer();
   }
 
-  public static void initContext(Map<String, Object> propertiesCustom) {
+  // *****************************************************************************
+  // context setup and update
+  // *****************************************************************************
+
+  public static void initContext(Map<String, Object> customProperties,
+                                 IFernflowerLogger logger,
+                                 StructContext structContext,
+                                 ClassesProcessor classProcessor,
+                                 PoolInterceptor interceptor) {
+    Objects.requireNonNull(logger);
+    Objects.requireNonNull(structContext);
+    Objects.requireNonNull(classProcessor);
+
     Map<String, Object> properties = new HashMap<>(IFernflowerPreferences.DEFAULTS);
-    if (propertiesCustom != null) {
-      properties.putAll(propertiesCustom);
+    if (customProperties != null) {
+      properties.putAll(customProperties);
     }
-    currentContext.set(new DecompilerContext(properties));
+
+    String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
+    if (level != null) {
+      try {
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
+      }
+      catch (IllegalArgumentException ignore) { }
+    }
+
+    currentContext = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor);
   }
 
-  public static DecompilerContext getCurrentContext() {
-    return currentContext.get();
-  }
-
-  public static void setCurrentContext(DecompilerContext context) {
-    currentContext.set(context);
-  }
-
-  public static Object getProperty(String key) {
-    return getCurrentContext().properties.get(key);
+  public static void clearContext() {
+    currentContext = null;
   }
 
   public static void setProperty(String key, Object value) {
-    getCurrentContext().properties.put(key, value);
+    currentContext.properties.put(key, value);
+  }
+
+  public static void startClass(ImportCollector importCollector) {
+    currentContext.importCollector = importCollector;
+    currentContext.counterContainer = new CounterContainer();
+    currentContext.bytecodeSourceMapper = new BytecodeSourceMapper();
+  }
+
+  public static void startMethod(VarProcessor varProcessor) {
+    currentContext.varProcessor = varProcessor;
+    currentContext.counterContainer = new CounterContainer();
+  }
+
+  // *****************************************************************************
+  // context access
+  // *****************************************************************************
+
+  public static Object getProperty(String key) {
+    return currentContext.properties.get(key);
   }
 
   public static boolean getOption(String key) {
-    return "1".equals(getCurrentContext().properties.get(key));
-  }
-
-  public static ImportCollector getImportCollector() {
-    return getCurrentContext().importCollector;
-  }
-
-  public static void setImportCollector(ImportCollector importCollector) {
-    getCurrentContext().importCollector = importCollector;
-  }
-
-  public static VarNamesCollector getVarNamesCollector() {
-    return getCurrentContext().varNamescollector;
-  }
-
-  public static void setVarNamesCollector(VarNamesCollector varNamesCollector) {
-    getCurrentContext().varNamescollector = varNamesCollector;
-  }
-
-  public static StructContext getStructContext() {
-    return getCurrentContext().structContext;
-  }
-
-  public static void setStructContext(StructContext structContext) {
-    getCurrentContext().structContext = structContext;
-  }
-
-  public static CounterContainer getCounterContainer() {
-    return getCurrentContext().counterContainer;
-  }
-
-  public static void setCounterContainer(CounterContainer counterContainer) {
-    getCurrentContext().counterContainer = counterContainer;
-  }
-
-  public static ClassesProcessor getClassProcessor() {
-    return getCurrentContext().classProcessor;
-  }
-
-  public static void setClassProcessor(ClassesProcessor classProcessor) {
-    getCurrentContext().classProcessor = classProcessor;
-  }
-
-  public static PoolInterceptor getPoolInterceptor() {
-    return getCurrentContext().poolInterceptor;
-  }
-
-  public static void setPoolInterceptor(PoolInterceptor poolinterceptor) {
-    getCurrentContext().poolInterceptor = poolinterceptor;
-  }
-
-  public static BytecodeSourceMapper getBytecodeSourceMapper() {
-    return getCurrentContext().bytecodeSourceMapper;
-  }
-
-  public static void setBytecodeSourceMapper(BytecodeSourceMapper bytecodeSourceMapper) {
-    getCurrentContext().bytecodeSourceMapper = bytecodeSourceMapper;
-  }
-
-  public static IFernflowerLogger getLogger() {
-    return getCurrentContext().logger;
-  }
-
-  public static void setLogger(IFernflowerLogger logger) {
-    if (logger != null) {
-      String level = (String)getProperty(IFernflowerPreferences.LOG_LEVEL);
-      if (level != null) {
-        try {
-          logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
-        }
-        catch (IllegalArgumentException ignore) { }
-      }
-    }
-    getCurrentContext().logger = logger;
+    return "1".equals(getProperty(key));
   }
 
   public static String getNewLineSeparator() {
     return getOption(IFernflowerPreferences.NEW_LINE_SEPARATOR) ?
            IFernflowerPreferences.LINE_SEPARATOR_UNX : IFernflowerPreferences.LINE_SEPARATOR_WIN;
   }
+
+  public static IFernflowerLogger getLogger() {
+    return currentContext.logger;
+  }
+
+  public static StructContext getStructContext() {
+    return currentContext.structContext;
+  }
+
+  public static ClassesProcessor getClassProcessor() {
+    return currentContext.classProcessor;
+  }
+
+  public static PoolInterceptor getPoolInterceptor() {
+    return currentContext.poolInterceptor;
+  }
+
+  public static ImportCollector getImportCollector() {
+    return currentContext.importCollector;
+  }
+
+  public static VarProcessor getVarProcessor() {
+    return currentContext.varProcessor;
+  }
+
+  public static CounterContainer getCounterContainer() {
+    return currentContext.counterContainer;
+  }
+
+  public static BytecodeSourceMapper getBytecodeSourceMapper() {
+    return currentContext.bytecodeSourceMapper;
+  }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 8953a6d..0572806 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -2,12 +2,10 @@
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
-import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
-import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.main.extern.*;
+import org.jetbrains.java.decompiler.modules.renamer.ConverterHelper;
 import org.jetbrains.java.decompiler.modules.renamer.IdentifierConverter;
+import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
 import org.jetbrains.java.decompiler.struct.IDecompiledData;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
@@ -16,32 +14,50 @@ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
 import java.util.Map;
 
 public class Fernflower implements IDecompiledData {
-
   private final StructContext structContext;
-  private ClassesProcessor classesProcessor;
+  private final ClassesProcessor classProcessor;
+  private IIdentifierRenamer helper;
+  private IdentifierConverter converter;
 
   public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
     structContext = new StructContext(saver, this, new LazyLoader(provider));
-    DecompilerContext.initContext(options);
-    DecompilerContext.setCounterContainer(new CounterContainer());
-    DecompilerContext.setLogger(logger);
+    classProcessor = new ClassesProcessor(structContext);
+
+    PoolInterceptor interceptor = null;
+    Object rename = options.get(IFernflowerPreferences.RENAME_ENTITIES);
+    if ("1".equals(rename) || rename == null && "1".equals(IFernflowerPreferences.DEFAULTS.get(IFernflowerPreferences.RENAME_ENTITIES))) {
+      helper = loadHelper((String)options.get(IFernflowerPreferences.USER_RENAMER_CLASS));
+      interceptor = new PoolInterceptor();
+      converter = new IdentifierConverter(structContext, helper, interceptor);
+    }
+
+    DecompilerContext.initContext(options, logger, structContext, classProcessor, interceptor);
   }
 
   public void decompileContext() {
-    if (DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
-      new IdentifierConverter().rename(structContext);
+    if (converter != null) {
+      converter.rename();
     }
 
-    classesProcessor = new ClassesProcessor(structContext);
-
-    DecompilerContext.setClassProcessor(classesProcessor);
-    DecompilerContext.setStructContext(structContext);
+    classProcessor.loadClasses(helper);
 
     structContext.saveContext();
   }
 
+  private static IIdentifierRenamer loadHelper(String className) {
+    if (className != null) {
+      try {
+        Class<?> renamerClass = Fernflower.class.getClassLoader().loadClass(className);
+        return (IIdentifierRenamer) renamerClass.getDeclaredConstructor().newInstance();
+      }
+      catch (Exception ignored) { }
+    }
+
+    return new ConverterHelper();
+  }
+
   public void clearContext() {
-    DecompilerContext.setCurrentContext(null);
+    DecompilerContext.clearContext();
   }
 
   public StructContext getStructContext() {
@@ -50,18 +66,16 @@ public class Fernflower implements IDecompiledData {
 
   @Override
   public String getClassEntryName(StructClass cl, String entryName) {
-    ClassNode node = classesProcessor.getMapRootClasses().get(cl.qualifiedName);
+    ClassNode node = classProcessor.getMapRootClasses().get(cl.qualifiedName);
     if (node.type != ClassNode.CLASS_ROOT) {
       return null;
     }
+    else if (converter != null) {
+      String simpleClassName = cl.qualifiedName.substring(cl.qualifiedName.lastIndexOf('/') + 1);
+      return entryName.substring(0, entryName.lastIndexOf('/') + 1) + simpleClassName + ".java";
+    }
     else {
-      if (DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
-        String simple_classname = cl.qualifiedName.substring(cl.qualifiedName.lastIndexOf('/') + 1);
-        return entryName.substring(0, entryName.lastIndexOf('/') + 1) + simple_classname + ".java";
-      }
-      else {
-        return entryName.substring(0, entryName.lastIndexOf(".class")) + ".java";
-      }
+      return entryName.substring(0, entryName.lastIndexOf(".class")) + ".java";
     }
   }
 
@@ -70,7 +84,7 @@ public class Fernflower implements IDecompiledData {
     try {
       TextBuffer buffer = new TextBuffer(ClassesProcessor.AVERAGE_CLASS_SIZE);
       buffer.append(DecompilerContext.getProperty(IFernflowerPreferences.BANNER).toString());
-      classesProcessor.writeClass(cl, buffer);
+      classProcessor.writeClass(cl, buffer);
       return buffer.toString();
     }
     catch (Throwable ex) {
@@ -78,4 +92,4 @@ public class Fernflower implements IDecompiledData {
       return null;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java b/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
index ebc8bd2..7091694 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
@@ -2,9 +2,8 @@
 package org.jetbrains.java.decompiler.main.collectors;
 
 public class CounterContainer {
-
   public static final int STATEMENT_COUNTER = 0;
-  public static final int EXPRENT_COUNTER = 1;
+  public static final int EXPRESSION_COUNTER = 1;
   public static final int VAR_COUNTER = 2;
 
   private final int[] values = new int[]{1, 1, 1};
@@ -20,4 +19,4 @@ public class CounterContainer {
   public int getCounterAndIncrement(int counter) {
     return values[counter]++;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
index 2ac560f..fb33f49 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
@@ -7,18 +7,17 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IResultSaver;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Map;
 
+@SuppressWarnings("unused")
 public class BaseDecompiler {
-
   private final Fernflower fernflower;
 
   public BaseDecompiler(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
     fernflower = new Fernflower(provider, saver, options, logger);
   }
 
-  public void addSpace(File file, boolean isOwn) throws IOException {
+  public void addSpace(File file, boolean isOwn) {
     fernflower.getStructContext().addSpace(file, isOwn);
   }
 
@@ -30,4 +29,4 @@ public class BaseDecompiler {
       fernflower.clearContext();
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index d6db351..8cdffd4 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -17,7 +17,6 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
 public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
   public static void main(String[] args) {
     if (args.length < 2) {
@@ -102,11 +101,6 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   private final Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<>();
   private final Map<String, Set<String>> mapArchiveEntries = new HashMap<>();
 
-  @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  public ConsoleDecompiler(File destination, Map<String, Object> options) {
-    this(destination, options, new PrintStreamLogger(System.out));
-  }
-
   protected ConsoleDecompiler(File destination, Map<String, Object> options, IFernflowerLogger logger) {
     root = destination;
     fernflower = new Fernflower(this, this, options, logger);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 82ffedd..3b8bc33 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Set;
 
 public class ClassWrapper {
-
   private final StructClass classStruct;
   private final Set<String> hiddenMembers = new HashSet<>();
   private final VBStyleCollection<Exprent, String> staticFieldInitializers = new VBStyleCollection<>();
@@ -47,15 +46,12 @@ public class ClassWrapper {
     for (StructMethod mt : classStruct.getMethods()) {
       DecompilerContext.getLogger().startMethod(mt.getName() + " " + mt.getDescriptor());
 
-      VarNamesCollector vc = new VarNamesCollector();
-      DecompilerContext.setVarNamesCollector(vc);
-
-      CounterContainer counter = new CounterContainer();
-      DecompilerContext.setCounterContainer(counter);
-
       MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
       VarProcessor varProc = new VarProcessor(mt, md);
-      DecompilerContext.setProperty(DecompilerContext.CURRENT_VAR_PROCESSOR, varProc);
+      DecompilerContext.startMethod(varProc);
+
+      VarNamesCollector vc = varProc.getVarNamesCollector();
+      CounterContainer counter = DecompilerContext.getCounterContainer();
 
       RootStatement root = null;
 
@@ -67,7 +63,7 @@ public class ClassWrapper {
             root = MethodProcessorRunnable.codeToJava(mt, md, varProc);
           }
           else {
-            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, md, varProc, DecompilerContext.getCurrentContext());
+            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, md, varProc);
 
             Thread mtThread = new Thread(mtProc, "Java decompiler");
             long stopAt = System.currentTimeMillis() + maxSec * 1000;
@@ -128,9 +124,8 @@ public class ClassWrapper {
         }
       }
       catch (Throwable ex) {
-        DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.",
-                                                   IFernflowerLogger.Severity.WARN,
-                                                   ex);
+        String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, ex);
         isError = true;
       }
 
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 4ab1596..9f047d4 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -25,23 +25,19 @@ public class MethodProcessorRunnable implements Runnable {
   private final StructMethod method;
   private final MethodDescriptor methodDescriptor;
   private final VarProcessor varProc;
-  private final DecompilerContext parentContext;
 
   private volatile RootStatement root;
   private volatile Throwable error;
   private volatile boolean finished = false;
 
-  public MethodProcessorRunnable(StructMethod method, MethodDescriptor methodDescriptor, VarProcessor varProc, DecompilerContext parentContext) {
+  public MethodProcessorRunnable(StructMethod method, MethodDescriptor methodDescriptor, VarProcessor varProc) {
     this.method = method;
     this.methodDescriptor = methodDescriptor;
     this.varProc = varProc;
-    this.parentContext = parentContext;
   }
 
   @Override
   public void run() {
-    DecompilerContext.setCurrentContext(parentContext);
-
     error = null;
     root = null;
 
@@ -54,9 +50,6 @@ public class MethodProcessorRunnable implements Runnable {
     catch (Throwable ex) {
       error = ex;
     }
-    finally {
-      DecompilerContext.setCurrentContext(null);
-    }
 
     finished = true;
     synchronized (lock) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index 0f8bbb4..8a2b94e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -45,7 +45,7 @@ public class Exprent implements IMatchable {
 
   public Exprent(int type) {
     this.type = type;
-    this.id = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.EXPRENT_COUNTER);
+    this.id = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.EXPRESSION_COUNTER);
   }
 
   public int getPrecedence() {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index ff10e0d..4089fd7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -10,7 +10,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
 import java.util.ArrayList;
@@ -56,7 +55,7 @@ public class CatchAllStatement extends Statement {
 
     vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                             new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
-                            (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                            DecompilerContext.getVarProcessor()));
   }
 
 
@@ -165,14 +164,14 @@ public class CatchAllStatement extends Statement {
     if (this.monitor != null) {
       cas.monitor = new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                    VarType.VARTYPE_INT,
-                                   (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR));
+                                   DecompilerContext.getVarProcessor());
     }
 
     if (!this.vars.isEmpty()) {
       // FIXME: WTF??? vars?!
       vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                               new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
-                              (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                              DecompilerContext.getVarProcessor()));
     }
 
     return cas;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index c2587c4..74d5a43 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -11,7 +11,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
 import java.util.ArrayList;
@@ -49,7 +48,7 @@ public class CatchStatement extends Statement {
         vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                 new VarType(CodeConstants.TYPE_OBJECT, 0, edge.getExceptions().get(0)),
                                 // FIXME: for now simply the first type. Should get the first common superclass when possible.
-                                (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                                DecompilerContext.getVarProcessor()));
       }
     }
 
@@ -193,7 +192,7 @@ public class CatchStatement extends Statement {
       cs.exctstrings.add(new ArrayList<>(exc));
       cs.vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                  new VarType(CodeConstants.TYPE_OBJECT, 0, exc.get(0)),
-                                 (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                                 DecompilerContext.getVarProcessor()));
     }
 
     return cs;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
index 8dd708d..e8331c4 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -37,7 +37,7 @@ public class VarDefinitionHelper {
 
     this.varproc = varproc;
 
-    VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+    VarNamesCollector vc = varproc.getVarNamesCollector();
 
     boolean thisvar = !mt.hasModifier(CodeConstants.ACC_STATIC);
 
@@ -108,8 +108,7 @@ public class VarDefinitionHelper {
 
 
   public void setVarDefinitions() {
-
-    VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+    VarNamesCollector vc = varproc.getVarNamesCollector();
 
     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
       Statement stat = en.getValue();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index aa73cf1..4dcc5be 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -13,6 +13,7 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class VarProcessor {
+  private final VarNamesCollector varNamesCollector = new VarNamesCollector();
   private final StructMethod method;
   private final MethodDescriptor methodDescriptor;
   private Map<VarVersionPair, String> mapVarNames = new HashMap<>();
@@ -85,6 +86,10 @@ public class VarProcessor {
     }
   }
 
+  public VarNamesCollector getVarNamesCollector() {
+    return varNamesCollector;
+  }
+
   public VarType getVarType(VarVersionPair pair) {
     return varVersions == null ? null : varVersions.getVarType(pair);
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
index ca0fff5..33b166d 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
@@ -2,8 +2,6 @@
 package org.jetbrains.java.decompiler.modules.renamer;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
-import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
@@ -18,41 +16,25 @@ import java.io.IOException;
 import java.util.*;
 
 public class IdentifierConverter implements NewClassNameBuilder {
-
-  private StructContext context;
-  private IIdentifierRenamer helper;
-  private PoolInterceptor interceptor;
+  private final StructContext context;
+  private final IIdentifierRenamer helper;
+  private final PoolInterceptor interceptor;
   private List<ClassWrapperNode> rootClasses = new ArrayList<>();
   private List<ClassWrapperNode> rootInterfaces = new ArrayList<>();
   private Map<String, Map<String, String>> interfaceNameMaps = new HashMap<>();
 
-  public void rename(StructContext context) {
+  public IdentifierConverter(StructContext context, IIdentifierRenamer helper, PoolInterceptor interceptor) {
+    this.context = context;
+    this.helper = helper;
+    this.interceptor = interceptor;
+  }
+
+  public void rename() {
     try {
-      this.context = context;
-
-      String user_class = (String)DecompilerContext.getProperty(IFernflowerPreferences.USER_RENAMER_CLASS);
-      if (user_class != null) {
-        try {
-          helper = (IIdentifierRenamer)IdentifierConverter.class.getClassLoader().loadClass(user_class).newInstance();
-        }
-        catch (Exception ignored) { }
-      }
-
-      if (helper == null) {
-        helper = new ConverterHelper();
-      }
-
-      interceptor = new PoolInterceptor(helper);
-
       buildInheritanceTree();
-
       renameAllClasses();
-
       renameInterfaces();
-
       renameClasses();
-
-      DecompilerContext.setPoolInterceptor(interceptor);
       context.reloadContext();
     }
     catch (IOException ex) {
@@ -381,4 +363,4 @@ public class IdentifierConverter implements NewClassNameBuilder {
     this.rootClasses = rootClasses;
     this.rootInterfaces = rootInterfaces;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
index 277a3ca..63cb222 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
@@ -1,21 +1,12 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
-import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
-
 import java.util.HashMap;
+import java.util.Map;
 
 public class PoolInterceptor {
-
-  private final IIdentifierRenamer helper;
-
-  private final HashMap<String, String> mapOldToNewNames = new HashMap<>();
-
-  private final HashMap<String, String> mapNewToOldNames = new HashMap<>();
-
-  public PoolInterceptor(IIdentifierRenamer helper) {
-    this.helper = helper;
-  }
+  private final Map<String, String> mapOldToNewNames = new HashMap<>();
+  private final Map<String, String> mapNewToOldNames = new HashMap<>();
 
   public void addName(String oldName, String newName) {
     mapOldToNewNames.put(oldName, newName);
@@ -29,8 +20,4 @@ public class PoolInterceptor {
   public String getOldName(String newName) {
     return mapNewToOldNames.get(newName);
   }
-
-  public IIdentifierRenamer getHelper() {
-    return helper;
-  }
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index 5b7cc41..677bb2d 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -2,12 +2,15 @@
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
+import org.jetbrains.java.decompiler.main.decompiler.PrintStreamLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -115,7 +118,7 @@ public class DecompilerTestFixture {
     private final HashMap<String, ZipFile> zipFiles = new HashMap<>();
 
     public TestConsoleDecompiler(File destination, Map<String, Object> options) {
-      super(destination, options);
+      super(destination, options, new PrintStreamLogger(System.out));
     }
 
     @Override

From 29de7ad72eeb3a7e811872037a921ee0e4a6686d Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 1 Dec 2017 18:23:42 +0100
Subject: [PATCH 159/252] [java decompiler] cleanup (dead code; optimizations;
 warnings)

---
 .../java/decompiler/code/CodeConstants.java   |  31 +-
 .../java/decompiler/code/ConstantsUtil.java   | 468 -----------------
 .../decompiler/code/ExceptionHandler.java     |  26 +-
 .../java/decompiler/code/ExceptionTable.java  |  32 +-
 .../java/decompiler/code/IfInstruction.java   |  22 -
 .../java/decompiler/code/Instruction.java     | 141 ++----
 .../decompiler/code/InstructionSequence.java  |  87 +---
 .../java/decompiler/code/JumpInstruction.java |  24 +-
 .../decompiler/code/SwitchInstruction.java    |  66 +--
 .../java/decompiler/code/cfg/BasicBlock.java  |  85 +---
 .../decompiler/code/cfg/ControlFlowGraph.java |  73 +--
 .../code/cfg/ExceptionRangeCFG.java           |  48 +-
 .../code/interpreter/InstructionImpact.java   |  31 +-
 .../decompiler/code/interpreter/Util.java     | 272 ----------
 .../code/optinstructions/ALOAD.java           |  46 --
 .../code/optinstructions/ANEWARRAY.java       |  19 -
 .../code/optinstructions/ASTORE.java          |  46 --
 .../code/optinstructions/BIPUSH.java          |  34 --
 .../code/optinstructions/CHECKCAST.java       |  20 -
 .../code/optinstructions/DLOAD.java           |  46 --
 .../code/optinstructions/DSTORE.java          |  46 --
 .../code/optinstructions/FLOAD.java           |  46 --
 .../code/optinstructions/FSTORE.java          |  46 --
 .../code/optinstructions/GETFIELD.java        |  19 -
 .../code/optinstructions/GETSTATIC.java       |  19 -
 .../decompiler/code/optinstructions/GOTO.java |  32 --
 .../code/optinstructions/GOTO_W.java          |  19 -
 .../decompiler/code/optinstructions/IINC.java |  29 --
 .../code/optinstructions/ILOAD.java           |  41 --
 .../code/optinstructions/INSTANCEOF.java      |  19 -
 .../code/optinstructions/INVOKEDYNAMIC.java   |  21 -
 .../code/optinstructions/INVOKEINTERFACE.java |  21 -
 .../code/optinstructions/INVOKESPECIAL.java   |  19 -
 .../code/optinstructions/INVOKESTATIC.java    |  19 -
 .../code/optinstructions/INVOKEVIRTUAL.java   |  19 -
 .../code/optinstructions/ISTORE.java          |  41 --
 .../decompiler/code/optinstructions/JSR.java  |  32 --
 .../code/optinstructions/JSR_W.java           |  19 -
 .../decompiler/code/optinstructions/LDC.java  |  19 -
 .../code/optinstructions/LDC2_W.java          |  19 -
 .../code/optinstructions/LDC_W.java           |  19 -
 .../code/optinstructions/LLOAD.java           |  41 --
 .../code/optinstructions/LOOKUPSWITCH.java    |  28 --
 .../code/optinstructions/LSTORE.java          |  41 --
 .../code/optinstructions/MULTIANEWARRAY.java  |  20 -
 .../decompiler/code/optinstructions/NEW.java  |  19 -
 .../code/optinstructions/NEWARRAY.java        |  19 -
 .../code/optinstructions/PUTFIELD.java        |  19 -
 .../code/optinstructions/PUTSTATIC.java       |  19 -
 .../decompiler/code/optinstructions/RET.java  |  27 -
 .../code/optinstructions/SIPUSH.java          |  19 -
 .../code/optinstructions/TABLESWITCH.java     |  28 --
 .../java/decompiler/main/AssertProcessor.java |  12 +-
 .../main/ClassReference14Processor.java       |  14 +-
 .../decompiler/main/ClassesProcessor.java     |  16 +-
 .../java/decompiler/main/TextBuffer.java      |  34 +-
 .../main/collectors/BytecodeSourceMapper.java |  22 +-
 .../main/collectors/ImportCollector.java      |  10 +-
 .../main/decompiler/ConsoleDecompiler.java    |   5 +-
 .../decompiler/main/rels/ClassWrapper.java    |   3 +-
 .../decompiler/main/rels/LambdaProcessor.java |  16 +-
 .../main/rels/NestedClassProcessor.java       | 156 +++---
 .../main/rels/NestedMemberAccess.java         |   4 +-
 .../decompiler/ConcatenationHelper.java       |   6 +-
 .../modules/decompiler/DecHelper.java         |  16 +-
 .../modules/decompiler/DomHelper.java         |  24 +-
 .../decompiler/EliminateLoopsHelper.java      | 197 --------
 .../modules/decompiler/ExitHelper.java        |   7 +-
 .../modules/decompiler/ExprProcessor.java     |  65 ++-
 .../modules/decompiler/ExprentStack.java      |   4 +-
 .../modules/decompiler/FinallyProcessor.java  | 150 +-----
 .../modules/decompiler/IdeaNotNullHelper.java |  16 +-
 .../modules/decompiler/IfHelper.java          |  48 +-
 .../decompiler/InlineSingleBlockHelper.java   |  14 +-
 .../modules/decompiler/LabelHelper.java       |  36 +-
 .../modules/decompiler/LoopExtractHelper.java |   9 +-
 .../modules/decompiler/LowBreakHelper.java    | 194 -------
 .../modules/decompiler/MergeHelper.java       |  41 +-
 .../decompiler/SecondaryFunctionsHelper.java  |  18 +-
 .../decompiler/SimplifyExprentsHelper.java    | 175 +------
 .../decompiler/StackVarsProcessor.java        |   4 +-
 .../modules/decompiler/StatEdge.java          |   3 -
 .../decompiler/StrongConnectivityHelper.java  | 136 ++---
 .../modules/decompiler/SwitchHelper.java      |  18 +-
 .../DominatorTreeExceptionFilter.java         |  21 +-
 .../FastExtendedPostdominanceHelper.java      | 129 ++---
 .../decompose/GenericDominatorEngine.java     |   4 -
 .../deobfuscator/ExceptionDeobfuscator.java   |  12 +-
 .../decompiler/exps/AssignmentExprent.java    |   4 -
 .../modules/decompiler/exps/ConstExprent.java |  26 +-
 .../modules/decompiler/exps/ExitExprent.java  |  15 +-
 .../modules/decompiler/exps/Exprent.java      |   5 +-
 .../modules/decompiler/exps/FieldExprent.java |  19 +-
 .../decompiler/exps/FunctionExprent.java      |  18 +-
 .../modules/decompiler/exps/IfExprent.java    |   9 +-
 .../modules/decompiler/exps/VarExprent.java   |  28 +-
 .../sforms/FlattenStatementsHelper.java       |  22 +-
 .../sforms/SSAConstructorSparseEx.java        |  13 +-
 .../sforms/SSAUConstructorSparseEx.java       |  20 +-
 .../decompiler/stats/CatchAllStatement.java   |  20 +-
 .../decompiler/stats/CatchStatement.java      |  15 +-
 .../modules/decompiler/stats/IfStatement.java |  41 +-
 .../decompiler/stats/RootStatement.java       |  11 +-
 .../modules/decompiler/stats/Statement.java   | 109 ++--
 .../modules/decompiler/stats/Statements.java  |   8 +-
 .../stats/SynchronizedStatement.java          |  10 +-
 .../decompiler/vars/CheckTypesResult.java     |  12 +-
 .../decompiler/vars/VarDefinitionHelper.java  |   8 +-
 .../modules/decompiler/vars/VarProcessor.java |   2 +-
 .../decompiler/vars/VarTypeProcessor.java     |  34 +-
 .../decompiler/vars/VarVersionNode.java       |   6 +-
 .../decompiler/vars/VarVersionPair.java       |   4 +-
 .../decompiler/vars/VarVersionsGraph.java     |  19 +-
 .../decompiler/vars/VarVersionsProcessor.java |  84 ++--
 .../modules/renamer/ClassWrapperNode.java     |  15 +-
 .../java/decompiler/struct/StructContext.java |   4 +-
 .../java/decompiler/struct/StructMethod.java  |  17 +-
 .../attr/StructBootstrapMethodsAttribute.java |   1 -
 .../attr/StructEnclosingMethodAttribute.java  |   1 -
 .../attr/StructExceptionsAttribute.java       |   2 +-
 .../struct/attr/StructGeneralAttribute.java   |   4 -
 .../attr/StructInnerClassesAttribute.java     |   8 +-
 .../attr/StructLineNumberTableAttribute.java  |   6 +-
 ...StructLocalVariableTypeTableAttribute.java |   1 -
 .../attr/StructSourceFileAttribute.java       |  22 -
 .../struct/consts/ConstantPool.java           |  10 +-
 .../struct/consts/LinkConstant.java           | 110 +---
 .../struct/consts/PooledConstant.java         |  99 +---
 .../struct/consts/PrimitiveConstant.java      |  82 +--
 .../struct/consts/VariableTypeEnum.java       |  33 --
 .../struct/gen/generics/GenericMain.java      |  10 +-
 .../decompiler/struct/lazy/LazyLoader.java    |   9 +-
 .../decompiler/struct/match/MatchEngine.java  |  31 +-
 .../decompiler/util/FastFixedSetFactory.java  |  35 +-
 .../java/decompiler/util/FastSetFactory.java  | 475 ------------------
 .../decompiler/util/FastSparseSetFactory.java | 103 ----
 .../java/decompiler/util/ListStack.java       |  22 +-
 .../decompiler/util/SFormsFastMapDirect.java  |   6 +-
 .../java/decompiler/util/TextUtil.java        |   8 +-
 .../decompiler/util/VBStyleCollection.java    |  39 +-
 140 files changed, 761 insertions(+), 5054 deletions(-)
 delete mode 100644 src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/IfInstruction.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/interpreter/Util.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
 delete mode 100644 src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
 delete mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
 delete mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
 delete mode 100644 src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
 delete mode 100644 src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
 delete mode 100644 src/org/jetbrains/java/decompiler/util/FastSetFactory.java

diff --git a/src/org/jetbrains/java/decompiler/code/CodeConstants.java b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
index b9c0bd5..4ff5daa 100644
--- a/src/org/jetbrains/java/decompiler/code/CodeConstants.java
+++ b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
+@SuppressWarnings({"unused", "SpellCheckingInspection"})
 public interface CodeConstants {
-
   // ----------------------------------------------------------------------
   // BYTECODE VERSIONS
   // ----------------------------------------------------------------------
@@ -50,20 +50,6 @@ public interface CodeConstants {
   int TYPE_FAMILY_DOUBLE = 5;
   int TYPE_FAMILY_OBJECT = 6;
 
-  // ----------------------------------------------------------------------
-  // MODULE CONSTANTS
-  // ----------------------------------------------------------------------
-
-  int STACKSIZE_SIMPLE = 1;
-  int STACKSIZE_DOUBLE = 2;
-
-  int VAR_LOCAL = 0;
-  int VAR_STACK = 1;
-
-  int VAR_WRITE = 0;
-  int VAR_READ = 1;
-
-
   // ----------------------------------------------------------------------
   // ACCESS FLAGS
   // ----------------------------------------------------------------------
@@ -92,17 +78,6 @@ public interface CodeConstants {
   int ACC_SUPER = 0x0020;
   int ACC_INTERFACE = 0x0200;
 
-
-  // ----------------------------------------------------------------------
-  // DEPENDENCY CONSTANTS
-  // ----------------------------------------------------------------------
-
-  int DEP_CONSTANT = 0;
-  int DEP_UNKNOWN = 1;
-  int DEP_GENERAL = 2;
-  int DEP_PARAMS = 4;
-  int DEP_STATIC = 8;
-
   // ----------------------------------------------------------------------
   // INSTRUCTION GROUPS
   // ----------------------------------------------------------------------
@@ -338,7 +313,6 @@ public interface CodeConstants {
   int opc_invokestatic = 184;
   int opc_invokeinterface = 185;
   int opc_invokedynamic = 186;
-  int opc_xxxunusedxxx = 186;
   int opc_new = 187;
   int opc_newarray = 188;
   int opc_anewarray = 189;
@@ -355,7 +329,6 @@ public interface CodeConstants {
   int opc_goto_w = 200;
   int opc_jsr_w = 201;
 
-  @SuppressWarnings("SpellCheckingInspection")
   String CLINIT_NAME = "<clinit>";
   String INIT_NAME = "<init>";
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java b/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
deleted file mode 100644
index d8ec68d..0000000
--- a/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
+++ /dev/null
@@ -1,468 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code;
-
-import org.jetbrains.java.decompiler.code.optinstructions.*;
-
-public class ConstantsUtil {
-
-  public static String getName(int opcode) {
-    return opcodeNames[opcode];
-  }
-
-  public static Instruction getInstructionInstance(int opcode, boolean wide, int group, int bytecode_version, int[] operands) {
-
-    Instruction instr = getInstructionInstance(opcode, bytecode_version);
-    instr.wide = wide;
-    instr.group = group;
-    instr.bytecode_version = bytecode_version;
-    instr.setOperands(operands);
-
-    return instr;
-  }
-
-  private static Instruction getInstructionInstance(int opcode, int bytecode_version) {
-    try {
-      Instruction instr;
-
-      if ((opcode >= CodeConstants.opc_ifeq &&
-           opcode <= CodeConstants.opc_if_acmpne) ||
-          opcode == CodeConstants.opc_ifnull ||
-          opcode == CodeConstants.opc_ifnonnull) {
-        instr = new IfInstruction();
-      }
-      else {
-
-        Class cl = opcodeClasses[opcode];
-
-        if (opcode == CodeConstants.opc_invokedynamic && bytecode_version < CodeConstants.BYTECODE_JAVA_7) {
-          cl = null; // instruction unused in Java 6 and before
-        }
-
-        if (cl == null) {
-          instr = new Instruction();
-        }
-        else {
-          instr = (Instruction)cl.newInstance();
-        }
-      }
-
-      instr.opcode = opcode;
-      return instr;
-    }
-    catch (Exception ex) {
-      return null;
-    }
-  }
-
-
-  private static final String[] opcodeNames = {
-    "nop",                                //    "nop",
-    "aconst_null",                //    "aconst_null",
-    "iconst_m1",                        //    "iconst_m1",
-    "iconst_0",                        //    "iconst_0",
-    "iconst_1",                        //    "iconst_1",
-    "iconst_2",                        //    "iconst_2",
-    "iconst_3",                        //    "iconst_3",
-    "iconst_4",                        //    "iconst_4",
-    "iconst_5",                        //    "iconst_5",
-    "lconst_0",                        //    "lconst_0",
-    "lconst_1",                        //    "lconst_1",
-    "fconst_0",                        //    "fconst_0",
-    "fconst_1",                        //    "fconst_1",
-    "fconst_2",                        //    "fconst_2",
-    "dconst_0",                        //    "dconst_0",
-    "dconst_1",                        //    "dconst_1",
-    "bipush",                        //    "bipush",
-    "sipush",                        //    "sipush",
-    "ldc",                        //    "ldc",
-    "ldc_w",                        //    "ldc_w",
-    "ldc2_w",                        //    "ldc2_w",
-    "iload",                        //    "iload",
-    "lload",                        //    "lload",
-    "fload",                        //    "fload",
-    "dload",                        //    "dload",
-    "aload",                        //    "aload",
-    "iload_0",                        //    "iload_0",
-    "iload_1",                        //    "iload_1",
-    "iload_2",                        //    "iload_2",
-    "iload_3",                        //    "iload_3",
-    "lload_0",                        //    "lload_0",
-    "lload_1",                        //    "lload_1",
-    "lload_2",                        //    "lload_2",
-    "lload_3",                        //    "lload_3",
-    "fload_0",                        //    "fload_0",
-    "fload_1",                        //    "fload_1",
-    "fload_2",                        //    "fload_2",
-    "fload_3",                        //    "fload_3",
-    "dload_0",                        //    "dload_0",
-    "dload_1",                        //    "dload_1",
-    "dload_2",                        //    "dload_2",
-    "dload_3",                        //    "dload_3",
-    "aload_0",                        //    "aload_0",
-    "aload_1",                        //    "aload_1",
-    "aload_2",                        //    "aload_2",
-    "aload_3",                        //    "aload_3",
-    "iaload",                        //    "iaload",
-    "laload",                        //    "laload",
-    "faload",                        //    "faload",
-    "daload",                        //    "daload",
-    "aaload",                        //    "aaload",
-    "baload",                        //    "baload",
-    "caload",                        //    "caload",
-    "saload",                        //    "saload",
-    "istore",                        //    "istore",
-    "lstore",                        //    "lstore",
-    "fstore",                        //    "fstore",
-    "dstore",                        //    "dstore",
-    "astore",                        //    "astore",
-    "istore_0",                        //    "istore_0",
-    "istore_1",                        //    "istore_1",
-    "istore_2",                        //    "istore_2",
-    "istore_3",                        //    "istore_3",
-    "lstore_0",                        //    "lstore_0",
-    "lstore_1",                        //    "lstore_1",
-    "lstore_2",                        //    "lstore_2",
-    "lstore_3",                        //    "lstore_3",
-    "fstore_0",                        //    "fstore_0",
-    "fstore_1",                        //    "fstore_1",
-    "fstore_2",                        //    "fstore_2",
-    "fstore_3",                        //    "fstore_3",
-    "dstore_0",                        //    "dstore_0",
-    "dstore_1",                        //    "dstore_1",
-    "dstore_2",                        //    "dstore_2",
-    "dstore_3",                        //    "dstore_3",
-    "astore_0",                        //    "astore_0",
-    "astore_1",                        //    "astore_1",
-    "astore_2",                        //    "astore_2",
-    "astore_3",                        //    "astore_3",
-    "iastore",                        //    "iastore",
-    "lastore",                        //    "lastore",
-    "fastore",                        //    "fastore",
-    "dastore",                        //    "dastore",
-    "aastore",                        //    "aastore",
-    "bastore",                        //    "bastore",
-    "castore",                        //    "castore",
-    "sastore",                        //    "sastore",
-    "pop",                        //    "pop",
-    "pop2",                        //    "pop2",
-    "dup",                        //    "dup",
-    "dup_x1",                        //    "dup_x1",
-    "dup_x2",                        //    "dup_x2",
-    "dup2",                        //    "dup2",
-    "dup2_x1",                        //    "dup2_x1",
-    "dup2_x2",                        //    "dup2_x2",
-    "swap",                        //    "swap",
-    "iadd",                        //    "iadd",
-    "ladd",                        //    "ladd",
-    "fadd",                        //    "fadd",
-    "dadd",                        //    "dadd",
-    "isub",                        //    "isub",
-    "lsub",                        //    "lsub",
-    "fsub",                        //    "fsub",
-    "dsub",                        //    "dsub",
-    "imul",                        //    "imul",
-    "lmul",                        //    "lmul",
-    "fmul",                        //    "fmul",
-    "dmul",                        //    "dmul",
-    "idiv",                        //    "idiv",
-    "ldiv",                        //    "ldiv",
-    "fdiv",                        //    "fdiv",
-    "ddiv",                        //    "ddiv",
-    "irem",                        //    "irem",
-    "lrem",                        //    "lrem",
-    "frem",                        //    "frem",
-    "drem",                        //    "drem",
-    "ineg",                        //    "ineg",
-    "lneg",                        //    "lneg",
-    "fneg",                        //    "fneg",
-    "dneg",                        //    "dneg",
-    "ishl",                        //    "ishl",
-    "lshl",                        //    "lshl",
-    "ishr",                        //    "ishr",
-    "lshr",                        //    "lshr",
-    "iushr",                        //    "iushr",
-    "lushr",                        //    "lushr",
-    "iand",                        //    "iand",
-    "land",                        //    "land",
-    "ior",                        //    "ior",
-    "lor",                        //    "lor",
-    "ixor",                        //    "ixor",
-    "lxor",                        //    "lxor",
-    "iinc",                        //    "iinc",
-    "i2l",                        //    "i2l",
-    "i2f",                        //    "i2f",
-    "i2d",                        //    "i2d",
-    "l2i",                        //    "l2i",
-    "l2f",                        //    "l2f",
-    "l2d",                        //    "l2d",
-    "f2i",                        //    "f2i",
-    "f2l",                        //    "f2l",
-    "f2d",                        //    "f2d",
-    "d2i",                        //    "d2i",
-    "d2l",                        //    "d2l",
-    "d2f",                        //    "d2f",
-    "i2b",                        //    "i2b",
-    "i2c",                        //    "i2c",
-    "i2s",                        //    "i2s",
-    "lcmp",                        //    "lcmp",
-    "fcmpl",                        //    "fcmpl",
-    "fcmpg",                        //    "fcmpg",
-    "dcmpl",                        //    "dcmpl",
-    "dcmpg",                        //    "dcmpg",
-    "ifeq",                        //    "ifeq",
-    "ifne",                        //    "ifne",
-    "iflt",                        //    "iflt",
-    "ifge",                        //    "ifge",
-    "ifgt",                        //    "ifgt",
-    "ifle",                        //    "ifle",
-    "if_icmpeq",                //    "if_icmpeq",
-    "if_icmpne",                //    "if_icmpne",
-    "if_icmplt",                //    "if_icmplt",
-    "if_icmpge",                //    "if_icmpge",
-    "if_icmpgt",                //    "if_icmpgt",
-    "if_icmple",                //    "if_icmple",
-    "if_acmpeq",                //    "if_acmpeq",
-    "if_acmpne",                //    "if_acmpne",
-    "goto",                        //    "goto",
-    "jsr",                        //    "jsr",
-    "ret",                        //    "ret",
-    "tableswitch",                        //    "tableswitch",
-    "lookupswitch",                        //    "lookupswitch",
-    "ireturn",                        //    "ireturn",
-    "lreturn",                        //    "lreturn",
-    "freturn",                        //    "freturn",
-    "dreturn",                        //    "dreturn",
-    "areturn",                        //    "areturn",
-    "return",                        //    "return",
-    "getstatic",                //    "getstatic",
-    "putstatic",                //    "putstatic",
-    "getfield",                //    "getfield",
-    "putfield",                //    "putfield",
-    "invokevirtual",                //    "invokevirtual",
-    "invokespecial",                //    "invokespecial",
-    "invokestatic",                //    "invokestatic",
-    "invokeinterface",                //    "invokeinterface",
-    //"xxxunusedxxx",		//    "xxxunusedxxx", Java 6 and before
-    "invokedynamic",                //    "invokedynamic", Java 7 and later
-    "new",                                //    "new",
-    "newarray",                //    "newarray",
-    "anewarray",                //    "anewarray",
-    "arraylength",                //    "arraylength",
-    "athrow",                        //    "athrow",
-    "checkcast",                //    "checkcast",
-    "instanceof",                //    "instanceof",
-    "monitorenter",                //    "monitorenter",
-    "monitorexit",                //    "monitorexit",
-    "wide",                        //    "wide",
-    "multianewarray",                //    "multianewarray",
-    "ifnull",                        //    "ifnull",
-    "ifnonnull",                //    "ifnonnull",
-    "goto_w",                        //    "goto_w",
-    "jsr_w"                        //    "jsr_w"
-  };
-
-  private static final Class[] opcodeClasses = {
-    null,                                //    "nop",
-    null,                        //    "aconst_null",
-    null,                        //    "iconst_m1",
-    null,                        //    "iconst_0",
-    null,                        //    "iconst_1",
-    null,                        //    "iconst_2",
-    null,                        //    "iconst_3",
-    null,                        //    "iconst_4",
-    null,                        //    "iconst_5",
-    null,                        //    "lconst_0",
-    null,                        //    "lconst_1",
-    null,                                //    "fconst_0",
-    null,                                //    "fconst_1",
-    null,                                //    "fconst_2",
-    null,                                //    "dconst_0",
-    null,                                //    "dconst_1",
-    BIPUSH.class,                        //    "bipush",
-    SIPUSH.class,                        //    "sipush",
-    LDC.class,                        //    "ldc",
-    LDC_W.class,                        //    "ldc_w",
-    LDC2_W.class,                        //    "ldc2_w",
-    ILOAD.class,                        //    "iload",
-    LLOAD.class,                        //    "lload",
-    FLOAD.class,                        //    "fload",
-    DLOAD.class,                        //    "dload",
-    ALOAD.class,                        //    "aload",
-    null,                        //    "iload_0",
-    null,                        //    "iload_1",
-    null,                        //    "iload_2",
-    null,                        //    "iload_3",
-    null,                        //    "lload_0",
-    null,                        //    "lload_1",
-    null,                        //    "lload_2",
-    null,                        //    "lload_3",
-    null,                        //    "fload_0",
-    null,                        //    "fload_1",
-    null,                        //    "fload_2",
-    null,                        //    "fload_3",
-    null,                        //    "dload_0",
-    null,                        //    "dload_1",
-    null,                        //    "dload_2",
-    null,                        //    "dload_3",
-    null,                        //    "aload_0",
-    null,                        //    "aload_1",
-    null,                        //    "aload_2",
-    null,                        //    "aload_3",
-    null,                        //    "iaload",
-    null,                        //    "laload",
-    null,                                //    "faload",
-    null,                                //    "daload",
-    null,                                //    "aaload",
-    null,                                //    "baload",
-    null,                                //    "caload",
-    null,                                //    "saload",
-    ISTORE.class,                        //    "istore",
-    LSTORE.class,                        //    "lstore",
-    FSTORE.class,                        //    "fstore",
-    DSTORE.class,                        //    "dstore",
-    ASTORE.class,                        //    "astore",
-    null,                        //    "istore_0",
-    null,                        //    "istore_1",
-    null,                        //    "istore_2",
-    null,                        //    "istore_3",
-    null,                        //    "lstore_0",
-    null,                        //    "lstore_1",
-    null,                        //    "lstore_2",
-    null,                        //    "lstore_3",
-    null,                        //    "fstore_0",
-    null,                        //    "fstore_1",
-    null,                        //    "fstore_2",
-    null,                        //    "fstore_3",
-    null,                        //    "dstore_0",
-    null,                        //    "dstore_1",
-    null,                        //    "dstore_2",
-    null,                        //    "dstore_3",
-    null,                        //    "astore_0",
-    null,                        //    "astore_1",
-    null,                        //    "astore_2",
-    null,                        //    "astore_3",
-    null,                        //    "iastore",
-    null,                        //    "lastore",
-    null,                                //    "fastore",
-    null,                                //    "dastore",
-    null,                                //    "aastore",
-    null,                                //    "bastore",
-    null,                                //    "castore",
-    null,                        //    "sastore",
-    null,                        //    "pop",
-    null,                        //    "pop2",
-    null,                        //    "dup",
-    null,                        //    "dup_x1",
-    null,                        //    "dup_x2",
-    null,                        //    "dup2",
-    null,                        //    "dup2_x1",
-    null,                        //    "dup2_x2",
-    null,                        //    "swap",
-    null,                        //    "iadd",
-    null,                        //    "ladd",
-    null,                        //    "fadd",
-    null,                        //    "dadd",
-    null,                        //    "isub",
-    null,                        //    "lsub",
-    null,                        //    "fsub",
-    null,                        //    "dsub",
-    null,                        //    "imul",
-    null,                        //    "lmul",
-    null,                        //    "fmul",
-    null,                        //    "dmul",
-    null,                        //    "idiv",
-    null,                        //    "ldiv",
-    null,                        //    "fdiv",
-    null,                        //    "ddiv",
-    null,                        //    "irem",
-    null,                        //    "lrem",
-    null,                        //    "frem",
-    null,                        //    "drem",
-    null,                        //    "ineg",
-    null,                        //    "lneg",
-    null,                        //    "fneg",
-    null,                        //    "dneg",
-    null,                        //    "ishl",
-    null,                        //    "lshl",
-    null,                        //    "ishr",
-    null,                        //    "lshr",
-    null,                        //    "iushr",
-    null,                        //    "lushr",
-    null,                        //    "iand",
-    null,                        //    "land",
-    null,                        //    "ior",
-    null,                        //    "lor",
-    null,                        //    "ixor",
-    null,                        //    "lxor",
-    IINC.class,                        //    "iinc",
-    null,                        //    "i2l",
-    null,                        //    "i2f",
-    null,                        //    "i2d",
-    null,                        //    "l2i",
-    null,                        //    "l2f",
-    null,                        //    "l2d",
-    null,                        //    "f2i",
-    null,                        //    "f2l",
-    null,                        //    "f2d",
-    null,                        //    "d2i",
-    null,                        //    "d2l",
-    null,                        //    "d2f",
-    null,                        //    "i2b",
-    null,                        //    "i2c",
-    null,                        //    "i2s",
-    null,                        //    "lcmp",
-    null,                        //    "fcmpl",
-    null,                        //    "fcmpg",
-    null,                        //    "dcmpl",
-    null,                        //    "dcmpg",
-    null,                        //    "ifeq",
-    null,                        //    "ifne",
-    null,                        //    "iflt",
-    null,                        //    "ifge",
-    null,                        //    "ifgt",
-    null,                        //    "ifle",
-    null,                //    "if_icmpeq",
-    null,                //    "if_icmpne",
-    null,                //    "if_icmplt",
-    null,                //    "if_icmpge",
-    null,                //    "if_icmpgt",
-    null,                //    "if_icmple",
-    null,                //    "if_acmpeq",
-    null,                //    "if_acmpne",
-    GOTO.class,                        //    "goto",
-    JSR.class,                        //    "jsr",
-    RET.class,                        //    "ret",
-    TABLESWITCH.class,                        //    "tableswitch",
-    LOOKUPSWITCH.class,                        //    "lookupswitch",
-    null,                        //    "ireturn",
-    null,                        //    "lreturn",
-    null,                                //    "freturn",
-    null,                                //    "dreturn",
-    null,                                //    "areturn",
-    null,                                //    "return",
-    GETSTATIC.class,                //    "getstatic",
-    PUTSTATIC.class,                //    "putstatic",
-    GETFIELD.class,                //    "getfield",
-    PUTFIELD.class,                //    "putfield",
-    INVOKEVIRTUAL.class,                //    "invokevirtual",
-    INVOKESPECIAL.class,                //    "invokespecial",
-    INVOKESTATIC.class,                //    "invokestatic",
-    INVOKEINTERFACE.class,                //    "invokeinterface",
-    INVOKEDYNAMIC.class,                //    "xxxunusedxxx" Java 6 and before, "invokedynamic" Java 7 and later
-    NEW.class,                                //    "new",
-    NEWARRAY.class,                //    "newarray",
-    ANEWARRAY.class,                //    "anewarray",
-    null,                                //    "arraylength",
-    null,                                //    "athrow",
-    CHECKCAST.class,                //    "checkcast",
-    INSTANCEOF.class,                //    "instanceof",
-    null,                                //    "monitorenter",
-    null,                                //    "monitorexit",
-    null,                                //    "wide",
-    MULTIANEWARRAY.class,                //    "multianewarray",
-    null,                        //    "ifnull",
-    null,                //    "ifnonnull",
-    GOTO_W.class,                        //    "goto_w",
-    JSR_W.class                                //    "jsr_w"
-  };
-}
diff --git a/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java b/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
index c9d56da..0d20726 100644
--- a/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
+++ b/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
@@ -3,11 +3,7 @@ package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
 public class ExceptionHandler {
-
   public int from = 0;
   public int to = 0;
   public int handler = 0;
@@ -16,32 +12,12 @@ public class ExceptionHandler {
   public int to_instr = 0;
   public int handler_instr = 0;
 
-  public int class_index = 0;
   public String exceptionClass = null;
 
-  public ExceptionHandler() {
-  }
-
-  public ExceptionHandler(int from_raw, int to_raw, int handler_raw, String exceptionClass) {
-    this.from = from_raw;
-    this.to = to_raw;
-    this.handler = handler_raw;
-    this.exceptionClass = exceptionClass;
-  }
-
-  public void writeToStream(DataOutputStream out) throws IOException {
-    out.writeShort(from);
-    out.writeShort(to);
-    out.writeShort(handler);
-    out.writeShort(class_index);
-  }
-
   public String toString() {
-
     String new_line_separator = DecompilerContext.getNewLineSeparator();
-
     return "from: " + from + " to: " + to + " handler: " + handler + new_line_separator +
            "from_instr: " + from_instr + " to_instr: " + to_instr + " handler_instr: " + handler_instr + new_line_separator +
            "exceptionClass: " + exceptionClass + new_line_separator;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/ExceptionTable.java b/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
index 7d17367..7416623 100644
--- a/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
+++ b/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
@@ -1,19 +1,11 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-import org.jetbrains.java.decompiler.code.interpreter.Util;
-import org.jetbrains.java.decompiler.struct.StructContext;
-
 import java.util.Collections;
 import java.util.List;
 
 public class ExceptionTable {
-  public static final ExceptionTable EMPTY = new ExceptionTable(null) {
-    @Override
-    public List<ExceptionHandler> getHandlers() {
-      return Collections.emptyList();
-    }
-  };
+  public static final ExceptionTable EMPTY = new ExceptionTable(Collections.emptyList());
 
   private final List<ExceptionHandler> handlers;
 
@@ -21,27 +13,7 @@ public class ExceptionTable {
     this.handlers = handlers;
   }
 
-
-  public ExceptionHandler getHandlerByClass(StructContext context, int line, String valclass, boolean withany) {
-
-    ExceptionHandler res = null; // no handler found
-
-    for (ExceptionHandler handler : handlers) {
-      if (handler.from <= line && handler.to > line) {
-        String name = handler.exceptionClass;
-
-        if ((withany && name == null) ||   // any -> finally or synchronized handler
-            (name != null && Util.instanceOf(context, valclass, name))) {
-          res = handler;
-          break;
-        }
-      }
-    }
-
-    return res;
-  }
-
   public List<ExceptionHandler> getHandlers() {
     return handlers;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/IfInstruction.java b/src/org/jetbrains/java/decompiler/code/IfInstruction.java
deleted file mode 100644
index 090cf6e..0000000
--- a/src/org/jetbrains/java/decompiler/code/IfInstruction.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/*
- * opc_ifeq, opc_ifne, opc_iflt, opc_ifge, opc_ifgt, opc_ifle, opc_if_icmpeq, opc_if_icmpne, opc_if_icmplt,
- * opc_if_icmpge, opc_if_icmpgt, opc_if_icmple, opc_if_acmpeq, opc_if_acmpne, opc_ifnull, opc_ifnonnull
- */
-
-public class IfInstruction extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opcode);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/Instruction.java b/src/org/jetbrains/java/decompiler/code/Instruction.java
index edd13b3..23d510a 100644
--- a/src/org/jetbrains/java/decompiler/code/Instruction.java
+++ b/src/org/jetbrains/java/decompiler/code/Instruction.java
@@ -1,112 +1,65 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
 public class Instruction implements CodeConstants {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
-  public int opcode;
-
-  public int group = CodeConstants.GROUP_GENERAL;
-
-  public boolean wide = false;
-
-  public int bytecode_version = BYTECODE_JAVA_LE_4;
-
-  // *****************************************************************************
-  // private fields
-  // *****************************************************************************
-
-  private int[] operands = null;
-
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public Instruction() {
+  public static Instruction create(int opcode, boolean wide, int group, int bytecodeVersion, int[] operands) {
+    if (opcode >= opc_ifeq && opcode <= opc_if_acmpne ||
+        opcode == opc_ifnull || opcode == opc_ifnonnull ||
+        opcode == opc_jsr || opcode == opc_jsr_w ||
+        opcode == opc_goto || opcode == opc_goto_w) {
+      return new JumpInstruction(opcode, group, wide, bytecodeVersion, operands);
+    }
+    else if (opcode == opc_tableswitch || opcode == opc_lookupswitch) {
+      return new SwitchInstruction(opcode, group, wide, bytecodeVersion, operands);
+    }
+    else {
+      return new Instruction(opcode, group, wide, bytecodeVersion, operands);
+    }
   }
 
-  public int length() {
-    return 1;
+  public static boolean equals(Instruction i1, Instruction i2) {
+    return i1 != null && i2 != null &&
+           (i1 == i2 ||
+            i1.opcode == i2.opcode &&
+            i1.wide == i2.wide &&
+            i1.operandsCount() == i2.operandsCount());
   }
 
+  public final int opcode;
+  public final int group;
+  public final boolean wide;
+  public final int bytecodeVersion;
+
+  protected final int[] operands;
+
+  public Instruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
+    this.opcode = opcode;
+    this.group = group;
+    this.wide = wide;
+    this.bytecodeVersion = bytecodeVersion;
+    this.operands = operands;
+  }
+
+  public void initInstruction(InstructionSequence seq) { }
+
   public int operandsCount() {
-    return (operands == null) ? 0 : operands.length;
+    return operands == null ? 0 : operands.length;
   }
 
-  public int getOperand(int index) {
+  public int operand(int index) {
     return operands[index];
   }
 
-  public Instruction clone() {
-    return ConstantsUtil.getInstructionInstance(opcode, wide, group, bytecode_version, operands == null ? null : operands.clone());
-  }
-
-  public String toString() {
-
-    String res = wide ? "@wide " : "";
-    res += "@" + ConstantsUtil.getName(opcode);
-
-    int len = operandsCount();
-    for (int i = 0; i < len; i++) {
-      int op = operands[i];
-      if (op < 0) {
-        res += " -" + Integer.toHexString(-op);
-      }
-      else {
-        res += " " + Integer.toHexString(op);
-      }
-    }
-
-    return res;
-  }
-
-  public boolean canFallthrough() {
+  public boolean canFallThrough() {
     return opcode != opc_goto && opcode != opc_goto_w && opcode != opc_ret &&
-           !(opcode >= opc_ireturn && opcode <= opc_return) && opcode != opc_athrow
-           && opcode != opc_jsr && opcode != opc_tableswitch && opcode != opc_lookupswitch;
+           !(opcode >= opc_ireturn && opcode <= opc_return) &&
+           opcode != opc_athrow &&
+           opcode != opc_jsr && opcode != opc_tableswitch && opcode != opc_lookupswitch;
   }
 
-  public boolean equalsInstruction(Instruction instr) {
-    if (opcode != instr.opcode || wide != instr.wide
-        || operandsCount() != instr.operandsCount()) {
-      return false;
-    }
-
-    if (operands != null) {
-      for (int i = 0; i < operands.length; i++) {
-        if (operands[i] != instr.getOperand(i)) {
-          return false;
-        }
-      }
-    }
-
-    return true;
+  @Override
+  @SuppressWarnings("MethodDoesntCallSuperMethod")
+  public Instruction clone() {
+    return create(opcode, wide, group, bytecodeVersion, operands == null ? null : operands.clone());
   }
-
-  // should be overwritten by subclasses
-  public void initInstruction(InstructionSequence seq) {
-  }
-
-  // should be overwritten by subclasses
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opcode);
-  }
-
-  // *****************************************************************************
-  // getter and setter methods
-  // *****************************************************************************
-
-  public int[] getOperands() {
-    return operands;
-  }
-
-  public void setOperands(int[] operands) {
-    this.operands = operands;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
index 5d4751f..41a11df 100644
--- a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
@@ -1,19 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-import org.jetbrains.java.decompiler.code.interpreter.Util;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.util.TextUtil;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-
 public abstract class InstructionSequence {
 
   // *****************************************************************************
@@ -73,10 +64,6 @@ public abstract class InstructionSequence {
     }
   }
 
-  public Instruction getCurrentInstr() {
-    return collinstr.get(pointer);
-  }
-
   public Instruction getInstr(int index) {
   return collinstr.get(index);
   }
@@ -85,16 +72,12 @@ public abstract class InstructionSequence {
   return collinstr.getLast();
   }
 
-  public int getCurrentOffset() {
-    return collinstr.getKey(pointer).intValue();
-  }
-
-public int getOffset(int index) {
-    return collinstr.getKey(index).intValue();
+  public int getOffset(int index) {
+    return collinstr.getKey(index);
   }
 
   public int getPointerByAbsOffset(int offset) {
-    Integer absoffset = new Integer(offset);
+    Integer absoffset = offset;
     if (collinstr.containsKey(absoffset)) {
       return collinstr.getIndexByKey(absoffset);
     }
@@ -104,7 +87,7 @@ public int getOffset(int index) {
   }
 
   public int getPointerByRelOffset(int offset) {
-    Integer absoffset = new Integer(collinstr.getKey(pointer).intValue() + offset);
+    Integer absoffset = collinstr.getKey(pointer) + offset;
     if (collinstr.containsKey(absoffset)) {
       return collinstr.getIndexByKey(absoffset);
     }
@@ -113,13 +96,6 @@ public int getOffset(int index) {
     }
   }
 
-  public void setPointerByAbsOffset(int offset) {
-    Integer absoffset = new Integer(collinstr.getKey(pointer).intValue() + offset);
-    if (collinstr.containsKey(absoffset)) {
-      pointer = collinstr.getIndexByKey(absoffset);
-    }
-  }
-
   public int length() {
     return collinstr.size();
   }
@@ -153,55 +129,6 @@ public int getOffset(int index) {
     return buf.toString();
   }
 
-  public void writeCodeToStream(DataOutputStream out) throws IOException {
-
-    for (int i = 0; i < collinstr.size(); i++) {
-      collinstr.get(i).writeToStream(out, collinstr.getKey(i).intValue());
-    }
-  }
-
-  public void writeExceptionsToStream(DataOutputStream out) throws IOException {
-
-    List<ExceptionHandler> handlers = exceptionTable.getHandlers();
-
-    out.writeShort(handlers.size());
-    for (int i = 0; i < handlers.size(); i++) {
-      handlers.get(i).writeToStream(out);
-    }
-  }
-
-  public void sortHandlers(final StructContext context) {
-
-    Collections.sort(exceptionTable.getHandlers(), (handler0, handler1) -> {
-
-      if (handler0.to == handler1.to) {
-        if (handler0.exceptionClass == null) {
-          return 1;
-        }
-        else {
-          if (handler1.exceptionClass == null) {
-            return -1;
-          }
-          else if (handler0.exceptionClass.equals(handler1.exceptionClass)) {
-            return (handler0.from > handler1.from) ? -1 : 1; // invalid code
-          }
-          else {
-            if (Util.instanceOf(context, handler0.exceptionClass, handler1.exceptionClass)) {
-              return -1;
-            }
-            else {
-              return 1;
-            }
-          }
-        }
-      }
-      else {
-        return (handler0.to > handler1.to) ? 1 : -1;
-      }
-    });
-  }
-
-
   // *****************************************************************************
   // getter and setter methods
   // *****************************************************************************
@@ -217,8 +144,4 @@ public int getOffset(int index) {
   public ExceptionTable getExceptionTable() {
     return exceptionTable;
   }
-
-  public void setExceptionTable(ExceptionTable exceptionTable) {
-    this.exceptionTable = exceptionTable;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
index c27607b..129df62 100644
--- a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
+++ b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
@@ -1,28 +1,22 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-/*
- * opc_ifeq, opc_ifne, opc_iflt, opc_ifge, opc_ifgt, opc_ifle, opc_if_icmpeq, opc_if_icmpne, opc_if_icmplt,
- * opc_if_icmpge, opc_if_icmpgt, opc_if_icmple, opc_if_acmpeq, opc_if_acmpne, opc_ifnull, opc_ifnonnull
- * opc_goto, opc_jsr, opc_goto_w, opc_jsr_w
- */
-
-
 public class JumpInstruction extends Instruction {
-
   public int destination;
 
-  public JumpInstruction() {
+  public JumpInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
+    super(opcode, group, wide, bytecodeVersion, operands);
   }
 
+  @Override
   public void initInstruction(InstructionSequence seq) {
-    destination = seq.getPointerByRelOffset(this.getOperand(0));
+    destination = seq.getPointerByRelOffset(this.operand(0));
   }
 
+  @Override
   public JumpInstruction clone() {
-    JumpInstruction newinstr = (JumpInstruction)super.clone();
-
-    newinstr.destination = destination;
-    return newinstr;
+    JumpInstruction copy = (JumpInstruction)super.clone();
+    copy.destination = destination;
+    return copy;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
index aa54f58..61810d9 100644
--- a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
+++ b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
@@ -1,83 +1,61 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-/*
- *   opc_tableswitch, lookupswitch
- */
-
 public class SwitchInstruction extends Instruction {
-
   private int[] destinations;
-
   private int[] values;
+  private int defaultDestination;
 
-  private int defaultdest;
-
-  public SwitchInstruction() {
+  public SwitchInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
+    super(opcode, group, wide, bytecodeVersion, operands);
   }
 
-
+  @Override
   public void initInstruction(InstructionSequence seq) {
+    defaultDestination = seq.getPointerByRelOffset(operands[0]);
 
-    int pref = (opcode == CodeConstants.opc_tableswitch ? 3 : 2);
-    int len = this.getOperands().length - pref;
-    defaultdest = seq.getPointerByRelOffset(this.getOperand(0));
-
+    int prefix = opcode == CodeConstants.opc_tableswitch ? 3 : 2;
+    int len = operands.length - prefix;
     int low = 0;
-
     if (opcode == CodeConstants.opc_lookupswitch) {
       len /= 2;
     }
     else {
-      low = this.getOperand(1);
+      low = operands[1];
     }
 
     destinations = new int[len];
     values = new int[len];
-
     for (int i = 0, k = 0; i < len; i++, k++) {
       if (opcode == CodeConstants.opc_lookupswitch) {
-        values[i] = this.getOperand(pref + k);
+        values[i] = operands[prefix + k];
         k++;
       }
       else {
         values[i] = low + k;
       }
-      destinations[i] = seq.getPointerByRelOffset(this.getOperand(pref + k));
+      destinations[i] = seq.getPointerByRelOffset(operands[prefix + k]);
     }
   }
 
-  public SwitchInstruction clone() {
-    SwitchInstruction newinstr = (SwitchInstruction)super.clone();
-
-    newinstr.defaultdest = defaultdest;
-    newinstr.destinations = destinations.clone();
-    newinstr.values = values.clone();
-
-    return newinstr;
-  }
-
   public int[] getDestinations() {
     return destinations;
   }
 
-  public void setDestinations(int[] destinations) {
-    this.destinations = destinations;
-  }
-
-  public int getDefaultdest() {
-    return defaultdest;
-  }
-
-  public void setDefaultdest(int defaultdest) {
-    this.defaultdest = defaultdest;
-  }
-
   public int[] getValues() {
     return values;
   }
 
-  public void setValues(int[] values) {
-    this.values = values;
+  public int getDefaultDestination() {
+    return defaultDestination;
   }
-}
+
+  @Override
+  public SwitchInstruction clone() {
+    SwitchInstruction copy = (SwitchInstruction)super.clone();
+    copy.defaultDestination = defaultDestination;
+    copy.destinations = destinations.clone();
+    copy.values = values.clone();
+    return copy;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
index 3f82b8a..66d7ffb 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -16,8 +16,7 @@ public class BasicBlock implements IGraphNode {
   // public fields
   // *****************************************************************************
 
-  public int id = 0;
-
+  public int id;
   public int mark = 0;
 
   // *****************************************************************************
@@ -26,15 +25,11 @@ public class BasicBlock implements IGraphNode {
 
   private InstructionSequence seq = new SimpleInstructionSequence();
 
-  private List<BasicBlock> preds = new ArrayList<>();
-
-  private List<BasicBlock> succs = new ArrayList<>();
-
+  private final List<BasicBlock> preds = new ArrayList<>();
+  private final List<BasicBlock> succs = new ArrayList<>();
   private final List<Integer> instrOldOffsets = new ArrayList<>();
-
-  private List<BasicBlock> predExceptions = new ArrayList<>();
-
-  private List<BasicBlock> succExceptions = new ArrayList<>();
+  private final List<BasicBlock> predExceptions = new ArrayList<>();
+  private final List<BasicBlock> succExceptions = new ArrayList<>();
 
   public BasicBlock(int id) {
     this.id = id;
@@ -44,7 +39,9 @@ public class BasicBlock implements IGraphNode {
   // public methods
   // *****************************************************************************
 
-  public Object clone() {
+  @Override
+  @SuppressWarnings("MethodDoesntCallSuperMethod")
+  public BasicBlock clone() {
     BasicBlock block = new BasicBlock(id);
 
     block.setSeq(seq.clone());
@@ -53,14 +50,6 @@ public class BasicBlock implements IGraphNode {
     return block;
   }
 
-  public void free() {
-    preds.clear();
-    succs.clear();
-    instrOldOffsets.clear();
-    succExceptions.clear();
-    seq = new SimpleInstructionSequence();
-  }
-
   public Instruction getInstruction(int index) {
     return seq.getInstr(index);
   }
@@ -91,7 +80,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removePredecessor(BasicBlock block) {
-    while (preds.remove(block)) ;
+    while (preds.remove(block)) /**/;
   }
 
   public void addSuccessor(BasicBlock block) {
@@ -100,7 +89,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removeSuccessor(BasicBlock block) {
-    while (succs.remove(block)) ;
+    while (succs.remove(block)) /**/;
     block.removePredecessor(this);
   }
 
@@ -128,7 +117,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removePredecessorException(BasicBlock block) {
-    while (predExceptions.remove(block)) ;
+    while (predExceptions.remove(block)) /**/;
   }
 
   public void addSuccessorException(BasicBlock block) {
@@ -139,7 +128,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removeSuccessorException(BasicBlock block) {
-    while (succExceptions.remove(block)) ;
+    while (succExceptions.remove(block)) /**/;
     block.removePredecessorException(this);
   }
 
@@ -154,27 +143,6 @@ public class BasicBlock implements IGraphNode {
     return id + ":" + new_line_separator + seq.toString(indent);
   }
 
-  public String toStringOldIndices() {
-
-    String new_line_separator = DecompilerContext.getNewLineSeparator();
-
-    StringBuilder buf = new StringBuilder();
-
-    for (int i = 0; i < seq.length(); i++) {
-      if (i < instrOldOffsets.size()) {
-        buf.append(instrOldOffsets.get(i));
-      }
-      else {
-        buf.append("-1");
-      }
-      buf.append(": ");
-      buf.append(seq.getInstr(i).toString());
-      buf.append(new_line_separator);
-    }
-
-    return buf.toString();
-  }
-
   public boolean isSuccessor(BasicBlock block) {
     for (BasicBlock succ : succs) {
       if (succ.id == block.id) {
@@ -184,15 +152,6 @@ public class BasicBlock implements IGraphNode {
     return false;
   }
 
-  public boolean isPredecessor(BasicBlock block) {
-    for (int i = 0; i < preds.size(); i++) {
-      if (preds.get(i).id == block.id) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   // *****************************************************************************
   // getter and setter methods
   // *****************************************************************************
@@ -211,10 +170,6 @@ public class BasicBlock implements IGraphNode {
     return preds;
   }
 
-  public void setPreds(List<BasicBlock> preds) {
-    this.preds = preds;
-  }
-
   public InstructionSequence getSeq() {
     return seq;
   }
@@ -227,25 +182,11 @@ public class BasicBlock implements IGraphNode {
     return succs;
   }
 
-  public void setSuccs(List<BasicBlock> succs) {
-    this.succs = succs;
-  }
-
-
   public List<BasicBlock> getSuccExceptions() {
     return succExceptions;
   }
 
-
-  public void setSuccExceptions(List<BasicBlock> succExceptions) {
-    this.succExceptions = succExceptions;
-  }
-
   public List<BasicBlock> getPredExceptions() {
     return predExceptions;
   }
-
-  public void setPredExceptions(List<BasicBlock> predExceptions) {
-    this.predExceptions = predExceptions;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index cf25306..3c6b14d 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -33,7 +33,7 @@ public class ControlFlowGraph implements CodeConstants {
 
   private Map<BasicBlock, BasicBlock> subroutines;
 
-  private Set<BasicBlock> finallyExits = new HashSet<>();
+  private final Set<BasicBlock> finallyExits = new HashSet<>();
 
   // *****************************************************************************
   // constructors
@@ -48,19 +48,6 @@ public class ControlFlowGraph implements CodeConstants {
   // public methods
   // *****************************************************************************
 
-  public void free() {
-
-    for (BasicBlock block : blocks) {
-      block.free();
-    }
-
-    blocks.clear();
-    first = null;
-    last = null;
-    exceptions.clear();
-    finallyExits.clear();
-  }
-
   public void removeMarkers() {
     for (BasicBlock block : blocks) {
       block.mark = 0;
@@ -80,12 +67,11 @@ public class ControlFlowGraph implements CodeConstants {
       buf.append("----- Edges -----").append(new_line_separator);
 
       List<BasicBlock> suc = block.getSuccs();
-      for (int j = 0; j < suc.size(); j++) {
-        buf.append(">>>>>>>>(regular) Block ").append(suc.get(j).id).append(new_line_separator);
+      for (BasicBlock aSuc : suc) {
+        buf.append(">>>>>>>>(regular) Block ").append(aSuc.id).append(new_line_separator);
       }
       suc = block.getSuccExceptions();
-      for (int j = 0; j < suc.size(); j++) {
-        BasicBlock handler = suc.get(j);
+      for (BasicBlock handler : suc) {
         ExceptionRangeCFG range = getExceptionRange(handler, block);
 
         if (range == null) {
@@ -156,13 +142,7 @@ public class ControlFlowGraph implements CodeConstants {
       }
     }
 
-    Iterator<Entry<BasicBlock, BasicBlock>> it = subroutines.entrySet().iterator();
-    while (it.hasNext()) {
-      Entry<BasicBlock, BasicBlock> ent = it.next();
-      if (ent.getKey() == block || ent.getValue() == block) {
-        it.remove();
-      }
-    }
+    subroutines.entrySet().removeIf(ent -> ent.getKey() == block || ent.getValue() == block);
   }
 
   public ExceptionRangeCFG getExceptionRange(BasicBlock handler, BasicBlock block) {
@@ -261,7 +241,7 @@ public class ControlFlowGraph implements CodeConstants {
           for (int j = dests.length - 1; j >= 0; j--) {
             inststates[dests[j]] = 1;
           }
-          inststates[swinstr.getDefaultdest()] = 1;
+          inststates[swinstr.getDefaultDestination()] = 1;
           if (i + 1 < len) {
             inststates[i + 1] = 1;
           }
@@ -322,7 +302,7 @@ public class ControlFlowGraph implements CodeConstants {
       BasicBlock block = lstbb.get(i);
       Instruction instr = block.getLastInstruction();
 
-      boolean fallthrough = instr.canFallthrough();
+      boolean fallthrough = instr.canFallThrough();
       BasicBlock bTemp;
 
       switch (instr.group) {
@@ -336,10 +316,10 @@ public class ControlFlowGraph implements CodeConstants {
           SwitchInstruction sinstr = (SwitchInstruction)instr;
           int[] dests = sinstr.getDestinations();
 
-          bTemp = mapInstrBlocks.get(((SwitchInstruction)instr).getDefaultdest());
+          bTemp = mapInstrBlocks.get(((SwitchInstruction)instr).getDefaultDestination());
           block.addSuccessor(bTemp);
-          for (int j = 0; j < dests.length; j++) {
-            bTemp = mapInstrBlocks.get(dests[j]);
+          for (int dest1 : dests) {
+            bTemp = mapInstrBlocks.get(dest1);
             block.addSuccessor(bTemp);
           }
       }
@@ -617,9 +597,8 @@ public class ControlFlowGraph implements CodeConstants {
             node.replaceSuccessor(child, mapNewNodes.get(childid));
           }
           else if (common_blocks.contains(child)) {
-
             // make a copy of the current block
-            BasicBlock copy = (BasicBlock)child.clone();
+            BasicBlock copy = child.clone();
             copy.id = ++last_id;
             // copy all successors
             if (copy.getLastInstruction().opcode == CodeConstants.opc_ret &&
@@ -816,10 +795,6 @@ public class ControlFlowGraph implements CodeConstants {
     return blocks;
   }
 
-  public void setBlocks(VBStyleCollection<BasicBlock, Integer> blocks) {
-    this.blocks = blocks;
-  }
-
   public BasicBlock getFirst() {
     return first;
   }
@@ -828,39 +803,15 @@ public class ControlFlowGraph implements CodeConstants {
     this.first = first;
   }
 
-  public List<BasicBlock> getEndBlocks() {
-    return last.getPreds();
-  }
-
   public List<ExceptionRangeCFG> getExceptions() {
     return exceptions;
   }
 
-  public void setExceptions(List<ExceptionRangeCFG> exceptions) {
-    this.exceptions = exceptions;
-  }
-
   public BasicBlock getLast() {
     return last;
   }
 
-  public void setLast(BasicBlock last) {
-    this.last = last;
-  }
-
-  public Map<BasicBlock, BasicBlock> getSubroutines() {
-    return subroutines;
-  }
-
-  public void setSubroutines(Map<BasicBlock, BasicBlock> subroutines) {
-    this.subroutines = subroutines;
-  }
-
   public Set<BasicBlock> getFinallyExits() {
     return finallyExits;
   }
-
-  public void setFinallyExits(HashSet<BasicBlock> finallyExits) {
-    this.finallyExits = finallyExits;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
index 922358d..0454176 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
@@ -1,18 +1,13 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
-import org.jetbrains.java.decompiler.main.DecompilerContext;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class ExceptionRangeCFG {
-
-  private List<BasicBlock> protectedRange = new ArrayList<>(); // FIXME: replace with set
-
+  private final List<BasicBlock> protectedRange; // FIXME: replace with set
   private BasicBlock handler;
-
   private List<String> exceptionTypes;
 
   public ExceptionRangeCFG(List<BasicBlock> protectedRange, BasicBlock handler, List<String> exceptionType) {
@@ -28,28 +23,6 @@ public class ExceptionRangeCFG {
     return protectedRange.contains(handler);
   }
 
-  public String toString() {
-
-    String new_line_separator = DecompilerContext.getNewLineSeparator();
-
-    StringBuilder buf = new StringBuilder();
-
-    buf.append("exceptionType:");
-    for (String exception_type : exceptionTypes) {
-      buf.append(" ").append(exception_type);
-    }
-    buf.append(new_line_separator);
-
-    buf.append("handler: ").append(handler.id).append(new_line_separator);
-    buf.append("range: ");
-    for (int i = 0; i < protectedRange.size(); i++) {
-      buf.append(protectedRange.get(i).id).append(" ");
-    }
-    buf.append(new_line_separator);
-
-    return buf.toString();
-  }
-
   public BasicBlock getHandler() {
     return handler;
   }
@@ -62,16 +35,11 @@ public class ExceptionRangeCFG {
     return protectedRange;
   }
 
-  public void setProtectedRange(List<BasicBlock> protectedRange) {
-    this.protectedRange = protectedRange;
-  }
-
   public List<String> getExceptionTypes() {
     return this.exceptionTypes;
   }
 
   public void addExceptionType(String exceptionType) {
-
     if (this.exceptionTypes == null) {
       return;
     }
@@ -85,16 +53,6 @@ public class ExceptionRangeCFG {
   }
 
   public String getUniqueExceptionsString() {
-
-    if (exceptionTypes == null) {
-      return null;
-    }
-
-    return exceptionTypes.stream().distinct().collect(Collectors.joining(":"));
+    return exceptionTypes != null ? exceptionTypes.stream().distinct().collect(Collectors.joining(":")) : null;
   }
-
-
-  //	public void setExceptionType(String exceptionType) {
-  //		this.exceptionType = exceptionType;
-  //	}
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java b/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
index a26d87b..5c56593 100644
--- a/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
+++ b/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
@@ -325,7 +325,6 @@ public class InstructionImpact {
 
 
   public static void stepTypes(DataPoint data, Instruction instr, ConstantPool pool) {
-
     ListStack<VarType> stack = data.getStack();
     int[][] arr = stack_impact[instr.opcode];
 
@@ -337,8 +336,7 @@ public class InstructionImpact {
 
       if (read != null) {
         int depth = 0;
-        for (int i = 0; i < read.length; i++) {
-          int type = read[i];
+        for (int type : read) {
           depth++;
           if (type == CodeConstants.TYPE_LONG ||
               type == CodeConstants.TYPE_DOUBLE) {
@@ -350,8 +348,7 @@ public class InstructionImpact {
       }
 
       if (write != null) {
-        for (int i = 0; i < write.length; i++) {
-          int type = write[i];
+        for (int type : write) {
           stack.push(new VarType(type));
           if (type == CodeConstants.TYPE_LONG ||
               type == CodeConstants.TYPE_DOUBLE) {
@@ -381,7 +378,7 @@ public class InstructionImpact {
       case CodeConstants.opc_ldc:
       case CodeConstants.opc_ldc_w:
       case CodeConstants.opc_ldc2_w:
-        PooledConstant constant = pool.getConstant(instr.getOperand(0));
+        PooledConstant constant = pool.getConstant(instr.operand(0));
         switch (constant.type) {
           case CodeConstants.CONSTANT_Integer:
             stack.push(new VarType(CodeConstants.TYPE_INT));
@@ -409,7 +406,7 @@ public class InstructionImpact {
         }
         break;
       case CodeConstants.opc_aload:
-        var1 = data.getVariable(instr.getOperand(0));
+        var1 = data.getVariable(instr.operand(0));
         if (var1 != null) {
           stack.push(var1);
         }
@@ -422,7 +419,7 @@ public class InstructionImpact {
         stack.push(new VarType(var1.type, var1.arrayDim - 1, var1.value));
         break;
       case CodeConstants.opc_astore:
-        data.setVariable(instr.getOperand(0), stack.pop());
+        data.setVariable(instr.operand(0), stack.pop());
         break;
       case CodeConstants.opc_dup:
       case CodeConstants.opc_dup_x1:
@@ -444,7 +441,7 @@ public class InstructionImpact {
       case CodeConstants.opc_getfield:
         stack.pop();
       case CodeConstants.opc_getstatic:
-        ck = pool.getLinkConstant(instr.getOperand(0));
+        ck = pool.getLinkConstant(instr.operand(0));
         var1 = new VarType(ck.descriptor);
         stack.push(var1);
         if (var1.stackSize == 2) {
@@ -454,7 +451,7 @@ public class InstructionImpact {
       case CodeConstants.opc_putfield:
         stack.pop();
       case CodeConstants.opc_putstatic:
-        ck = pool.getLinkConstant(instr.getOperand(0));
+        ck = pool.getLinkConstant(instr.operand(0));
         var1 = new VarType(ck.descriptor);
         stack.pop(var1.stackSize);
         break;
@@ -464,8 +461,8 @@ public class InstructionImpact {
         stack.pop();
       case CodeConstants.opc_invokestatic:
       case CodeConstants.opc_invokedynamic:
-        if (instr.opcode != CodeConstants.opc_invokedynamic || instr.bytecode_version >= CodeConstants.BYTECODE_JAVA_7) {
-          ck = pool.getLinkConstant(instr.getOperand(0));
+        if (instr.opcode != CodeConstants.opc_invokedynamic || instr.bytecodeVersion >= CodeConstants.BYTECODE_JAVA_7) {
+          ck = pool.getLinkConstant(instr.operand(0));
           MethodDescriptor md = MethodDescriptor.parseDescriptor(ck.descriptor);
           for (int i = 0; i < md.params.length; i++) {
             stack.pop(md.params[i].stackSize);
@@ -479,12 +476,12 @@ public class InstructionImpact {
         }
         break;
       case CodeConstants.opc_new:
-        cn = pool.getPrimitiveConstant(instr.getOperand(0));
+        cn = pool.getPrimitiveConstant(instr.operand(0));
         stack.push(new VarType(CodeConstants.TYPE_OBJECT, 0, cn.getString()));
         break;
       case CodeConstants.opc_newarray:
         stack.pop();
-        stack.push(new VarType(arr_type[instr.getOperand(0) - 4], 1).resizeArrayDim(1));
+        stack.push(new VarType(arr_type[instr.operand(0) - 4], 1).resizeArrayDim(1));
         break;
       case CodeConstants.opc_athrow:
         var1 = stack.pop();
@@ -494,14 +491,14 @@ public class InstructionImpact {
       case CodeConstants.opc_checkcast:
       case CodeConstants.opc_instanceof:
         stack.pop();
-        cn = pool.getPrimitiveConstant(instr.getOperand(0));
+        cn = pool.getPrimitiveConstant(instr.operand(0));
         stack.push(new VarType(CodeConstants.TYPE_OBJECT, 0, cn.getString()));
         break;
       case CodeConstants.opc_anewarray:
       case CodeConstants.opc_multianewarray:
-        int dimensions = (instr.opcode == CodeConstants.opc_anewarray) ? 1 : instr.getOperand(1);
+        int dimensions = (instr.opcode == CodeConstants.opc_anewarray) ? 1 : instr.operand(1);
         stack.pop(dimensions);
-        cn = pool.getPrimitiveConstant(instr.getOperand(0));
+        cn = pool.getPrimitiveConstant(instr.operand(0));
         if (cn.isArray) {
           var1 = new VarType(CodeConstants.TYPE_OBJECT, 0, cn.getString());
           var1 = var1.resizeArrayDim(var1.arrayDim + dimensions);
diff --git a/src/org/jetbrains/java/decompiler/code/interpreter/Util.java b/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
deleted file mode 100644
index 488f4ce..0000000
--- a/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.interpreter;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-import org.jetbrains.java.decompiler.struct.StructClass;
-import org.jetbrains.java.decompiler.struct.StructContext;
-
-
-// FIXME: move to StructContext
-public class Util {
-
-  private static final String[][] runtime_exceptions = {
-
-    null,                        //		public final static int		opc_nop = 0;
-    null,                        //		public final static int		opc_aconst_null = 1;
-    null,                        //		public final static int		opc_iconst_m1 = 2;
-    null,                        //		public final static int		opc_iconst_0 = 3;
-    null,                        //		public final static int		opc_iconst_1 = 4;
-    null,                        //		public final static int		opc_iconst_2 = 5;
-    null,                        //		public final static int		opc_iconst_3 = 6;
-    null,                        //		public final static int		opc_iconst_4 = 7;
-    null,                        //		public final static int		opc_iconst_5 = 8;
-    null,                        //		public final static int		opc_lconst_0 = 9;
-    null,                        //		public final static int		opc_lconst_1 = 10;
-    null,                        //		public final static int		opc_fconst_0 = 11;
-    null,                        //		public final static int		opc_fconst_1 = 12;
-    null,                        //		public final static int		opc_fconst_2 = 13;
-    null,                        //		public final static int		opc_dconst_0 = 14;
-    null,                        //		public final static int		opc_dconst_1 = 15;
-    null,                        //		public final static int		opc_bipush = 16;
-    null,                        //		public final static int		opc_sipush = 17;
-    null,                        //		public final static int		opc_ldc = 18;
-    null,                        //		public final static int		opc_ldc_w = 19;
-    null,                        //		public final static int		opc_ldc2_w = 20;
-    null,                        //		public final static int		opc_iload = 21;
-    null,                        //		public final static int		opc_lload = 22;
-    null,                        //		public final static int		opc_fload = 23;
-    null,                        //		public final static int		opc_dload = 24;
-    null,                        //		public final static int		opc_aload = 25;
-    null,                        //		public final static int		opc_iload_0 = 26;
-    null,                        //		public final static int		opc_iload_1 = 27;
-    null,                        //		public final static int		opc_iload_2 = 28;
-    null,                        //		public final static int		opc_iload_3 = 29;
-    null,                        //		public final static int		opc_lload_0 = 30;
-    null,                        //		public final static int		opc_lload_1 = 31;
-    null,                        //		public final static int		opc_lload_2 = 32;
-    null,                        //		public final static int		opc_lload_3 = 33;
-    null,                        //		public final static int		opc_fload_0 = 34;
-    null,                        //		public final static int		opc_fload_1 = 35;
-    null,                        //		public final static int		opc_fload_2 = 36;
-    null,                        //		public final static int		opc_fload_3 = 37;
-    null,                        //		public final static int		opc_dload_0 = 38;
-    null,                        //		public final static int		opc_dload_1 = 39;
-    null,                        //		public final static int		opc_dload_2 = 40;
-    null,                        //		public final static int		opc_dload_3 = 41;
-    null,                        //		public final static int		opc_aload_0 = 42;
-    null,                        //		public final static int		opc_aload_1 = 43;
-    null,                        //		public final static int		opc_aload_2 = 44;
-    null,                        //		public final static int		opc_aload_3 = 45;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_iaload = 46;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_laload = 47;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_faload = 48;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_daload = 49;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_aaload = 50;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_baload = 51;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_caload = 52;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_saload = 53;
-    null,                        //		public final static int		opc_istore = 54;
-    null,                        //		public final static int		opc_lstore = 55;
-    null,                        //		public final static int		opc_fstore = 56;
-    null,                        //		public final static int		opc_dstore = 57;
-    null,                        //		public final static int		opc_astore = 58;
-    null,                        //		public final static int		opc_istore_0 = 59;
-    null,                        //		public final static int		opc_istore_1 = 60;
-    null,                        //		public final static int		opc_istore_2 = 61;
-    null,                        //		public final static int		opc_istore_3 = 62;
-    null,                        //		public final static int		opc_lstore_0 = 63;
-    null,                        //		public final static int		opc_lstore_1 = 64;
-    null,                        //		public final static int		opc_lstore_2 = 65;
-    null,                        //		public final static int		opc_lstore_3 = 66;
-    null,                        //		public final static int		opc_fstore_0 = 67;
-    null,                        //		public final static int		opc_fstore_1 = 68;
-    null,                        //		public final static int		opc_fstore_2 = 69;
-    null,                        //		public final static int		opc_fstore_3 = 70;
-    null,                        //		public final static int		opc_dstore_0 = 71;
-    null,                        //		public final static int		opc_dstore_1 = 72;
-    null,                        //		public final static int		opc_dstore_2 = 73;
-    null,                        //		public final static int		opc_dstore_3 = 74;
-    null,                        //		public final static int		opc_astore_0 = 75;
-    null,                        //		public final static int		opc_astore_1 = 76;
-    null,                        //		public final static int		opc_astore_2 = 77;
-    null,                        //		public final static int		opc_astore_3 = 78;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_iastore = 79;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_lastore = 80;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_fastore = 81;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_dastore = 82;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException", "java/lang/ArrayStoreException"},
-    //		public final static int		opc_aastore = 83;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_bastore = 84;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_castore = 85;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_sastore = 86;
-    null,                        //		public final static int		opc_pop = 87;
-    null,                        //		public final static int		opc_pop2 = 88;
-    null,                        //		public final static int		opc_dup = 89;
-    null,                        //		public final static int		opc_dup_x1 = 90;
-    null,                        //		public final static int		opc_dup_x2 = 91;
-    null,                        //		public final static int		opc_dup2 = 92;
-    null,                        //		public final static int		opc_dup2_x1 = 93;
-    null,                        //		public final static int		opc_dup2_x2 = 94;
-    null,                        //		public final static int		opc_swap = 95;
-    null,                        //		public final static int		opc_iadd = 96;
-    null,                        //		public final static int		opc_ladd = 97;
-    null,                        //		public final static int		opc_fadd = 98;
-    null,                        //		public final static int		opc_dadd = 99;
-    null,                        //		public final static int		opc_isub = 100;
-    null,                        //		public final static int		opc_lsub = 101;
-    null,                        //		public final static int		opc_fsub = 102;
-    null,                        //		public final static int		opc_dsub = 103;
-    null,                        //		public final static int		opc_imul = 104;
-    null,                        //		public final static int		opc_lmul = 105;
-    null,                        //		public final static int		opc_fmul = 106;
-    null,                        //		public final static int		opc_dmul = 107;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_idiv = 108;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_ldiv = 109;
-    null,                        //		public final static int		opc_fdiv = 110;
-    null,                        //		public final static int		opc_ddiv = 111;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_irem = 112;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_lrem = 113;
-    null,                        //		public final static int		opc_frem = 114;
-    null,                        //		public final static int		opc_drem = 115;
-    null,                        //		public final static int		opc_ineg = 116;
-    null,                        //		public final static int		opc_lneg = 117;
-    null,                        //		public final static int		opc_fneg = 118;
-    null,                        //		public final static int		opc_dneg = 119;
-    null,                        //		public final static int		opc_ishl = 120;
-    null,                        //		public final static int		opc_lshl = 121;
-    null,                        //		public final static int		opc_ishr = 122;
-    null,                        //		public final static int		opc_lshr = 123;
-    null,                        //		public final static int		opc_iushr = 124;
-    null,                        //		public final static int		opc_lushr = 125;
-    null,                        //		public final static int		opc_iand = 126;
-    null,                        //		public final static int		opc_land = 127;
-    null,                        //		public final static int		opc_ior = 128;
-    null,                        //		public final static int		opc_lor = 129;
-    null,                        //		public final static int		opc_ixor = 130;
-    null,                        //		public final static int		opc_lxor = 131;
-    null,                        //		public final static int		opc_iinc = 132;
-    null,                        //		public final static int		opc_i2l = 133;
-    null,                        //		public final static int		opc_i2f = 134;
-    null,                        //		public final static int		opc_i2d = 135;
-    null,                        //		public final static int		opc_l2i = 136;
-    null,                        //		public final static int		opc_l2f = 137;
-    null,                        //		public final static int		opc_l2d = 138;
-    null,                        //		public final static int		opc_f2i = 139;
-    null,                        //		public final static int		opc_f2l = 140;
-    null,                        //		public final static int		opc_f2d = 141;
-    null,                        //		public final static int		opc_d2i = 142;
-    null,                        //		public final static int		opc_d2l = 143;
-    null,                        //		public final static int		opc_d2f = 144;
-    null,                        //		public final static int		opc_i2b = 145;
-    null,                        //		public final static int		opc_i2c = 146;
-    null,                        //		public final static int		opc_i2s = 147;
-    null,                        //		public final static int		opc_lcmp = 148;
-    null,                        //		public final static int		opc_fcmpl = 149;
-    null,                        //		public final static int		opc_fcmpg = 150;
-    null,                        //		public final static int		opc_dcmpl = 151;
-    null,                        //		public final static int		opc_dcmpg = 152;
-    null,                        //		public final static int		opc_ifeq = 153;
-    null,                        //		public final static int		opc_ifne = 154;
-    null,                        //		public final static int		opc_iflt = 155;
-    null,                        //		public final static int		opc_ifge = 156;
-    null,                        //		public final static int		opc_ifgt = 157;
-    null,                        //		public final static int		opc_ifle = 158;
-    null,                        //		public final static int		opc_if_icmpeq = 159;
-    null,                        //		public final static int		opc_if_icmpne = 160;
-    null,                        //		public final static int		opc_if_icmplt = 161;
-    null,                        //		public final static int		opc_if_icmpge = 162;
-    null,                        //		public final static int		opc_if_icmpgt = 163;
-    null,                        //		public final static int		opc_if_icmple = 164;
-    null,                        //		public final static int		opc_if_acmpeq = 165;
-    null,                        //		public final static int		opc_if_acmpne = 166;
-    null,                        //		public final static int		opc_goto = 167;
-    null,                        //		public final static int		opc_jsr = 168;
-    null,                        //		public final static int		opc_ret = 169;
-    null,                        //		public final static int		opc_tableswitch = 170;
-    null,                        //		public final static int		opc_lookupswitch = 171;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_ireturn = 172;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_lreturn = 173;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_freturn = 174;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_dreturn = 175;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_areturn = 176;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_return = 177;
-    null,                        //		public final static int		opc_getstatic = 178;
-    null,                        //		public final static int		opc_putstatic = 179;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_getfield = 180;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_putfield = 181;
-    {"java/lang/NullPointerException", "java/lang/AbstractMethodError", "java/lang/UnsatisfiedLinkError"},
-    //		public final static int		opc_invokevirtual = 182;
-    {"java/lang/NullPointerException", "java/lang/UnsatisfiedLinkError"},
-    //		public final static int		opc_invokespecial = 183;
-    {"java/lang/UnsatisfiedLinkError"},                        //		public final static int		opc_invokestatic = 184;
-    {"java/lang/NullPointerException", "java/lang/IncompatibleClassChangeError", "java/lang/IllegalAccessError",
-      "java/lang/java/lang/AbstractMethodError", "java/lang/UnsatisfiedLinkError"},
-    //		public final static int		opc_invokeinterface = 185;
-    null,                        //		public final static int		opc_xxxunusedxxx = 186;
-    null,                        //		public final static int		opc_new = 187;
-    {"java/lang/NegativeArraySizeException"},                        //		public final static int		opc_newarray = 188;
-    {"java/lang/NegativeArraySizeException"},                        //		public final static int		opc_anewarray = 189;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_arraylength = 190;
-    {"java/lang/NullPointerException", "java/lang/IllegalMonitorStateException"},
-    //		public final static int		opc_athrow = 191;
-    {"java/lang/ClassCastException"},                        //		public final static int		opc_checkcast = 192;
-    null,                        //		public final static int		opc_instanceof = 193;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_monitorenter = 194;
-    {"java/lang/NullPointerException", "java/lang/IllegalMonitorStateException"},
-    //		public final static int		opc_monitorexit = 195;
-    null,                        //		public final static int		opc_wide = 196;
-    {"java/lang/NegativeArraySizeException"},                        //		public final static int		opc_multianewarray = 197;
-    null,                        //		public final static int		opc_ifnull = 198;
-    null,                        //		public final static int		opc_ifnonnull = 199;
-    null,                        //		public final static int		opc_goto_w = 200;
-    null,                        //		public final static int		opc_jsr_w = 201;
-  };
-
-
-  public static boolean instanceOf(StructContext context, String valclass, String refclass) {
-
-    if (valclass.equals(refclass)) {
-      return true;
-    }
-
-    StructClass cl = context.getClass(valclass);
-    if (cl == null) {
-      return false;
-    }
-
-    if (cl.superClass != null && instanceOf(context, cl.superClass.getString(), refclass)) {
-      return true;
-    }
-
-    int[] interfaces = cl.getInterfaces();
-    for (int i = 0; i < interfaces.length; i++) {
-      String intfc = cl.getPool().getPrimitiveConstant(interfaces[i]).getString();
-
-      if (instanceOf(context, intfc, refclass)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-
-  public static String[] getRuntimeExceptions(Instruction instr) {
-    return runtime_exceptions[instr.opcode];
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
deleted file mode 100644
index dd9a082..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ALOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_aload_0, opc_aload_1, opc_aload_2, opc_aload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_aload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
deleted file mode 100644
index f9f1a2e..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ANEWARRAY extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_anewarray);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
deleted file mode 100644
index 5db4d35..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ASTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_astore_0, opc_astore_1, opc_astore_2, opc_astore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_astore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
deleted file mode 100644
index 2db51be..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class BIPUSH extends Instruction {
-
-  private static final int[] opcodes =
-    new int[]{opc_iconst_m1, opc_iconst_0, opc_iconst_1, opc_iconst_2, opc_iconst_3, opc_iconst_4, opc_iconst_5};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int value = getOperand(0);
-    if (value < -1 || value > 5) {
-      out.writeByte(opc_bipush);
-      out.writeByte(value);
-    }
-    else {
-      out.writeByte(opcodes[value + 1]);
-    }
-  }
-
-  public int length() {
-    int value = getOperand(0);
-    if (value < -1 || value > 5) {
-      return 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java b/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
deleted file mode 100644
index 8497884..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class CHECKCAST extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_checkcast);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
-
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
deleted file mode 100644
index bb9c931..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class DLOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_dload_0, opc_dload_1, opc_dload_2, opc_dload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_dload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
deleted file mode 100644
index f6efd5e..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class DSTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_dstore_0, opc_dstore_1, opc_dstore_2, opc_dstore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_dstore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
deleted file mode 100644
index 1d47019..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class FLOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_fload_0, opc_fload_1, opc_fload_2, opc_fload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_fload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
deleted file mode 100644
index 77dafbc..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class FSTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_fstore_0, opc_fstore_1, opc_fstore_2, opc_fstore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_fstore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
deleted file mode 100644
index 27f69b4..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class GETFIELD extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_getfield);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
deleted file mode 100644
index ab76504..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class GETSTATIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_getstatic);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
deleted file mode 100644
index 14bce2e..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class GOTO extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      out.writeByte(opc_goto_w);
-      out.writeInt(operand);
-    }
-    else {
-      out.writeByte(opc_goto);
-      out.writeShort(operand);
-    }
-  }
-
-  public int length() {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      return 5;
-    }
-    else {
-      return 3;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
deleted file mode 100644
index 2de6914..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class GOTO_W extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_goto_w);
-    out.writeInt(getOperand(0));
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
deleted file mode 100644
index 204f453..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class IINC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    if (wide) {
-      out.writeByte(opc_wide);
-    }
-    out.writeByte(opc_iinc);
-    if (wide) {
-      out.writeShort(getOperand(0));
-      out.writeShort(getOperand(1));
-    }
-    else {
-      out.writeByte(getOperand(0));
-      out.writeByte(getOperand(1));
-    }
-  }
-
-  public int length() {
-    return wide ? 6 : 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
deleted file mode 100644
index b4bd0ea..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ILOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_iload_0, opc_iload_1, opc_iload_2, opc_iload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_iload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
deleted file mode 100644
index b55440a..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INSTANCEOF extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_instanceof);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
deleted file mode 100644
index 9c2e50a..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKEDYNAMIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokedynamic);
-    out.writeShort(getOperand(0));
-    out.writeByte(0);
-    out.writeByte(0);
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
deleted file mode 100644
index 7aa9000..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKEINTERFACE extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokeinterface);
-    out.writeShort(getOperand(0));
-    out.writeByte(getOperand(1));
-    out.writeByte(0);
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
deleted file mode 100644
index b3247ca..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKESPECIAL extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokespecial);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
deleted file mode 100644
index 4ada3dd..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKESTATIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokestatic);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
deleted file mode 100644
index 677b8d3..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKEVIRTUAL extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokevirtual);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
deleted file mode 100644
index c8512ce..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ISTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_istore_0, opc_istore_1, opc_istore_2, opc_istore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_istore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
deleted file mode 100644
index 5bfbf28..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class JSR extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      out.writeByte(opc_jsr_w);
-      out.writeInt(operand);
-    }
-    else {
-      out.writeByte(opc_jsr);
-      out.writeShort(operand);
-    }
-  }
-
-  public int length() {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      return 5;
-    }
-    else {
-      return 3;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
deleted file mode 100644
index 465e5fb..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class JSR_W extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_jsr_w);
-    out.writeInt(getOperand(0));
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
deleted file mode 100644
index ee7e9fd..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LDC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_ldc);
-    out.writeByte(getOperand(0));
-  }
-
-  public int length() {
-    return 2;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
deleted file mode 100644
index 341c852..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LDC2_W extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_ldc2_w);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
deleted file mode 100644
index 1f524b1..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LDC_W extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_ldc_w);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
deleted file mode 100644
index 4b655cb..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LLOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_lload_0, opc_lload_1, opc_lload_2, opc_lload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_lload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
deleted file mode 100644
index d68c84b..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.SwitchInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LOOKUPSWITCH extends SwitchInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-
-    out.writeByte(opc_lookupswitch);
-
-    int padding = 3 - (offset % 4);
-    for (int i = 0; i < padding; i++) {
-      out.writeByte(0);
-    }
-
-    for (int i = 0; i < operandsCount(); i++) {
-      out.writeInt(getOperand(i));
-    }
-  }
-
-  public int length() {
-    return 1 + operandsCount() * 4;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
deleted file mode 100644
index 24f79e0..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LSTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_lstore_0, opc_lstore_1, opc_lstore_2, opc_lstore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_lstore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
deleted file mode 100644
index c5e418e..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class MULTIANEWARRAY extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_multianewarray);
-    out.writeShort(getOperand(0));
-    out.writeByte(getOperand(1));
-  }
-
-  public int length() {
-    return 4;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java b/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
deleted file mode 100644
index 1262c61..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class NEW extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_new);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
deleted file mode 100644
index 236474c..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class NEWARRAY extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_newarray);
-    out.writeByte(getOperand(0));
-  }
-
-  public int length() {
-    return 2;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
deleted file mode 100644
index 3466b16..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class PUTFIELD extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_putfield);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
deleted file mode 100644
index 7bc67ea..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class PUTSTATIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_putstatic);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java b/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
deleted file mode 100644
index a55ef59..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class RET extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    if (wide) {
-      out.writeByte(opc_wide);
-    }
-    out.writeByte(opc_ret);
-    if (wide) {
-      out.writeShort(getOperand(0));
-    }
-    else {
-      out.writeByte(getOperand(0));
-    }
-  }
-
-  public int length() {
-    return wide ? 4 : 2;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
deleted file mode 100644
index 873e86a..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class SIPUSH extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_sipush);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
deleted file mode 100644
index f96f158..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.SwitchInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class TABLESWITCH extends SwitchInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-
-    out.writeByte(opc_tableswitch);
-
-    int padding = 3 - (offset % 4);
-    for (int i = 0; i < padding; i++) {
-      out.writeByte(0);
-    }
-
-    for (int i = 0; i < operandsCount(); i++) {
-      out.writeInt(getOperand(i));
-    }
-  }
-
-  public int length() {
-    return 1 + operandsCount() * 4;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
index 64fee99..a5f8d72 100644
--- a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
@@ -316,10 +316,8 @@ public class AssertProcessor {
         if (fparam.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT &&
             fparam.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
           FieldExprent fdparam = (FieldExprent)fparam.getLstOperands().get(0);
-          if (classname.equals(fdparam.getClassname())
-              && key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString))) {
-            return true;
-          }
+          return classname.equals(fdparam.getClassname()) &&
+                 key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString));
         }
       }
       return false;
@@ -327,10 +325,8 @@ public class AssertProcessor {
     else {
       if (exprent.type == Exprent.EXPRENT_FIELD) {
         FieldExprent fdparam = (FieldExprent) exprent;
-        if (classname.equals(fdparam.getClassname())
-            && key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString))) {
-            return true;
-        }
+        return classname.equals(fdparam.getClassname()) &&
+               key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString));
       }
       return false;
     }
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 3bc780f..22c0bf0 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -87,18 +87,14 @@ public class ClassReference14Processor {
 
       RootStatement root = meth.root;
       if (root != null) {
-
         DirectGraph graph = meth.getOrBuildGraph();
-
-        graph.iterateExprents(new DirectGraph.ExprentIterator() {
-          public int processExprent(Exprent exprent) {
-            for (Entry<ClassWrapper, MethodWrapper> ent : mapClassMeths.entrySet()) {
-              if (replaceInvocations(exprent, ent.getKey(), ent.getValue())) {
-                setFound.add(ent.getKey());
-              }
+        graph.iterateExprents(exprent -> {
+          for (Entry<ClassWrapper, MethodWrapper> ent : mapClassMeths.entrySet()) {
+            if (replaceInvocations(exprent, ent.getKey(), ent.getValue())) {
+              setFound.add(ent.getKey());
             }
-            return 0;
           }
+          return 0;
         });
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index f073f97..9995121 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -103,18 +103,10 @@ public class ClassesProcessor {
                   }
 
                   // reference to the nested class
-                  Set<String> set = mapNestedClassReferences.get(enclClassName);
-                  if (set == null) {
-                    mapNestedClassReferences.put(enclClassName, set = new HashSet<>());
-                  }
-                  set.add(innerName);
+                  mapNestedClassReferences.computeIfAbsent(enclClassName, k1 -> new HashSet<>()).add(innerName);
 
                   // reference to the enclosing class
-                  set = mapEnclosingClassReferences.get(innerName);
-                  if (set == null) {
-                    mapEnclosingClassReferences.put(innerName, set = new HashSet<>());
-                  }
-                  set.add(enclClassName);
+                  mapEnclosingClassReferences.computeIfAbsent(innerName, k -> new HashSet<>()).add(enclClassName);
                 }
               }
             }
@@ -281,7 +273,7 @@ public class ClassesProcessor {
     }
   }
 
-  private static void initWrappers(ClassNode node) throws IOException {
+  private static void initWrappers(ClassNode node) {
     if (node.type == ClassNode.CLASS_LAMBDA) {
       return;
     }
@@ -355,7 +347,6 @@ public class ClassesProcessor {
 
       lambdaInformation = new LambdaInformation();
 
-      lambdaInformation.class_name = lambda_class_name;
       lambdaInformation.method_name = lambda_method_name;
       lambdaInformation.method_descriptor = lambda_method_descriptor;
 
@@ -405,7 +396,6 @@ public class ClassesProcessor {
     }
 
     public static class LambdaInformation {
-      public String class_name;
       public String method_name;
       public String method_descriptor;
 
diff --git a/src/org/jetbrains/java/decompiler/main/TextBuffer.java b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
index 58564d7..789d584 100644
--- a/src/org/jetbrains/java/decompiler/main/TextBuffer.java
+++ b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
@@ -56,7 +56,8 @@ public class TextBuffer {
   }
 
   public TextBuffer prepend(String s) {
-    insert(0, s);
+    myStringBuilder.insert(0, s);
+    shiftMapping(s.length());
     return this;
   }
 
@@ -167,20 +168,15 @@ public class TextBuffer {
     return myStringBuilder.length();
   }
 
-  public String substring(int start) {
-    return myStringBuilder.substring(start);
-  }
-
-  public TextBuffer setStart(int position) {
+  public void setStart(int position) {
     myStringBuilder.delete(0, position);
-    shiftMapping(0, -position);
-    return this;
+    shiftMapping(-position);
   }
 
   public void setLength(int position) {
     myStringBuilder.setLength(position);
     if (myLineToOffsetMapping != null) {
-      HashMap<Integer, Integer> newMap = new HashMap<>();
+      Map<Integer, Integer> newMap = new HashMap<>();
       for (Map.Entry<Integer, Integer> entry : myLineToOffsetMapping.entrySet()) {
         if (entry.getValue() <= position) {
           newMap.put(entry.getKey(), entry.getValue());
@@ -201,12 +197,12 @@ public class TextBuffer {
     return this;
   }
 
-  private void shiftMapping(int startOffset, int shiftOffset) {
+  private void shiftMapping(int shiftOffset) {
     if (myLineToOffsetMapping != null) {
-      HashMap<Integer, Integer> newMap = new HashMap<>();
+      Map<Integer, Integer> newMap = new HashMap<>();
       for (Map.Entry<Integer, Integer> entry : myLineToOffsetMapping.entrySet()) {
         int newValue = entry.getValue();
-        if (newValue >= startOffset) {
+        if (newValue >= 0) {
           newValue += shiftOffset;
         }
         if (newValue >= 0) {
@@ -223,12 +219,6 @@ public class TextBuffer {
     }
   }
 
-  public TextBuffer insert(int offset, String s) {
-    myStringBuilder.insert(offset, s);
-    shiftMapping(offset, s.length());
-    return this;
-  }
-
   public int countLines() {
     return countLines(0);
   }
@@ -283,13 +273,9 @@ public class TextBuffer {
       myLineMapping = new HashMap<>();
       for (int i = 0; i < lineMapping.length; i += 2) {
         int key = lineMapping[i + 1];
-        Set<Integer> existing = myLineMapping.get(key);
-        if (existing == null) {
-          existing = new TreeSet<>();
-          myLineMapping.put(key, existing);
-        }
+        Set<Integer> existing = myLineMapping.computeIfAbsent(key, k -> new TreeSet<>());
         existing.add(lineMapping[i]);
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
index 199485f..8ce2eec 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
@@ -8,7 +8,6 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class BytecodeSourceMapper {
-
   private int offset_total;
 
   // class, method, bytecode offset, source line
@@ -19,15 +18,8 @@ public class BytecodeSourceMapper {
   private final Set<Integer> unmappedLines = new TreeSet<>();
 
   public void addMapping(String className, String methodName, int bytecodeOffset, int sourceLine) {
-    Map<String, Map<Integer, Integer>> class_mapping = mapping.get(className);
-    if (class_mapping == null) {
-      mapping.put(className, class_mapping = new LinkedHashMap<>()); // need to preserve order
-    }
-
-    Map<Integer, Integer> method_mapping = class_mapping.get(methodName);
-    if (method_mapping == null) {
-      class_mapping.put(methodName, method_mapping = new HashMap<>());
-    }
+    Map<String, Map<Integer, Integer>> class_mapping = mapping.computeIfAbsent(className, k -> new LinkedHashMap<>()); // need to preserve order
+    Map<Integer, Integer> method_mapping = class_mapping.computeIfAbsent(methodName, k -> new HashMap<>());
 
     // don't overwrite
     if (!method_mapping.containsKey(bytecodeOffset)) {
@@ -98,14 +90,6 @@ public class BytecodeSourceMapper {
     }
   }
 
-  public int getTotalOffset() {
-    return offset_total;
-  }
-
-  public void setTotalOffset(int offset_total) {
-    this.offset_total = offset_total;
-  }
-
   public void addTotalOffset(int offset_total) {
     this.offset_total += offset_total;
   }
@@ -124,4 +108,4 @@ public class BytecodeSourceMapper {
     }
     return res;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 3cf2e4e..2b10963 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -70,12 +70,12 @@ public class ImportCollector {
   public String getShortName(String fullName, boolean imported) {
     ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(fullName.replace('.', '/'));
 
-    String result = null;
+    StringBuilder result = null;
     if (node != null && node.classStruct.isOwn()) {
-      result = node.simpleName;
+      result = new StringBuilder(node.simpleName);
 
       while (node.parent != null && node.type == ClassNode.CLASS_MEMBER) {
-        result = node.parent.simpleName + '.' + result;
+        result.insert(0, node.parent.simpleName + '.');
         node = node.parent;
       }
 
@@ -84,7 +84,7 @@ public class ImportCollector {
         fullName = fullName.replace('/', '.');
       }
       else {
-        return result;
+        return result.toString();
       }
     }
     else {
@@ -121,7 +121,7 @@ public class ImportCollector {
       }
     }
 
-    return result == null ? shortName : result;
+    return result == null ? shortName : result.toString();
   }
 
   public int writeImports(TextBuffer buffer) {
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 8cdffd4..7eaf57b 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -244,10 +244,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   private boolean checkEntry(String entryName, String file) {
-    Set<String> set = mapArchiveEntries.get(file);
-    if (set == null) {
-      mapArchiveEntries.put(file, set = new HashSet<>());
-    }
+    Set<String> set = mapArchiveEntries.computeIfAbsent(file, k -> new HashSet<>());
 
     boolean added = set.add(entryName);
     if (!added) {
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 3b8bc33..5b84ab3 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -19,7 +19,6 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -35,7 +34,7 @@ public class ClassWrapper {
     this.classStruct = classStruct;
   }
 
-  public void init() throws IOException {
+  public void init() {
     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS, classStruct);
     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_WRAPPER, this);
     DecompilerContext.getLogger().startClass(classStruct.qualifiedName);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
index eff8bf7..26f3565 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
@@ -30,21 +30,17 @@ public class LambdaProcessor {
       processClass(child);
     }
 
-    hasLambda(node);
-  }
-
-  public boolean hasLambda(ClassNode node) throws IOException {
     ClassesProcessor clProcessor = DecompilerContext.getClassProcessor();
     StructClass cl = node.classStruct;
 
     if (cl.getBytecodeVersion() < CodeConstants.BYTECODE_JAVA_8) { // lambda beginning with Java 8
-      return false;
+      return;
     }
 
     StructBootstrapMethodsAttribute bootstrap =
       (StructBootstrapMethodsAttribute)cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
     if (bootstrap == null || bootstrap.getMethodsNumber() == 0) {
-      return false; // no bootstrap constants in pool
+      return; // no bootstrap constants in pool
     }
 
     BitSet lambda_methods = new BitSet();
@@ -61,7 +57,7 @@ public class LambdaProcessor {
     }
 
     if (lambda_methods.isEmpty()) {
-      return false; // no lambda bootstrap constant found
+      return; // no lambda bootstrap constant found
     }
 
     Map<String, String> mapMethodsLambda = new HashMap<>();
@@ -78,7 +74,7 @@ public class LambdaProcessor {
           Instruction instr = seq.getInstr(i);
 
           if (instr.opcode == CodeConstants.opc_invokedynamic) {
-            LinkConstant invoke_dynamic = cl.getPool().getLinkConstant(instr.getOperand(0));
+            LinkConstant invoke_dynamic = cl.getPool().getLinkConstant(instr.operand(0));
 
             if (lambda_methods.get(invoke_dynamic.index1)) { // lambda invocation found
 
@@ -126,7 +122,5 @@ public class LambdaProcessor {
     }
 
     // FIXME: mixed hierarchy?
-
-    return false;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index e08cee0..b213031 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -118,45 +118,42 @@ public class NestedClassProcessor {
 
     final Map<VarVersionPair, String> mapNewNames = new HashMap<>();
 
-    enclosingMethod.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+    enclosingMethod.getOrBuildGraph().iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-        for (Exprent expr : lst) {
-          if (expr.type == Exprent.EXPRENT_NEW) {
-            NewExprent new_expr = (NewExprent)expr;
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_NEW) {
+          NewExprent new_expr = (NewExprent)expr;
 
-            VarNamesCollector enclosingCollector = new VarNamesCollector(enclosingMethod.varproc.getVarNames());
+          VarNamesCollector enclosingCollector = new VarNamesCollector(enclosingMethod.varproc.getVarNames());
 
-            if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
-              InvocationExprent inv_dynamic = new_expr.getConstructor();
+          if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
+            InvocationExprent inv_dynamic = new_expr.getConstructor();
 
-              int param_index = is_static_lambda_content ? 0 : 1;
-              int varIndex = is_static_lambda_content ? 0 : 1;
+            int param_index = is_static_lambda_content ? 0 : 1;
+            int varIndex = is_static_lambda_content ? 0 : 1;
 
-              for (int i = 0; i < md_content.params.length; ++i) {
-                VarVersionPair varVersion = new VarVersionPair(varIndex, 0);
-                if (i < vars_count) {
-                  Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
+            for (int i = 0; i < md_content.params.length; ++i) {
+              VarVersionPair varVersion = new VarVersionPair(varIndex, 0);
+              if (i < vars_count) {
+                Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
 
-                  if (param.type == Exprent.EXPRENT_VAR) {
-                    mapNewNames.put(varVersion, enclosingMethod.varproc.getVarName(new VarVersionPair((VarExprent)param)));
-                  }
+                if (param.type == Exprent.EXPRENT_VAR) {
+                  mapNewNames.put(varVersion, enclosingMethod.varproc.getVarName(new VarVersionPair((VarExprent)param)));
                 }
-                else {
-                  mapNewNames.put(varVersion, enclosingCollector.getFreeName(method.varproc.getVarName(varVersion)));
-                }
-
-                varIndex += md_content.params[i].stackSize;
               }
+              else {
+                mapNewNames.put(varVersion, enclosingCollector.getFreeName(method.varproc.getVarName(varVersion)));
+              }
+
+              varIndex += md_content.params[i].stackSize;
             }
           }
         }
-
-        return 0;
       }
+
+      return 0;
     });
 
     // update names of local variables
@@ -272,67 +269,64 @@ public class NestedClassProcessor {
       // iterate enclosing class
       for (final MethodWrapper method : node.getWrapper().getMethods()) {
         if (method.root != null) { // neither abstract, nor native
-          method.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
-            @Override
-            public int processExprent(Exprent exprent) {
-              List<Exprent> lst = exprent.getAllExprents(true);
-              lst.add(exprent);
+          method.getOrBuildGraph().iterateExprents(exprent -> {
+            List<Exprent> lst = exprent.getAllExprents(true);
+            lst.add(exprent);
 
-              for (Exprent expr : lst) {
-                if (expr.type == Exprent.EXPRENT_NEW) {
-                  InvocationExprent constructor = ((NewExprent)expr).getConstructor();
+            for (Exprent expr : lst) {
+              if (expr.type == Exprent.EXPRENT_NEW) {
+                InvocationExprent constructor = ((NewExprent)expr).getConstructor();
 
-                  if (constructor != null && mapVarMasks.containsKey(constructor.getClassname())) { // non-static inner class constructor
-                    String refClassName = constructor.getClassname();
-                    ClassNode nestedClassNode = node.getClassNode(refClassName);
+                if (constructor != null && mapVarMasks.containsKey(constructor.getClassname())) { // non-static inner class constructor
+                  String refClassName = constructor.getClassname();
+                  ClassNode nestedClassNode = node.getClassNode(refClassName);
 
-                    if (nestedClassNode.type != ClassNode.CLASS_MEMBER) {
-                      List<VarFieldPair> mask = mapVarMasks.get(refClassName).get(constructor.getStringDescriptor());
+                  if (nestedClassNode.type != ClassNode.CLASS_MEMBER) {
+                    List<VarFieldPair> mask = mapVarMasks.get(refClassName).get(constructor.getStringDescriptor());
 
-                      if (!mapVarFieldPairs.containsKey(refClassName)) {
-                        mapVarFieldPairs.put(refClassName, new HashMap<>());
-                      }
-
-                      List<VarFieldPair> lstTemp = new ArrayList<>();
-
-                      for (int i = 0; i < mask.size(); i++) {
-                        Exprent param = constructor.getLstParameters().get(i);
-                        VarFieldPair pair = null;
-
-                        if (param.type == Exprent.EXPRENT_VAR && mask.get(i) != null) {
-                          VarVersionPair varPair = new VarVersionPair((VarExprent)param);
-
-                          // FIXME: flags of variables are wrong! Correct the entire functionality.
-                          // if(method.varproc.getVarFinal(varPair) != VarTypeProcessor.VAR_NON_FINAL) {
-                          pair = new VarFieldPair(mask.get(i).fieldKey, varPair);
-                          // }
-                        }
-
-                        lstTemp.add(pair);
-                      }
-
-                      List<VarFieldPair> pairMask = mapVarFieldPairs.get(refClassName).get(constructor.getStringDescriptor());
-                      if (pairMask == null) {
-                        pairMask = lstTemp;
-                      }
-                      else {
-                        for (int i = 0; i < pairMask.size(); i++) {
-                          if (!InterpreterUtil.equalObjects(pairMask.get(i), lstTemp.get(i))) {
-                            pairMask.set(i, null);
-                          }
-                        }
-                      }
-
-                      mapVarFieldPairs.get(refClassName).put(constructor.getStringDescriptor(), pairMask);
-                      nestedClassNode.enclosingMethod =
-                        InterpreterUtil.makeUniqueKey(method.methodStruct.getName(), method.methodStruct.getDescriptor());
+                    if (!mapVarFieldPairs.containsKey(refClassName)) {
+                      mapVarFieldPairs.put(refClassName, new HashMap<>());
                     }
+
+                    List<VarFieldPair> lstTemp = new ArrayList<>();
+
+                    for (int i = 0; i < mask.size(); i++) {
+                      Exprent param = constructor.getLstParameters().get(i);
+                      VarFieldPair pair = null;
+
+                      if (param.type == Exprent.EXPRENT_VAR && mask.get(i) != null) {
+                        VarVersionPair varPair = new VarVersionPair((VarExprent)param);
+
+                        // FIXME: flags of variables are wrong! Correct the entire functionality.
+                        // if(method.varproc.getVarFinal(varPair) != VarTypeProcessor.VAR_NON_FINAL) {
+                        pair = new VarFieldPair(mask.get(i).fieldKey, varPair);
+                        // }
+                      }
+
+                      lstTemp.add(pair);
+                    }
+
+                    List<VarFieldPair> pairMask = mapVarFieldPairs.get(refClassName).get(constructor.getStringDescriptor());
+                    if (pairMask == null) {
+                      pairMask = lstTemp;
+                    }
+                    else {
+                      for (int i = 0; i < pairMask.size(); i++) {
+                        if (!InterpreterUtil.equalObjects(pairMask.get(i), lstTemp.get(i))) {
+                          pairMask.set(i, null);
+                        }
+                      }
+                    }
+
+                    mapVarFieldPairs.get(refClassName).put(constructor.getStringDescriptor(), pairMask);
+                    nestedClassNode.enclosingMethod =
+                      InterpreterUtil.makeUniqueKey(method.methodStruct.getName(), method.methodStruct.getDescriptor());
                   }
                 }
               }
-
-              return 0;
             }
+
+            return 0;
           });
         }
       }
@@ -918,7 +912,7 @@ public class NestedClassProcessor {
   }
 
   private static class VarFieldPair {
-    public String fieldKey = "";
+    public String fieldKey;
     public VarVersionPair varPair;
 
     public VarFieldPair(String field, VarVersionPair varPair) {
@@ -940,4 +934,4 @@ public class NestedClassProcessor {
       return fieldKey.hashCode() + varPair.hashCode();
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index 1f723d3..bbd027c 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -247,9 +247,7 @@ public class NestedMemberAccess {
             }
           }
 
-          for (DirectNode ndx : nd.succs) {
-            stack.add(ndx);
-          }
+          stack.addAll(nd.succs);
         }
 
         if (replaced) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
index 8bc7bdb..7d5c207 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
@@ -212,13 +212,9 @@ public class ConcatenationHelper {
   }
 
   private static boolean isNewConcat(NewExprent expr, VarType cltype) {
-
     if (expr.getNewType().equals(cltype)) {
       VarType[] params = expr.getConstructor().getDescriptor().params;
-      if (params.length == 0 || (params.length == 1 &&
-                                 params[0].equals(VarType.VARTYPE_STRING))) {
-        return true;
-      }
+      return params.length == 0 || params.length == 1 && params[0].equals(VarType.VARTYPE_STRING);
     }
 
     return false;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
index 2c1e9d0..50b76a7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
@@ -180,17 +180,9 @@ public class DecHelper {
     return true;
   }
 
-
-  public static HashSet<Statement> getUniquePredExceptions(Statement head) {
-
-    HashSet<Statement> setHandlers = new HashSet<>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_FORWARD));
-
-    Iterator<Statement> it = setHandlers.iterator();
-    while (it.hasNext()) {
-      if (it.next().getPredecessorEdges(StatEdge.TYPE_EXCEPTION).size() > 1) {
-        it.remove();
-      }
-    }
+  public static Set<Statement> getUniquePredExceptions(Statement head) {
+    Set<Statement> setHandlers = new HashSet<>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_FORWARD));
+    setHandlers.removeIf(statement -> statement.getPredecessorEdges(StatEdge.TYPE_EXCEPTION).size() > 1);
     return setHandlers;
   }
 
@@ -201,4 +193,4 @@ public class DecHelper {
     }
     return ret;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
index 04737c8..2c5e3eb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
@@ -177,7 +177,7 @@ public class DomHelper {
         lstPosts.add(stt.id);
       }
 
-      Collections.sort(lstPosts, Comparator.comparing(mapSortOrder::get));
+      lstPosts.sort(Comparator.comparing(mapSortOrder::get));
 
       if (lstPosts.size() > 1 && lstPosts.get(0).intValue() == st.id) {
         lstPosts.add(lstPosts.remove(0));
@@ -453,14 +453,12 @@ public class DomHelper {
 
       Set<Integer> setExtPosts = mapExtPost.get(headid);
 
-      for (int i = 0; i < posts.size(); i++) {
-
-        Integer postid = posts.get(i);
-        if (!postid.equals(headid) && !setExtPosts.contains(postid)) {
+      for (Integer postId : posts) {
+        if (!postId.equals(headid) && !setExtPosts.contains(postId)) {
           continue;
         }
 
-        Statement post = stats.getWithKey(postid);
+        Statement post = stats.getWithKey(postId);
 
         if (post == null) { // possible in case of an inherited postdominance set
           continue;
@@ -539,14 +537,14 @@ public class DomHelper {
 
         // build statement and return
         if (excok) {
-          Statement res = null;
+          Statement res;
 
           setPreds.removeAll(setNodes);
           if (setPreds.size() == 0) {
             if ((setNodes.size() > 1 ||
                  head.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).contains(head))
                 && setNodes.size() < stats.size()) {
-              if (checkSynchronizedCompleteness(head, setNodes)) {
+              if (checkSynchronizedCompleteness(setNodes)) {
                 res = new GeneralStatement(head, setNodes, same ? null : post);
                 stat.collapseNodesToStatement(res);
 
@@ -561,8 +559,7 @@ public class DomHelper {
     return null;
   }
 
-  private static boolean checkSynchronizedCompleteness(Statement head, HashSet<Statement> setNodes) {
-
+  private static boolean checkSynchronizedCompleteness(Set<Statement> setNodes) {
     // check exit nodes
     for (Statement stat : setNodes) {
       if (stat.isMonitorEnter()) {
@@ -618,12 +615,7 @@ public class DomHelper {
               set.removeAll(setOldNodes);
 
               if (setOldNodes.contains(key)) {
-                Set<Integer> setNew = mapExtPost.get(newid);
-                if (setNew == null) {
-                  mapExtPost.put(newid, setNew = new HashSet<>());
-                }
-                setNew.addAll(set);
-
+                mapExtPost.computeIfAbsent(newid, k -> new HashSet<>()).addAll(set);
                 mapExtPost.remove(key);
               }
               else {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
deleted file mode 100644
index 1efe1e5..0000000
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.modules.decompiler;
-
-import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
-import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-
-public class EliminateLoopsHelper {
-
-
-  //	public static boolean eliminateLoops(Statement root) {
-  //
-  //		boolean ret = eliminateLoopsRec(root);
-  //
-  //		if(ret) {
-  //			SequenceHelper.condenseSequences(root);
-  //
-  //			HashSet<Integer> setReorderedIfs = new HashSet<Integer>();
-  //
-  //			SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(false);
-  //			while(sehelper.simplifyStackVarsStatement(root, setReorderedIfs, null)) {
-  //				SequenceHelper.condenseSequences(root);
-  //			}
-  //		}
-  //
-  //		return ret;
-  //	}
-
-  private static boolean eliminateLoopsRec(Statement stat) {
-
-    for (Statement st : stat.getStats()) {
-      if (eliminateLoopsRec(st)) {
-        return true;
-      }
-    }
-
-    if (stat.type == Statement.TYPE_DO && isLoopRedundant((DoStatement)stat)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  private static boolean isLoopRedundant(DoStatement loop) {
-
-    if (loop.getLooptype() != DoStatement.LOOP_DO) {
-      return false;
-    }
-
-    // get parent loop if exists
-    Statement parentloop = loop.getParent();
-    while (parentloop != null && parentloop.type != Statement.TYPE_DO) {
-      parentloop = parentloop.getParent();
-    }
-
-    if (parentloop == null || parentloop.getBasichead() != loop.getBasichead()) {
-      return false;
-    }
-
-    // collect relevant break edges
-    List<StatEdge> lstBreakEdges = new ArrayList<>();
-    for (StatEdge edge : loop.getLabelEdges()) {
-      if (edge.getType() == StatEdge.TYPE_BREAK) { // all break edges are explicit because of LOOP_DO type
-        lstBreakEdges.add(edge);
-      }
-    }
-
-
-    Statement loopcontent = loop.getFirst();
-
-    boolean firstok = loopcontent.getAllSuccessorEdges().isEmpty();
-    if (!firstok) {
-      StatEdge edge = loopcontent.getAllSuccessorEdges().get(0);
-      firstok = (edge.closure == loop && edge.getType() == StatEdge.TYPE_BREAK);
-      if (firstok) {
-        lstBreakEdges.remove(edge);
-      }
-    }
-
-
-    if (!lstBreakEdges.isEmpty()) {
-      if (firstok) {
-
-        HashMap<Integer, Boolean> statLabeled = new HashMap<>();
-        List<Statement> lstEdgeClosures = new ArrayList<>();
-
-        for (StatEdge edge : lstBreakEdges) {
-          Statement minclosure = LowBreakHelper.getMinClosure(loopcontent, edge.getSource());
-          lstEdgeClosures.add(minclosure);
-        }
-
-        int precount = loop.isLabeled() ? 1 : 0;
-        for (Statement st : lstEdgeClosures) {
-          if (!statLabeled.containsKey(st.id)) {
-            boolean btemp = st.isLabeled();
-            precount += btemp ? 1 : 0;
-            statLabeled.put(st.id, btemp);
-          }
-        }
-
-        for (int i = 0; i < lstBreakEdges.size(); i++) {
-          Statement st = lstEdgeClosures.get(i);
-          statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
-        }
-
-        for (int i = 0; i < lstBreakEdges.size(); i++) {
-          lstEdgeClosures.set(i, getMaxBreakLift(lstEdgeClosures.get(i), lstBreakEdges.get(i), statLabeled, loop));
-        }
-
-        statLabeled.clear();
-        for (Statement st : lstEdgeClosures) {
-          statLabeled.put(st.id, st.isLabeled());
-        }
-
-        for (int i = 0; i < lstBreakEdges.size(); i++) {
-          Statement st = lstEdgeClosures.get(i);
-          statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
-        }
-
-        long postcount = statLabeled.values().stream().filter(Boolean::booleanValue).count();
-
-        if (precount <= postcount) {
-          return false;
-        }
-        else {
-          for (int i = 0; i < lstBreakEdges.size(); i++) {
-            lstEdgeClosures.get(i).addLabeledEdge(lstBreakEdges.get(i));
-          }
-        }
-      }
-      else {
-        return false;
-      }
-    }
-
-    eliminateLoop(loop, parentloop);
-
-    return true;
-  }
-
-  private static Statement getMaxBreakLift(Statement stat, StatEdge edge, HashMap<Integer, Boolean> statLabeled, Statement max) {
-
-    Statement closure = stat;
-    Statement newclosure = stat;
-
-    while ((newclosure = getNextBreakLift(newclosure, edge, statLabeled, max)) != null) {
-      closure = newclosure;
-    }
-
-    return closure;
-  }
-
-  private static Statement getNextBreakLift(Statement stat, StatEdge edge, HashMap<Integer, Boolean> statLabeled, Statement max) {
-
-    Statement closure = stat.getParent();
-
-    while (closure != null && closure != max && !closure.containsStatementStrict(edge.getDestination())) {
-
-      boolean edge_labeled = LowBreakHelper.isBreakEdgeLabeled(edge.getSource(), closure);
-      boolean stat_labeled = statLabeled.containsKey(closure.id) ? statLabeled.get(closure.id) : closure.isLabeled();
-
-      if (stat_labeled || !edge_labeled) {
-        return closure;
-      }
-
-      closure = closure.getParent();
-    }
-
-    return null;
-  }
-
-  private static void eliminateLoop(Statement loop, Statement parentloop) {
-
-    // move continue edges to the parent loop
-    List<StatEdge> lst = new ArrayList<>(loop.getLabelEdges());
-    for (StatEdge edge : lst) {
-      loop.removePredecessor(edge);
-      edge.getSource().changeEdgeNode(Statement.DIRECTION_FORWARD, edge, parentloop);
-      parentloop.addPredecessor(edge);
-
-      parentloop.addLabeledEdge(edge);
-    }
-
-    // remove the last break edge, if exists
-    Statement loopcontent = loop.getFirst();
-    if (!loopcontent.getAllSuccessorEdges().isEmpty()) {
-      loopcontent.removeSuccessor(loopcontent.getAllSuccessorEdges().get(0));
-    }
-
-    // replace loop with its content
-    loop.getParent().replaceStatement(loop, loopcontent);
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
index 8b522ad..81c61d0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
@@ -208,9 +208,7 @@ public class ExitHelper {
     return true;
   }
 
-  public static boolean removeRedundantReturns(RootStatement root) {
-    boolean res = false;
-
+  public static void removeRedundantReturns(RootStatement root) {
     DummyExitStatement dummyExit = root.getDummyExit();
 
     for (StatEdge edge : dummyExit.getAllPredecessorEdges()) {
@@ -225,13 +223,10 @@ public class ExitHelper {
               // remove redundant return
               dummyExit.addBytecodeOffsets(ex.bytecode);
               lstExpr.remove(lstExpr.size() - 1);
-              res = true;
             }
           }
         }
       }
     }
-
-    return res;
   }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 6a03bf4..05926c9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
 import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.*;
 
@@ -170,12 +171,7 @@ public class ExprProcessor implements CodeConstants {
         }
 
         if (isSuccessor) {
-
-          Map<String, PrimitiveExprsList> mapSucc = mapData.get(nd);
-          if (mapSucc == null) {
-            mapData.put(nd, mapSucc = new HashMap<>());
-          }
-
+          Map<String, PrimitiveExprsList> mapSucc = mapData.computeIfAbsent(nd, k -> new HashMap<>());
           LinkedList<String> ndentrypoints = new LinkedList<>(entrypoints);
 
           if (setFinallyLongRangeEntryPaths.contains(node.id + "##" + nd.id)) {
@@ -295,25 +291,25 @@ public class ExprProcessor implements CodeConstants {
           break;
         case opc_bipush:
         case opc_sipush:
-          pushEx(stack, exprlist, new ConstExprent(instr.getOperand(0), true, bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(instr.operand(0), true, bytecode_offsets));
           break;
         case opc_lconst_0:
         case opc_lconst_1:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_LONG, Long.valueOf(instr.opcode - opc_lconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_LONG, (long)(instr.opcode - opc_lconst_0), bytecode_offsets));
           break;
         case opc_fconst_0:
         case opc_fconst_1:
         case opc_fconst_2:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_FLOAT, Float.valueOf(instr.opcode - opc_fconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_FLOAT, (float)(instr.opcode - opc_fconst_0), bytecode_offsets));
           break;
         case opc_dconst_0:
         case opc_dconst_1:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_DOUBLE, Double.valueOf(instr.opcode - opc_dconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_DOUBLE, (double)(instr.opcode - opc_dconst_0), bytecode_offsets));
           break;
         case opc_ldc:
         case opc_ldc_w:
         case opc_ldc2_w:
-          PooledConstant cn = pool.getConstant(instr.getOperand(0));
+          PooledConstant cn = pool.getConstant(instr.operand(0));
           if (cn instanceof PrimitiveConstant) {
             pushEx(stack, exprlist, new ConstExprent(consts[cn.type - CONSTANT_Integer], ((PrimitiveConstant)cn).value, bytecode_offsets));
           }
@@ -327,7 +323,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_fload:
         case opc_dload:
         case opc_aload:
-          pushEx(stack, exprlist, new VarExprent(instr.getOperand(0), varTypes[instr.opcode - opc_iload], varProcessor, bytecode_offset));
+          pushEx(stack, exprlist, new VarExprent(instr.operand(0), varTypes[instr.opcode - opc_iload], varProcessor, bytecode_offset));
           break;
         case opc_iaload:
         case opc_laload:
@@ -355,10 +351,10 @@ public class ExprProcessor implements CodeConstants {
         case opc_fstore:
         case opc_dstore:
         case opc_astore:
-          Exprent top = stack.pop();
-          int varindex = instr.getOperand(0);
+          Exprent expr = stack.pop();
+          int varindex = instr.operand(0);
           AssignmentExprent assign = new AssignmentExprent(
-            new VarExprent(varindex, varTypes[instr.opcode - opc_istore], varProcessor, nextMeaningfulOffset(block, i)), top, bytecode_offsets);
+            new VarExprent(varindex, varTypes[instr.opcode - opc_istore], varProcessor, nextMeaningfulOffset(block, i)), expr, bytecode_offsets);
           exprlist.add(assign);
           break;
         case opc_iastore:
@@ -420,10 +416,10 @@ public class ExprProcessor implements CodeConstants {
           pushEx(stack, exprlist, new FunctionExprent(FunctionExprent.FUNCTION_NEG, stack, bytecode_offsets));
           break;
         case opc_iinc:
-          VarExprent vevar = new VarExprent(instr.getOperand(0), VarType.VARTYPE_INT, varProcessor);
+          VarExprent vevar = new VarExprent(instr.operand(0), VarType.VARTYPE_INT, varProcessor);
           exprlist.add(new AssignmentExprent(vevar, new FunctionExprent(
-            instr.getOperand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD, Arrays
-            .asList(vevar.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.getOperand(1)), null)),
+            instr.operand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD, Arrays
+            .asList(vevar.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.operand(1)), null)),
             bytecode_offsets), bytecode_offsets));
           break;
         case opc_i2l:
@@ -494,21 +490,21 @@ public class ExprProcessor implements CodeConstants {
           break;
         case opc_checkcast:
         case opc_instanceof:
-          stack.push(new ConstExprent(new VarType(pool.getPrimitiveConstant(instr.getOperand(0)).getString(), true), null, null));
+          stack.push(new ConstExprent(new VarType(pool.getPrimitiveConstant(instr.operand(0)).getString(), true), null, null));
         case opc_arraylength:
-          pushEx(stack, exprlist, new FunctionExprent(mapConsts.get(instr.opcode).intValue(), stack, bytecode_offsets));
+          pushEx(stack, exprlist, new FunctionExprent(mapConsts.get(instr.opcode), stack, bytecode_offsets));
           break;
         case opc_getstatic:
         case opc_getfield:
           pushEx(stack, exprlist,
-                 new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_getstatic ? null : stack.pop(),
+                 new FieldExprent(pool.getLinkConstant(instr.operand(0)), instr.opcode == opc_getstatic ? null : stack.pop(),
                                   bytecode_offsets));
           break;
         case opc_putstatic:
         case opc_putfield:
           Exprent valfield = stack.pop();
           Exprent exprfield =
-            new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_putstatic ? null : stack.pop(),
+            new FieldExprent(pool.getLinkConstant(instr.operand(0)), instr.opcode == opc_putstatic ? null : stack.pop(),
                              bytecode_offsets);
           exprlist.add(new AssignmentExprent(exprfield, valfield, bytecode_offsets));
           break;
@@ -517,8 +513,8 @@ public class ExprProcessor implements CodeConstants {
         case opc_invokestatic:
         case opc_invokeinterface:
         case opc_invokedynamic:
-          if (instr.opcode != opc_invokedynamic || instr.bytecode_version >= CodeConstants.BYTECODE_JAVA_7) {
-            LinkConstant invoke_constant = pool.getLinkConstant(instr.getOperand(0));
+          if (instr.opcode != opc_invokedynamic || instr.bytecodeVersion >= CodeConstants.BYTECODE_JAVA_7) {
+            LinkConstant invoke_constant = pool.getLinkConstant(instr.operand(0));
 
             List<PooledConstant> bootstrap_arguments = null;
             if (instr.opcode == opc_invokedynamic && bootstrap != null) {
@@ -537,15 +533,15 @@ public class ExprProcessor implements CodeConstants {
         case opc_new:
         case opc_anewarray:
         case opc_multianewarray:
-          int dimensions = (instr.opcode == opc_new) ? 0 : (instr.opcode == opc_anewarray) ? 1 : instr.getOperand(1);
-          VarType arrType = new VarType(pool.getPrimitiveConstant(instr.getOperand(0)).getString(), true);
+          int dimensions = (instr.opcode == opc_new) ? 0 : (instr.opcode == opc_anewarray) ? 1 : instr.operand(1);
+          VarType arrType = new VarType(pool.getPrimitiveConstant(instr.operand(0)).getString(), true);
           if (instr.opcode != opc_multianewarray) {
             arrType = arrType.resizeArrayDim(arrType.arrayDim + dimensions);
           }
           pushEx(stack, exprlist, new NewExprent(arrType, stack, dimensions, bytecode_offsets));
           break;
         case opc_newarray:
-          pushEx(stack, exprlist, new NewExprent(new VarType(arrTypeIds[instr.getOperand(0) - 4], 1), stack, 1, bytecode_offsets));
+          pushEx(stack, exprlist, new NewExprent(new VarType(arrTypeIds[instr.operand(0) - 4], 1), stack, 1, bytecode_offsets));
           break;
         case opc_dup:
           pushEx(stack, exprlist, stack.getByOffset(-1).copy());
@@ -714,12 +710,9 @@ public class ExprProcessor implements CodeConstants {
   }
 
   public static String getCastTypeName(VarType type, boolean getShort) {
-    String s = getTypeName(type, getShort);
-    int dim = type.arrayDim;
-    while (dim-- > 0) {
-      s += "[]";
-    }
-    return s;
+    StringBuilder s = new StringBuilder(getTypeName(type, getShort));
+    TextUtil.append(s, "[]", type.arrayDim);
+    return s.toString();
   }
 
   public static PrimitiveExprsList getExpressionData(VarExprent var) {
@@ -835,13 +828,13 @@ public class ExprProcessor implements CodeConstants {
       defaultVal = new ConstExprent(VarType.VARTYPE_NULL, null, null);
     }
     else if (arrType.type == CodeConstants.TYPE_FLOAT) {
-      defaultVal = new ConstExprent(VarType.VARTYPE_FLOAT, Float.valueOf(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_FLOAT, 0f, null);
     }
     else if (arrType.type == CodeConstants.TYPE_LONG) {
-      defaultVal = new ConstExprent(VarType.VARTYPE_LONG, Long.valueOf(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_LONG, 0L, null);
     }
     else if (arrType.type == CodeConstants.TYPE_DOUBLE) {
-      defaultVal = new ConstExprent(VarType.VARTYPE_DOUBLE, Double.valueOf(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_DOUBLE, 0d, null);
     }
     else { // integer types
       defaultVal = new ConstExprent(0, true, null);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
index 78b84bf..e168569 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
@@ -14,10 +14,8 @@ public class ExprentStack extends ListStack<Exprent> {
     pointer = list.getPointer();
   }
 
-  public Exprent push(Exprent item) {
+  public void push(Exprent item) {
     super.push(item);
-
-    return item;
   }
 
   public Exprent pop() {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index 5ee6fd5..3e213da 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -54,7 +54,6 @@ public class FinallyProcessor {
     stack.add(root);
 
     while (!stack.isEmpty()) {
-
       Statement stat = stack.removeLast();
 
       Statement parent = stat.getParent();
@@ -69,14 +68,12 @@ public class FinallyProcessor {
           // do nothing
         }
         else if (finallyBlockIDs.containsKey(handler.id)) {
-
           fin.setFinally(true);
 
           Integer var = finallyBlockIDs.get(handler.id);
-          fin.setMonitor(var == null ? null : new VarExprent(var.intValue(), VarType.VARTYPE_INT, varProcessor));
+          fin.setMonitor(var == null ? null : new VarExprent(var, VarType.VARTYPE_INT, varProcessor));
         }
         else {
-
           Record inf = getFinallyInformation(mt, root, fin);
 
           if (inf == null) { // inconsistent finally
@@ -110,62 +107,6 @@ public class FinallyProcessor {
     return false;
   }
 
-
-  //	private boolean processStatement(StructMethod mt, RootStatement root, ControlFlowGraph graph, Statement stat) {
-  //
-  //		boolean res = false;
-  //
-  //		for(int i=stat.getStats().size()-1;i>=0;i--) {
-  //			if(processStatement(mt, root, graph, stat.getStats().get(i))) {
-  //				return true;
-  //			}
-  //		}
-  //
-  //
-  //		if(stat.type == Statement.TYPE_CATCHALL && !stat.isCopied()) {
-  //
-  //			CatchAllStatement fin = (CatchAllStatement)stat;
-  //			BasicBlock head = fin.getBasichead().getBlock();
-  //			BasicBlock handler = fin.getHandler().getBasichead().getBlock();
-  //
-  //			if(catchallBlockIDs.containsKey(handler.id)) {
-  //				; // do nothing
-  //			}else if(finallyBlockIDs.containsKey(handler.id)) {
-  //
-  //				fin.setFinally(true);
-  //
-  //				Integer var = finallyBlockIDs.get(handler.id);
-  //				fin.setMonitor(var==null?null:new VarExprent(var.intValue(), VarType.VARTYPE_INT, varprocessor));
-  //
-  //			} else {
-  //
-  //				Object[] inf = getFinallyInformation(mt, root, fin);
-  //
-  //				if(inf == null) { // inconsistent finally
-  //					catchallBlockIDs.put(handler.id, null);
-  //				} else {
-  //
-  //					if(DecompilerContext.getOption(IFernflowerPreferences.FINALLY_DEINLINE) && verifyFinallyEx(graph, fin, inf)) {
-  //						finallyBlockIDs.put(handler.id, null);
-  //					} else {
-  //
-  //						int varindex = DecompilerContext.getCountercontainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
-  //						insertSemaphore(graph, getAllBasicBlocks(fin.getFirst()), head, handler, varindex, inf);
-  //
-  //						finallyBlockIDs.put(handler.id, varindex);
-  //					}
-  //
-  //					DeadCodeHelper.removeEmptyBlocks(graph);
-  //					DeadCodeHelper.mergeBasicBlocks(graph);
-  //				}
-  //
-  //				res = true;
-  //			}
-  //		}
-  //
-  //		return res;
-  //	}
-
   private static class Record {
     private final int firstCode;
     private final Map<BasicBlock, Boolean> mapLast;
@@ -212,7 +153,6 @@ public class FinallyProcessor {
     Set<DirectNode> setVisited = new HashSet<>();
 
     while (!stack.isEmpty()) {
-
       DirectNode node = stack.removeFirst();
 
       if (setVisited.contains(node)) {
@@ -359,7 +299,6 @@ public class FinallyProcessor {
                                       int var,
                                       Record information,
                                       int bytecode_version) {
-
     Set<BasicBlock> setCopy = new HashSet<>(setTry);
 
     int finallytype = information.firstCode;
@@ -378,21 +317,15 @@ public class FinallyProcessor {
 
     // disable semaphore at statement exit points
     for (BasicBlock block : setTry) {
-
       List<BasicBlock> lstSucc = block.getSuccs();
-      for (BasicBlock dest : lstSucc) {
 
+      for (BasicBlock dest : lstSucc) {
         // break out
         if (!setCopy.contains(dest) && dest != graph.getLast()) {
           // disable semaphore
           SimpleInstructionSequence seq = new SimpleInstructionSequence();
-
-          seq.addInstruction(ConstantsUtil
-                               .getInstructionInstance(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version,
-                                                       new int[]{0}), -1);
-          seq.addInstruction(ConstantsUtil
-                               .getInstructionInstance(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version,
-                                                       new int[]{var}), -1);
+          seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
+          seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}), -1);
 
           // build a separate block
           BasicBlock newblock = new BasicBlock(++graph.last_id);
@@ -419,14 +352,10 @@ public class FinallyProcessor {
       }
     }
 
-    // enable semaphor at the statement entrance
+    // enable semaphore at the statement entrance
     SimpleInstructionSequence seq = new SimpleInstructionSequence();
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{1}),
-      -1);
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}),
-      -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{1}), -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}), -1);
 
     BasicBlock newhead = new BasicBlock(++graph.last_id);
     newhead.setSeq(seq);
@@ -435,12 +364,8 @@ public class FinallyProcessor {
 
     // initialize semaphor with false
     seq = new SimpleInstructionSequence();
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}),
-      -1);
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}),
-      -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}), -1);
 
     BasicBlock newheadinit = new BasicBlock(++graph.last_id);
     newheadinit.setSeq(seq);
@@ -460,9 +385,7 @@ public class FinallyProcessor {
     }
   }
 
-
   private static void insertBlockBefore(ControlFlowGraph graph, BasicBlock oldblock, BasicBlock newblock) {
-
     List<BasicBlock> lstTemp = new ArrayList<>();
     lstTemp.addAll(oldblock.getPreds());
     lstTemp.addAll(oldblock.getPredExceptions());
@@ -494,8 +417,7 @@ public class FinallyProcessor {
     }
   }
 
-  private static HashSet<BasicBlock> getAllBasicBlocks(Statement stat) {
-
+  private static Set<BasicBlock> getAllBasicBlocks(Statement stat) {
     List<Statement> lst = new LinkedList<>();
     lst.add(stat);
 
@@ -513,7 +435,7 @@ public class FinallyProcessor {
     }
     while (index < lst.size());
 
-    HashSet<BasicBlock> res = new HashSet<>();
+    Set<BasicBlock> res = new HashSet<>();
 
     for (Statement st : lst) {
       res.add(((BasicBlockStatement)st).getBlock());
@@ -522,11 +444,9 @@ public class FinallyProcessor {
     return res;
   }
 
-
   private boolean verifyFinallyEx(ControlFlowGraph graph, CatchAllStatement fstat, Record information) {
-
-    HashSet<BasicBlock> tryBlocks = getAllBasicBlocks(fstat.getFirst());
-    HashSet<BasicBlock> catchBlocks = getAllBasicBlocks(fstat.getHandler());
+    Set<BasicBlock> tryBlocks = getAllBasicBlocks(fstat.getFirst());
+    Set<BasicBlock> catchBlocks = getAllBasicBlocks(fstat.getHandler());
 
     int finallytype = information.firstCode;
     Map<BasicBlock, Boolean> mapLast = information.mapLast;
@@ -555,7 +475,7 @@ public class FinallyProcessor {
     }
 
     // identify start blocks
-    HashSet<BasicBlock> startBlocks = new HashSet<>();
+    Set<BasicBlock> startBlocks = new HashSet<>();
     for (BasicBlock block : tryBlocks) {
       startBlocks.addAll(block.getSuccs());
     }
@@ -618,12 +538,11 @@ public class FinallyProcessor {
 
   private Area compareSubgraphsEx(ControlFlowGraph graph,
                                   BasicBlock startSample,
-                                  HashSet<BasicBlock> catchBlocks,
+                                  Set<BasicBlock> catchBlocks,
                                   BasicBlock startCatch,
                                   int finallytype,
                                   Map<BasicBlock, Boolean> mapLast,
                                   boolean skippedFirst) {
-
     class BlockStackEntry {
       public BasicBlock blockCatch;
       public BasicBlock blockSample;
@@ -677,7 +596,6 @@ public class FinallyProcessor {
         }
       }
 
-
       // exception successors
       if (isLastBlock && blockSample.getSeq().isEmpty()) {
         // do nothing, blockSample will be removed anyway
@@ -706,7 +624,7 @@ public class FinallyProcessor {
                   if (instrCatch.opcode == CodeConstants.opc_astore &&
                       instrSample.opcode == CodeConstants.opc_astore) {
                     lst = new ArrayList<>(lst);
-                    lst.add(new int[]{instrCatch.getOperand(0), instrSample.getOperand(0)});
+                    lst.add(new int[]{instrCatch.operand(0), instrSample.operand(0)});
                   }
                 }
 
@@ -743,7 +661,6 @@ public class FinallyProcessor {
   }
 
   private static BasicBlock getUniqueNext(ControlFlowGraph graph, Set<BasicBlock[]> setNext) {
-
     // precondition: there is at most one true exit path in a finally statement
 
     BasicBlock next = null;
@@ -784,13 +701,11 @@ public class FinallyProcessor {
                 Instruction instrNext = seqNext.getInstr(i);
                 Instruction instrBlock = seqBlock.getInstr(i);
 
-                if (instrNext.opcode != instrBlock.opcode || instrNext.wide != instrBlock.wide
-                    || instrNext.operandsCount() != instrBlock.operandsCount()) {
+                if (!Instruction.equals(instrNext, instrBlock)) {
                   return null;
                 }
-
-                for (int j = 0; j < instrNext.getOperands().length; j++) {
-                  if (instrNext.getOperand(j) != instrBlock.getOperand(j)) {
+                for (int j = 0; j < instrNext.operandsCount(); j++) {
+                  if (instrNext.operand(j) != instrBlock.operand(j)) {
                     return null;
                   }
                 }
@@ -832,7 +747,6 @@ public class FinallyProcessor {
                                        int type,
                                        int finallytype,
                                        List<int[]> lstStoreVars) {
-
     InstructionSequence seqPattern = pattern.getSeq();
     InstructionSequence seqSample = sample.getSeq();
 
@@ -871,7 +785,6 @@ public class FinallyProcessor {
     }
 
     if (seqPattern.length() < seqSample.length()) { // split in two blocks
-
       SimpleInstructionSequence seq = new SimpleInstructionSequence();
       LinkedList<Integer> oldOffsets = new LinkedList<>();
       for (int i = seqSample.length() - 1; i >= seqPattern.length(); i--) {
@@ -916,19 +829,15 @@ public class FinallyProcessor {
   }
 
   public boolean equalInstructions(Instruction first, Instruction second, List<int[]> lstStoreVars) {
-    if (first.opcode != second.opcode || first.wide != second.wide
-        || first.operandsCount() != second.operandsCount()) {
+    if (!Instruction.equals(first, second)) {
       return false;
     }
 
-    if (first.group != CodeConstants.GROUP_JUMP && first.getOperands() != null) { // FIXME: switch comparison
-      for (int i = 0; i < first.getOperands().length; i++) {
-
-        int firstOp = first.getOperand(i);
-        int secondOp = second.getOperand(i);
-
+    if (first.group != CodeConstants.GROUP_JUMP) { // FIXME: switch comparison
+      for (int i = 0; i < first.operandsCount(); i++) {
+        int firstOp = first.operand(i);
+        int secondOp = second.operand(i);
         if (firstOp != secondOp) {
-
           // a-load/store instructions
           if (first.opcode == CodeConstants.opc_aload || first.opcode == CodeConstants.opc_astore) {
             for (int[] arr : lstStoreVars) {
@@ -947,7 +856,6 @@ public class FinallyProcessor {
   }
 
   private static void deleteArea(ControlFlowGraph graph, Area area) {
-
     BasicBlock start = area.start;
     BasicBlock next = area.next;
 
@@ -1021,18 +929,15 @@ public class FinallyProcessor {
     }
 
     if (is_outside_range) {
-
       // new empty block
       BasicBlock emptyblock = new BasicBlock(++graph.last_id);
 
       graph.getBlocks().addWithKey(emptyblock, emptyblock.id);
 
       // add to ranges if necessary
-      if (setCommonRemovedExceptionRanges != null) {
-        for (ExceptionRangeCFG range : setCommonRemovedExceptionRanges) {
-          emptyblock.addSuccessorException(range.getHandler());
-          range.getProtectedRange().add(emptyblock);
-        }
+      for (ExceptionRangeCFG range : setCommonRemovedExceptionRanges) {
+        emptyblock.addSuccessorException(range.getHandler());
+        range.getProtectedRange().add(emptyblock);
       }
 
       // insert between predecessors and next
@@ -1044,7 +949,6 @@ public class FinallyProcessor {
   }
 
   private static void removeExceptionInstructionsEx(BasicBlock block, int blocktype, int finallytype) {
-
     InstructionSequence seq = block.getSeq();
 
     if (finallytype == 3) { // empty finally handler
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
index a7b4113..4e26c7f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
@@ -111,7 +111,7 @@ public class IdeaNotNullHelper {
         return false;
       }
 
-      removeParameterCheck(stat, mt);
+      removeParameterCheck(stat);
 
       return true;
     }
@@ -119,7 +119,7 @@ public class IdeaNotNullHelper {
     return false;
   }
 
-  private static void removeParameterCheck(Statement stat, StructMethod mt) {
+  private static void removeParameterCheck(Statement stat) {
 
     Statement st = stat.getFirst();
     while (st.type == Statement.TYPE_SEQUENCE) {
@@ -128,11 +128,7 @@ public class IdeaNotNullHelper {
 
     IfStatement ifstat = (IfStatement)st;
 
-    if (ifstat.getElsestat() == null) { // if
-      // TODO:
-    }
-    else { // if - else
-
+    if (ifstat.getElsestat() != null) { // if - else
       StatEdge ifedge = ifstat.getIfEdge();
       StatEdge elseedge = ifstat.getElseEdge();
 
@@ -171,11 +167,7 @@ public class IdeaNotNullHelper {
       }
     }
 
-    if (is_notnull_check) {
-      return removeReturnCheck(stat, mt);
-    }
-
-    return false;
+    return is_notnull_check && removeReturnCheck(stat, mt);
   }
 
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index 7d6df79..379fb52 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -61,9 +61,7 @@ public class IfHelper {
     return res;
   }
 
-
   public static boolean mergeIfs(Statement statement, HashSet<Integer> setReorderedIfs) {
-
     if (statement.type != Statement.TYPE_IF && statement.type != Statement.TYPE_SEQUENCE) {
       return false;
     }
@@ -71,7 +69,6 @@ public class IfHelper {
     boolean res = false;
 
     while (true) {
-
       boolean updated = false;
 
       List<Statement> lst = new ArrayList<>();
@@ -85,7 +82,6 @@ public class IfHelper {
       boolean stsingle = (lst.size() == 1);
 
       for (Statement stat : lst) {
-
         if (stat.type == Statement.TYPE_IF) {
           IfNode rtnode = buildGraph((IfStatement)stat, stsingle);
 
@@ -98,7 +94,6 @@ public class IfHelper {
           }
 
           if (!setReorderedIfs.contains(stat.id)) {
-
             if (updated = collapseIfElse(rtnode)) {
               break;
             }
@@ -119,14 +114,13 @@ public class IfHelper {
         break;
       }
 
-      res |= updated;
+      res |= true;
     }
 
     return res;
   }
 
   private static boolean collapseIfIf(IfNode rtnode) {
-
     if (rtnode.edgetypes.get(0) == 0) {
       IfNode ifbranch = rtnode.succs.get(0);
       if (ifbranch.succs.size() == 2) {
@@ -144,7 +138,7 @@ public class IfHelper {
             ifchild.removeSuccessor(ifchild.getAllSuccessorEdges().get(0));
             ifparent.getStats().removeWithKey(ifchild.id);
 
-            if (ifbranch.edgetypes.get(0).intValue() == 1) { // target null
+            if (ifbranch.edgetypes.get(0) == 1) { // target null
 
               ifparent.setIfstat(null);
 
@@ -200,7 +194,7 @@ public class IfHelper {
 
   private static boolean collapseIfElse(IfNode rtnode) {
 
-    if (rtnode.edgetypes.get(0).intValue() == 0) {
+    if (rtnode.edgetypes.get(0) == 0) {
       IfNode ifbranch = rtnode.succs.get(0);
       if (ifbranch.succs.size() == 2) {
 
@@ -216,8 +210,8 @@ public class IfHelper {
             ifchild.getFirst().removeSuccessor(ifchild.getIfEdge());
             ifparent.getStats().removeWithKey(ifchild.id);
 
-            if (ifbranch.edgetypes.get(1).intValue() == 1 &&
-                ifbranch.edgetypes.get(0).intValue() == 1) { // target null
+            if (ifbranch.edgetypes.get(1) == 1 &&
+                ifbranch.edgetypes.get(0) == 1) { // target null
 
               ifparent.setIfstat(null);
 
@@ -254,7 +248,7 @@ public class IfHelper {
 
   private static boolean collapseElse(IfNode rtnode) {
 
-    if (rtnode.edgetypes.get(1).intValue() == 0) {
+    if (rtnode.edgetypes.get(1) == 0) {
       IfNode elsebranch = rtnode.succs.get(1);
       if (elsebranch.succs.size() == 2) {
 
@@ -419,16 +413,14 @@ public class IfHelper {
     return res;
   }
 
-
   // FIXME: rewrite the entire method!!! keep in mind finally exits!!
   private static boolean reorderIf(IfStatement ifstat) {
-
     if (ifstat.iftype == IfStatement.IFTYPE_IFELSE) {
       return false;
     }
 
-    boolean ifdirect = false, elsedirect = false;
-    boolean noifstat = false, noelsestat = false;
+    boolean ifdirect, elsedirect;
+    boolean noifstat = false, noelsestat;
     boolean ifdirectpath = false, elsedirectpath = false;
 
     Statement parent = ifstat.getParent();
@@ -439,32 +431,20 @@ public class IfHelper {
     if (ifstat.getIfstat() == null) {
       noifstat = true;
 
-      if (ifstat.getIfEdge().getType() == StatEdge.TYPE_FINALLYEXIT) {
-        ifdirect = true;
-      }
-      else {
-        ifdirect = MergeHelper.isDirectPath(from, ifstat.getIfEdge().getDestination());
-      }
+      ifdirect = ifstat.getIfEdge().getType() == StatEdge.TYPE_FINALLYEXIT ||
+                 MergeHelper.isDirectPath(from, ifstat.getIfEdge().getDestination());
     }
     else {
       List<StatEdge> lstSuccs = ifstat.getIfstat().getAllSuccessorEdges();
-      if (!lstSuccs.isEmpty() && lstSuccs.get(0).getType() == StatEdge.TYPE_FINALLYEXIT) {
-        ifdirect = true;
-      }
-      else {
-        ifdirect = hasDirectEndEdge(ifstat.getIfstat(), from);
-      }
+      ifdirect = !lstSuccs.isEmpty() && lstSuccs.get(0).getType() == StatEdge.TYPE_FINALLYEXIT ||
+                 hasDirectEndEdge(ifstat.getIfstat(), from);
     }
 
     Statement last = parent.type == Statement.TYPE_SEQUENCE ? parent.getStats().getLast() : ifstat;
     noelsestat = (last == ifstat);
 
-    if (!last.getAllSuccessorEdges().isEmpty() && last.getAllSuccessorEdges().get(0).getType() == StatEdge.TYPE_FINALLYEXIT) {
-      elsedirect = true;
-    }
-    else {
-      elsedirect = hasDirectEndEdge(last, from);
-    }
+    elsedirect = !last.getAllSuccessorEdges().isEmpty() && last.getAllSuccessorEdges().get(0).getType() == StatEdge.TYPE_FINALLYEXIT ||
+                 hasDirectEndEdge(last, from);
 
     if (!noelsestat && existsPath(ifstat, ifstat.getAllSuccessorEdges().get(0).getDestination())) {
       return false;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
index 6fb86db..dd431f1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
@@ -186,21 +186,13 @@ public class InlineSingleBlockHelper {
   }
 
   public static boolean isBreakEdgeLabeled(Statement source, Statement closure) {
-
     if (closure.type == Statement.TYPE_DO || closure.type == Statement.TYPE_SWITCH) {
-
       Statement parent = source.getParent();
-
-      if (parent == closure) {
-        return false;
-      }
-      else {
-        return parent.type == Statement.TYPE_DO || parent.type == Statement.TYPE_SWITCH ||
-               isBreakEdgeLabeled(parent, closure);
-      }
+      return parent != closure &&
+             (parent.type == Statement.TYPE_DO || parent.type == Statement.TYPE_SWITCH || isBreakEdgeLabeled(parent, closure));
     }
     else {
       return true;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
index 7d79f81..9c150b5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
@@ -265,7 +265,7 @@ public class LabelHelper {
           Statement stlast = swst.getCaseStatements().get(last);
           if (stlast.getExprents() != null && stlast.getExprents().isEmpty()) {
             StatEdge edge = stlast.getAllSuccessorEdges().get(0);
-            mapEdges.put(edge.getDestination(), new ArrayList<>(Arrays.asList(new StatEdge[]{edge})));
+            mapEdges.put(edge.getDestination(), new ArrayList<>(Collections.singletonList(edge)));
           }
           else {
             mapEdges = setExplicitEdges(stlast);
@@ -326,7 +326,7 @@ public class LabelHelper {
             edge.explicit = false;
           }
 
-          mapEdges.put(newedge.getDestination(), new ArrayList<>(Arrays.asList(new StatEdge[]{newedge})));
+          mapEdges.put(newedge.getDestination(), new ArrayList<>(Collections.singletonList(newedge)));
         }
       }
     }
@@ -374,7 +374,7 @@ public class LabelHelper {
     }
 
     if (statedge != null) {
-      mapEdges.put(statedge.getDestination(), new ArrayList<>(Arrays.asList(new StatEdge[]{statedge})));
+      mapEdges.put(statedge.getDestination(), new ArrayList<>(Collections.singletonList(statedge)));
     }
   }
 
@@ -406,24 +406,26 @@ public class LabelHelper {
     }
   }
 
-  private static HashSet<Statement>[] processStatementLabel(Statement stat) {
+  private static class LabelSets {
+    private final Set<Statement> breaks = new HashSet<>();
+    private final Set<Statement> continues = new HashSet<>();
+  }
 
-    HashSet<Statement> setBreak = new HashSet<>();
-    HashSet<Statement> setContinue = new HashSet<>();
+  private static LabelSets processStatementLabel(Statement stat) {
+    LabelSets sets = new LabelSets();
 
     if (stat.getExprents() == null) {
       for (Statement st : stat.getStats()) {
-        HashSet<Statement>[] arr = processStatementLabel(st);
-
-        setBreak.addAll(arr[0]);
-        setContinue.addAll(arr[1]);
+        LabelSets nested = processStatementLabel(st);
+        sets.breaks.addAll(nested.breaks);
+        sets.continues.addAll(nested.continues);
       }
 
       boolean shieldType = (stat.type == Statement.TYPE_DO || stat.type == Statement.TYPE_SWITCH);
       if (shieldType) {
         for (StatEdge edge : stat.getLabelEdges()) {
-          if (edge.explicit && ((edge.getType() == StatEdge.TYPE_BREAK && setBreak.contains(edge.getSource())) ||
-                                (edge.getType() == StatEdge.TYPE_CONTINUE && setContinue.contains(edge.getSource())))) {
+          if (edge.explicit && ((edge.getType() == StatEdge.TYPE_BREAK && sets.breaks.contains(edge.getSource())) ||
+                                (edge.getType() == StatEdge.TYPE_CONTINUE && sets.continues.contains(edge.getSource())))) {
             edge.labeled = false;
           }
         }
@@ -431,16 +433,16 @@ public class LabelHelper {
 
       switch (stat.type) {
         case Statement.TYPE_DO:
-          setContinue.clear();
+          sets.continues.clear();
         case Statement.TYPE_SWITCH:
-          setBreak.clear();
+          sets.breaks.clear();
       }
     }
 
-    setBreak.add(stat);
-    setContinue.add(stat);
+    sets.breaks.add(stat);
+    sets.continues.add(stat);
 
-    return new HashSet[] { setBreak, setContinue };
+    return sets;
   }
 
   public static void replaceContinueWithBreak(Statement stat) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
index 1c1de82..8229127 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
@@ -58,9 +58,7 @@ public class LoopExtractHelper {
     return res ? 1 : 0;
   }
 
-
   private static boolean extractLoop(DoStatement stat) {
-
     if (stat.getLooptype() != DoStatement.LOOP_DO) {
       return false;
     }
@@ -71,12 +69,7 @@ public class LoopExtractHelper {
       }
     }
 
-    if (!extractLastIf(stat)) {
-      return extractFirstIf(stat);
-    }
-    else {
-      return true;
-    }
+    return extractLastIf(stat) || extractFirstIf(stat);
   }
 
   private static boolean extractLastIf(DoStatement stat) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
deleted file mode 100644
index 75f4cb2..0000000
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.modules.decompiler;
-
-import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
-import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement;
-
-import java.util.List;
-
-public class LowBreakHelper {
-
-  public static void lowBreakLabels(Statement root) {
-
-    lowBreakLabelsRec(root);
-
-    liftBreakLabels(root);
-  }
-
-  private static void lowBreakLabelsRec(Statement stat) {
-
-    while (true) {
-
-      boolean found = false;
-
-      for (StatEdge edge : stat.getLabelEdges()) {
-        if (edge.getType() == StatEdge.TYPE_BREAK) {
-          Statement minclosure = getMinClosure(stat, edge.getSource());
-          if (minclosure != stat) {
-            minclosure.addLabeledEdge(edge);
-            edge.labeled = isBreakEdgeLabeled(edge.getSource(), minclosure);
-            found = true;
-            break;
-          }
-        }
-      }
-
-      if (!found) {
-        break;
-      }
-    }
-
-    for (Statement st : stat.getStats()) {
-      lowBreakLabelsRec(st);
-    }
-  }
-
-  public static boolean isBreakEdgeLabeled(Statement source, Statement closure) {
-
-    if (closure.type == Statement.TYPE_DO || closure.type == Statement.TYPE_SWITCH) {
-
-      Statement parent = source.getParent();
-
-      if (parent == closure) {
-        return false;
-      }
-      else {
-        return isBreakEdgeLabeled(parent, closure) ||
-               (parent.type == Statement.TYPE_DO || parent.type == Statement.TYPE_SWITCH);
-      }
-    }
-    else {
-      return true;
-    }
-  }
-
-  public static Statement getMinClosure(Statement closure, Statement source) {
-
-    while (true) {
-
-      Statement newclosure = null;
-
-      switch (closure.type) {
-        case Statement.TYPE_SEQUENCE:
-          Statement last = closure.getStats().getLast();
-
-          if (isOkClosure(closure, source, last)) {
-            newclosure = last;
-          }
-          break;
-        case Statement.TYPE_IF:
-          IfStatement ifclosure = (IfStatement)closure;
-          if (isOkClosure(closure, source, ifclosure.getIfstat())) {
-            newclosure = ifclosure.getIfstat();
-          }
-          else if (isOkClosure(closure, source, ifclosure.getElsestat())) {
-            newclosure = ifclosure.getElsestat();
-          }
-          break;
-        case Statement.TYPE_TRYCATCH:
-          for (Statement st : closure.getStats()) {
-            if (isOkClosure(closure, source, st)) {
-              newclosure = st;
-              break;
-            }
-          }
-          break;
-        case Statement.TYPE_SYNCRONIZED:
-          Statement body = ((SynchronizedStatement)closure).getBody();
-
-          if (isOkClosure(closure, source, body)) {
-            newclosure = body;
-          }
-      }
-
-      if (newclosure == null) {
-        break;
-      }
-
-      closure = newclosure;
-    }
-
-    return closure;
-  }
-
-  private static boolean isOkClosure(Statement closure, Statement source, Statement stat) {
-
-    boolean ok = false;
-
-    if (stat != null && stat.containsStatementStrict(source)) {
-
-      List<StatEdge> lst = stat.getAllSuccessorEdges();
-
-      ok = lst.isEmpty();
-      if (!ok) {
-        StatEdge edge = lst.get(0);
-        ok = (edge.closure == closure && edge.getType() == StatEdge.TYPE_BREAK);
-      }
-    }
-
-    return ok;
-  }
-
-
-  private static void liftBreakLabels(Statement stat) {
-
-    for (Statement st : stat.getStats()) {
-      liftBreakLabels(st);
-    }
-
-
-    while (true) {
-
-      boolean found = false;
-
-      for (StatEdge edge : stat.getLabelEdges()) {
-        if (edge.explicit && edge.labeled && edge.getType() == StatEdge.TYPE_BREAK) {
-
-          Statement newclosure = getMaxBreakLift(stat, edge);
-
-          if (newclosure != null) {
-            newclosure.addLabeledEdge(edge);
-            edge.labeled = isBreakEdgeLabeled(edge.getSource(), newclosure);
-
-            found = true;
-            break;
-          }
-        }
-      }
-
-      if (!found) {
-        break;
-      }
-    }
-  }
-
-  private static Statement getMaxBreakLift(Statement stat, StatEdge edge) {
-
-    Statement closure = null;
-    Statement newclosure = stat;
-
-    while ((newclosure = getNextBreakLift(newclosure, edge)) != null) {
-      closure = newclosure;
-    }
-
-    return closure;
-  }
-
-  private static Statement getNextBreakLift(Statement stat, StatEdge edge) {
-
-    Statement closure = stat.getParent();
-
-    while (closure != null && !closure.containsStatementStrict(edge.getDestination())) {
-
-      boolean labeled = isBreakEdgeLabeled(edge.getSource(), closure);
-      if (closure.isLabeled() || !labeled) {
-        return closure;
-      }
-
-      closure = closure.getParent();
-    }
-
-    return null;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
index f0eda8e..779aeb8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -13,16 +13,12 @@ import java.util.List;
 import java.util.Set;
 
 public class MergeHelper {
-
   public static void enhanceLoops(Statement root) {
-
-    while (enhanceLoopsRec(root)) ;
-
+    while (enhanceLoopsRec(root)) /**/;
     SequenceHelper.condenseSequences(root);
   }
 
   private static boolean enhanceLoopsRec(Statement stat) {
-
     boolean res = false;
 
     for (Statement st : stat.getStats()) {
@@ -39,7 +35,6 @@ public class MergeHelper {
   }
 
   private static boolean enhanceLoop(DoStatement stat) {
-
     int oldloop = stat.getLooptype();
 
     switch (oldloop) {
@@ -63,8 +58,7 @@ public class MergeHelper {
     return (stat.getLooptype() != oldloop);
   }
 
-  private static boolean matchDoWhile(DoStatement stat) {
-
+  private static void matchDoWhile(DoStatement stat) {
     // search for an if condition at the end of the loop
     Statement last = stat.getFirst();
     while (last.type == Statement.TYPE_SEQUENCE) {
@@ -86,10 +80,9 @@ public class MergeHelper {
           set.remove(last);
 
           if (!set.isEmpty()) {
-            return false;
+            return;
           }
 
-
           stat.setLooptype(DoStatement.LOOP_DOWHILE);
 
           IfExprent ifexpr = (IfExprent)lastif.getHeadexprent().copy();
@@ -121,12 +114,9 @@ public class MergeHelper {
             }
             stat.addSuccessor(edge);
           }
-
-          return true;
         }
       }
     }
-    return false;
   }
 
   private static boolean matchWhile(DoStatement stat) {
@@ -277,15 +267,14 @@ public class MergeHelper {
     }
   }
 
-  private static boolean matchFor(DoStatement stat) {
-
-    Exprent lastDoExprent = null, initDoExprent = null;
-    Statement lastData = null, preData = null;
+  private static void matchFor(DoStatement stat) {
+    Exprent lastDoExprent, initDoExprent;
+    Statement lastData, preData = null;
 
     // get last exprent
     lastData = getLastDirectData(stat.getFirst());
     if (lastData == null || lastData.getExprents().isEmpty()) {
-      return false;
+      return;
     }
 
     List<Exprent> lstExpr = lastData.getExprents();
@@ -298,11 +287,9 @@ public class MergeHelper {
       }
     }
 
-    boolean haslast = issingle || (lastDoExprent.type == Exprent.EXPRENT_ASSIGNMENT ||
-                                   lastDoExprent.type == Exprent.EXPRENT_FUNCTION);
-
+    boolean haslast = issingle || lastDoExprent.type == Exprent.EXPRENT_ASSIGNMENT || lastDoExprent.type == Exprent.EXPRENT_FUNCTION;
     if (!haslast) {
-      return false;
+      return;
     }
 
     boolean hasinit = false;
@@ -336,13 +323,12 @@ public class MergeHelper {
       }
     }
 
-    if ((hasinit && haslast) || issingle) {  // FIXME: issingle sufficient?
-
+    if (hasinit || issingle) {  // FIXME: issingle sufficient?
       Set<Statement> set = stat.getNeighboursSet(StatEdge.TYPE_CONTINUE, Statement.DIRECTION_BACKWARD);
       set.remove(lastData);
 
       if (!set.isEmpty()) {
-        return false;
+        return;
       }
 
       stat.setLooptype(DoStatement.LOOP_FOR);
@@ -359,8 +345,6 @@ public class MergeHelper {
       }
       removeLastEmptyStatement(stat, lastData);
     }
-
-    return true;
   }
 
   private static void removeLastEmptyStatement(DoStatement dostat, Statement stat) {
@@ -388,7 +372,6 @@ public class MergeHelper {
   }
 
   private static Statement getLastDirectData(Statement stat) {
-
     if (stat.getExprents() != null) {
       return stat;
     }
@@ -404,4 +387,4 @@ public class MergeHelper {
     }
     return null;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
index 740c2bb..a7c804b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
@@ -164,7 +164,7 @@ public class SecondaryFunctionsHelper {
                 if (index >= 0 && index <= 2) {
                   Integer destcon = destcons[index];
                   if (destcon != null) {
-                    desttype = destcon.intValue();
+                    desttype = destcon;
                   }
                 }
               }
@@ -208,10 +208,10 @@ public class SecondaryFunctionsHelper {
                 ConstExprent cexpr = (ConstExprent)operand;
                 long val;
                 if (operandtype.type == CodeConstants.TYPE_LONG) {
-                  val = ((Long)cexpr.getValue()).longValue();
+                  val = (Long)cexpr.getValue();
                 }
                 else {
-                  val = ((Integer)cexpr.getValue()).intValue();
+                  val = (Integer)cexpr.getValue();
                 }
 
                 if (val == -1) {
@@ -229,7 +229,7 @@ public class SecondaryFunctionsHelper {
               for (int i = 0; i < 2; i++) {
                 if (lstOperands.get(i).type == Exprent.EXPRENT_CONST) {
                   ConstExprent cexpr = (ConstExprent)lstOperands.get(i);
-                  int val = ((Integer)cexpr.getValue()).intValue();
+                  int val = (Integer)cexpr.getValue();
 
                   if ((fexpr.getFuncType() == FunctionExprent.FUNCTION_EQ && val == 1) ||
                       (fexpr.getFuncType() == FunctionExprent.FUNCTION_NE && val == 0)) {
@@ -248,10 +248,10 @@ public class SecondaryFunctionsHelper {
             if (lstOperands.get(0).type == Exprent.EXPRENT_CONST) {
               int val = ((ConstExprent)lstOperands.get(0)).getIntValue();
               if (val == 0) {
-                return new ConstExprent(VarType.VARTYPE_BOOLEAN, Integer.valueOf(1), fexpr.bytecode);
+                return new ConstExprent(VarType.VARTYPE_BOOLEAN, 1, fexpr.bytecode);
               }
               else {
-                return new ConstExprent(VarType.VARTYPE_BOOLEAN, Integer.valueOf(0), fexpr.bytecode);
+                return new ConstExprent(VarType.VARTYPE_BOOLEAN, 0, fexpr.bytecode);
               }
             }
             break;
@@ -286,8 +286,8 @@ public class SecondaryFunctionsHelper {
             FunctionExprent iff = new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
               new FunctionExprent(FunctionExprent.FUNCTION_LT, Arrays.asList(new VarExprent(var, type, varProc),
                 ConstExprent.getZeroConstant(type.type)), null),
-              new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(-1), null),
-              new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(1), null)), null);
+              new ConstExprent(VarType.VARTYPE_INT, -1, null),
+              new ConstExprent(VarType.VARTYPE_INT, 1, null)), null);
 
             FunctionExprent head = new FunctionExprent(FunctionExprent.FUNCTION_EQ, Arrays.asList(
               new AssignmentExprent(new VarExprent(var, type, varProc),
@@ -298,7 +298,7 @@ public class SecondaryFunctionsHelper {
             varProc.setVarType(new VarVersionPair(var, 0), type);
 
             return new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
-              head, new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(0), null), iff), fexpr.bytecode);
+              head, new ConstExprent(VarType.VARTYPE_INT, 0, null), iff), fexpr.bytecode);
         }
         break;
       case Exprent.EXPRENT_ASSIGNMENT: // check for conditional assignment
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index ffdfa21..3a4d088 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -21,7 +21,6 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class SimplifyExprentsHelper {
-
   static final MatchEngine class14Builder = new MatchEngine();
 
   private final boolean firstInvocation;
@@ -31,15 +30,12 @@ public class SimplifyExprentsHelper {
   }
 
   public boolean simplifyStackVarsStatement(Statement stat, HashSet<Integer> setReorderedIfs, SSAConstructorSparseEx ssa, StructClass cl) {
-
     boolean res = false;
 
     if (stat.getExprents() == null) {
-
       boolean processClass14 = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4);
 
       while (true) {
-
         boolean changed = false;
 
         for (Statement st : stat.getStats()) {
@@ -69,27 +65,24 @@ public class SimplifyExprentsHelper {
       }
     }
     else {
-      res |= simplifyStackVarsExprents(stat.getExprents(), cl);
+      res = simplifyStackVarsExprents(stat.getExprents(), cl);
     }
 
     return res;
   }
 
   private boolean simplifyStackVarsExprents(List<Exprent> list, StructClass cl) {
-
     boolean res = false;
 
     int index = 0;
 
     while (index < list.size()) {
-
       Exprent current = list.get(index);
 
       Exprent ret = isSimpleConstructorInvocation(current);
       if (ret != null) {
         list.set(index, ret);
         res = true;
-
         continue;
       }
 
@@ -98,7 +91,6 @@ public class SimplifyExprentsHelper {
       if (ret != null) {
         list.set(index, ret);
         res = true;
-
         continue;
       }
 
@@ -106,7 +98,6 @@ public class SimplifyExprentsHelper {
       if (isMonitorExit(current)) {
         list.remove(index);
         res = true;
-
         continue;
       }
 
@@ -114,7 +105,6 @@ public class SimplifyExprentsHelper {
       if (isTrivialStackAssignment(current)) {
         list.remove(index);
         res = true;
-
         continue;
       }
 
@@ -122,15 +112,12 @@ public class SimplifyExprentsHelper {
         break;
       }
 
-
       Exprent next = list.get(index + 1);
 
-
       // constructor invocation
       if (isConstructorInvocationRemote(list, index)) {
         list.remove(index);
         res = true;
-
         continue;
       }
 
@@ -139,7 +126,6 @@ public class SimplifyExprentsHelper {
         if (isQualifiedNewGetClass(current, next)) {
           list.remove(index);
           res = true;
-
           continue;
         }
       }
@@ -151,7 +137,6 @@ public class SimplifyExprentsHelper {
           list.remove(index + 1);
         }
         res = true;
-
         continue;
       }
 
@@ -159,7 +144,6 @@ public class SimplifyExprentsHelper {
       if (addArrayInitializer(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
@@ -168,7 +152,6 @@ public class SimplifyExprentsHelper {
       if (func != null) {
         list.set(index, func);
         res = true;
-
         continue;
       }
 
@@ -176,7 +159,6 @@ public class SimplifyExprentsHelper {
       if (isIPPorIMM(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
@@ -184,14 +166,12 @@ public class SimplifyExprentsHelper {
       if (isStackAssignement(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
       if (!firstInvocation && isStackAssignement2(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
@@ -202,7 +182,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean addArrayInitializer(Exprent first, Exprent second) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent as = (AssignmentExprent)first;
 
@@ -210,7 +189,6 @@ public class SimplifyExprentsHelper {
         NewExprent newex = (NewExprent)as.getRight();
 
         if (!newex.getLstArrayElements().isEmpty()) {
-
           VarExprent arrvar = (VarExprent)as.getLeft();
 
           if (second.type == Exprent.EXPRENT_ASSIGNMENT) {
@@ -226,13 +204,10 @@ public class SimplifyExprentsHelper {
                   Exprent init = newex.getLstArrayElements().get(constvalue);
                   if (init.type == Exprent.EXPRENT_CONST) {
                     ConstExprent cinit = (ConstExprent)init;
-
                     VarType arrtype = newex.getNewType().decreaseArrayDim();
-
                     ConstExprent defaultval = ExprProcessor.getDefaultArrayValue(arrtype);
 
                     if (cinit.equals(defaultval)) {
-
                       Exprent tempexpr = aas.getRight();
 
                       if (!tempexpr.containsExprent(arrvar)) {
@@ -261,9 +236,7 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-
   private static int isArrayInitializer(List<Exprent> list, int index) {
-
     Exprent current = list.get(index);
     if (current.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent as = (AssignmentExprent)current;
@@ -274,7 +247,7 @@ public class SimplifyExprentsHelper {
         if (newex.getExprType().arrayDim > 0 && newex.getLstDims().size() == 1 && newex.getLstArrayElements().isEmpty() &&
             newex.getLstDims().get(0).type == Exprent.EXPRENT_CONST) {
 
-          int size = ((Integer)((ConstExprent)newex.getLstDims().get(0)).getValue()).intValue();
+          int size = (Integer)((ConstExprent)newex.getLstDims().get(0)).getValue();
           if (size == 0) {
             return 0;
           }
@@ -356,7 +329,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean isTrivialStackAssignment(Exprent first) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
 
@@ -364,10 +336,7 @@ public class SimplifyExprentsHelper {
         VarExprent varleft = (VarExprent)asf.getLeft();
         VarExprent varright = (VarExprent)asf.getRight();
 
-        if (varleft.getIndex() == varright.getIndex() && varleft.isStack() &&
-            varright.isStack()) {
-          return true;
-        }
+        return varleft.getIndex() == varright.getIndex() && varleft.isStack() && varright.isStack();
       }
     }
 
@@ -375,7 +344,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean isStackAssignement2(Exprent first, Exprent second) {  // e.g. 1.4-style class invocation
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
       AssignmentExprent ass = (AssignmentExprent)second;
@@ -393,7 +361,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean isStackAssignement(Exprent first, Exprent second) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
       AssignmentExprent ass = (AssignmentExprent)second;
@@ -422,7 +389,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static Exprent isPPIorMMI(Exprent first) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent as = (AssignmentExprent)first;
 
@@ -459,7 +425,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean isIPPorIMM(Exprent first, Exprent second) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_FUNCTION) {
       AssignmentExprent as = (AssignmentExprent)first;
       FunctionExprent in = (FunctionExprent)second;
@@ -485,17 +450,15 @@ public class SimplifyExprentsHelper {
   private static boolean isMonitorExit(Exprent first) {
     if (first.type == Exprent.EXPRENT_MONITOR) {
       MonitorExprent monexpr = (MonitorExprent)first;
-      if (monexpr.getMonType() == MonitorExprent.MONITOR_EXIT && monexpr.getValue().type == Exprent.EXPRENT_VAR
-          && !((VarExprent)monexpr.getValue()).isStack()) {
-        return true;
-      }
+      return monexpr.getMonType() == MonitorExprent.MONITOR_EXIT &&
+             monexpr.getValue().type == Exprent.EXPRENT_VAR &&
+             !((VarExprent)monexpr.getValue()).isStack();
     }
 
     return false;
   }
 
   private static boolean isQualifiedNewGetClass(Exprent first, Exprent second) {
-
     if (first.type == Exprent.EXPRENT_INVOCATION) {
       InvocationExprent invexpr = (InvocationExprent)first;
 
@@ -525,118 +488,8 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-  //	private static boolean isConstructorInvocationRemote(List<Exprent> list, int index) {
-  //
-  //		Exprent current = list.get(index);
-  //
-  //		if(current.type == Exprent.EXPRENT_ASSIGNMENT) {
-  //			AssignmentExprent as = (AssignmentExprent)current;
-  //
-  //			if(as.getLeft().type == Exprent.EXPRENT_VAR && as.getRight().type == Exprent.EXPRENT_NEW) {
-  //
-  //				NewExprent newexpr = (NewExprent)as.getRight();
-  //				VarType newtype = newexpr.getNewType();
-  //				VarVersionPair leftPaar = new VarVersionPair((VarExprent)as.getLeft());
-  //
-  //				if(newtype.type == CodeConstants.TYPE_OBJECT && newtype.arrayDim == 0 &&
-  //						newexpr.getConstructor() == null) {
-  //
-  //					Set<VarVersionPair> setChangedVars = new HashSet<VarVersionPair>();
-  //
-  //					for(int i = index + 1; i < list.size(); i++) {
-  //						Exprent remote = list.get(i);
-  //
-  //						if(remote.type == Exprent.EXPRENT_INVOCATION) {
-  //							InvocationExprent in = (InvocationExprent)remote;
-  //
-  //							if(in.getFuncType() == InvocationExprent.TYP_INIT && in.getInstance().type == Exprent.EXPRENT_VAR
-  //									&& as.getLeft().equals(in.getInstance())) {
-  //
-  //								Set<VarVersionPair>  setVars = remote.getAllVariables();
-  //								setVars.remove(leftPaar);
-  //								setVars.retainAll(setChangedVars);
-  //
-  //								if(setVars.isEmpty()) {
-  //
-  //									newexpr.setConstructor(in);
-  //									in.setInstance(null);
-  //
-  //									if(!setChangedVars.isEmpty()) { // some exprents inbetween
-  //										list.add(index+1, as.copy());
-  //										list.remove(i+1);
-  //									} else {
-  //										list.set(i, as.copy());
-  //									}
-  //
-  //									return true;
-  //								}
-  //							}
-  //						}
-  //
-  //						boolean isTempAssignment = false;
-  //
-  //						if(remote.type == Exprent.EXPRENT_ASSIGNMENT) {    // ugly solution
-  //							AssignmentExprent asremote = (AssignmentExprent)remote;
-  //							if(asremote.getLeft().type == Exprent.EXPRENT_VAR &&
-  //									asremote.getRight().type == Exprent.EXPRENT_VAR) {
-  //								setChangedVars.add(new VarVersionPair((VarExprent)asremote.getLeft()));
-  //								isTempAssignment = true;
-  //							}
-  //
-  //							// FIXME: needs to be rewritten
-  //							// propagate (var = new X) forward to the <init> invokation and then reduce
-  //
-  ////							if(asremote.getLeft().type == Exprent.EXPRENT_VAR) {
-  ////								List<Exprent> lstRightExprents = asremote.getRight().getAllExprents(true);
-  ////								lstRightExprents.add(asremote.getRight());
-  ////
-  ////								Set<VarVersionPair> setTempChangedVars = new HashSet<VarVersionPair>();
-  ////								boolean isTemp = true;
-  ////
-  ////								for(Exprent expr : lstRightExprents) {
-  ////									if(expr.type != Exprent.EXPRENT_VAR && expr.type != Exprent.EXPRENT_FIELD) {
-  ////										isTemp = false;
-  ////										break;
-  ////									} else if(expr.type == Exprent.EXPRENT_VAR) {
-  ////										setTempChangedVars.add(new VarVersionPair((VarExprent)expr));
-  ////									}
-  ////								}
-  ////
-  ////								if(isTemp) {
-  ////									setChangedVars.addAll(setTempChangedVars);
-  ////									isTempAssignment = true;
-  ////								}
-  ////							}
-  ////						} else if(remote.type == Exprent.EXPRENT_FUNCTION) {
-  ////							FunctionExprent fexpr = (FunctionExprent)remote;
-  ////							if(fexpr.getFuncType() == FunctionExprent.FUNCTION_IPP || fexpr.getFuncType() == FunctionExprent.FUNCTION_IMM
-  ////									|| fexpr.getFuncType() == FunctionExprent.FUNCTION_PPI || fexpr.getFuncType() == FunctionExprent.FUNCTION_MMI) {
-  ////								if(fexpr.getLstOperands().get(0).type == Exprent.EXPRENT_VAR) {
-  ////									setChangedVars.add(new VarVersionPair((VarExprent)fexpr.getLstOperands().get(0)));
-  ////									isTempAssignment = true;
-  ////								}
-  ////							}
-  //						}
-  //
-  //						if(!isTempAssignment) {
-  //							Set<VarVersionPair> setVars = remote.getAllVariables();
-  //							if(setVars.contains(leftPaar)) {
-  //								return false;
-  //							} else {
-  //								setChangedVars.addAll(setVars);
-  //							}
-  //						}
-  //					}
-  //				}
-  //			}
-  //		}
-  //
-  //		return false;
-  //	}
-
   // propagate (var = new X) forward to the <init> invokation
   private static boolean isConstructorInvocationRemote(List<Exprent> list, int index) {
-
     Exprent current = list.get(index);
 
     if (current.type == Exprent.EXPRENT_ASSIGNMENT) {
@@ -684,7 +537,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static Exprent isLambda(Exprent exprent, StructClass cl) {
-
     List<Exprent> lst = exprent.getAllExprents();
     for (Exprent expr : lst) {
       Exprent ret = isLambda(expr, cl);
@@ -697,12 +549,10 @@ public class SimplifyExprentsHelper {
       InvocationExprent in = (InvocationExprent)exprent;
 
       if (in.getInvocationTyp() == InvocationExprent.INVOKE_DYNAMIC) {
-
         String lambda_class_name = cl.qualifiedName + in.getInvokeDynamicClassSuffix();
         ClassNode lambda_class = DecompilerContext.getClassProcessor().getMapRootClasses().get(lambda_class_name);
 
         if (lambda_class != null) { // real lambda class found, replace invocation with an anonymous class
-
           NewExprent newexp = new NewExprent(new VarType(lambda_class_name, true), null, 0, in.bytecode);
           newexp.setConstructor(in);
           // note: we don't set the instance to null with in.setInstance(null) like it is done for a common constructor invokation
@@ -717,9 +567,7 @@ public class SimplifyExprentsHelper {
     return null;
   }
 
-
   private static Exprent isSimpleConstructorInvocation(Exprent exprent) {
-
     List<Exprent> lst = exprent.getAllExprents();
     for (Exprent expr : lst) {
       Exprent ret = isSimpleConstructorInvocation(expr);
@@ -741,9 +589,7 @@ public class SimplifyExprentsHelper {
     return null;
   }
 
-
   private static boolean buildIff(Statement stat, SSAConstructorSparseEx ssa) {
-
     if (stat.type == Statement.TYPE_IF && stat.getExprents() == null) {
       IfStatement stif = (IfStatement)stat;
 
@@ -771,7 +617,6 @@ public class SimplifyExprentsHelper {
               VarExprent elsevar = (VarExprent)elseas.getLeft();
 
               if (ifvar.getIndex() == elsevar.getIndex() && ifvar.isStack()) { // ifvar.getIndex() >= VarExprent.STACK_BASE) {
-
                 boolean found = false;
 
                 for (Entry<VarVersionPair, FastSparseSet<Integer>> ent : ssa.getPhi().entrySet()) {
@@ -886,10 +731,8 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean collapseInlinedClass14(Statement stat) {
-
     boolean ret = class14Builder.match(stat);
-    if(ret) {
-
+    if (ret) {
       String class_name = (String)class14Builder.getVariableValue("$classname$");
       AssignmentExprent assfirst = (AssignmentExprent)class14Builder.getVariableValue("$assignfield$");
       FieldExprent fieldexpr = (FieldExprent)class14Builder.getVariableValue("$field$");
@@ -906,10 +749,8 @@ public class SimplifyExprentsHelper {
       if (wrapper != null) {
         wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldexpr.getName(), fieldexpr.getDescriptor().descriptorString));
       }
-
     }
 
     return ret;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index 23dce62..a3b25de 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -222,7 +222,7 @@ public class StackVarsProcessor {
   }
 
 
-  private static Exprent isReplaceableVar(Exprent exprent, HashMap<VarVersionPair, Exprent> mapVarValues, SSAUConstructorSparseEx ssau) {
+  private static Exprent isReplaceableVar(Exprent exprent, HashMap<VarVersionPair, Exprent> mapVarValues) {
 
     Exprent dest = null;
 
@@ -473,7 +473,7 @@ public class StackVarsProcessor {
       }
     }
 
-    Exprent dest = isReplaceableVar(exprent, mapVarValues, ssau);
+    Exprent dest = isReplaceableVar(exprent, mapVarValues);
     if (dest != null) {
       return new Object[]{dest, true, true};
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
index 19ed25e..c481c0a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
@@ -7,9 +7,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class StatEdge {
-
-  public static final int TYPE_ALL = 0xFF;
-
   public static final int TYPE_REGULAR = 1;
   public static final int TYPE_EXCEPTION = 2;
   public static final int TYPE_BREAK = 4;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
index efc0886..80f6d02 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
@@ -4,80 +4,19 @@ package org.jetbrains.java.decompiler.modules.decompiler;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.util.ListStack;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-//  --------------------------------------------------------------------
-//    Algorithm
-//  --------------------------------------------------------------------
-//  DFS(G)
-//  {
-//  make a new vertex x with edges x->v for all v
-//  initialize a counter N to zero
-//  initialize list L to empty
-//  build directed tree T, initially a single vertex {x}
-//  visit(x)
-//  }
-//
-//  visit(p)
-//  {
-//  add p to L
-//  dfsnum(p) = N
-//  increment N
-//  low(p) = dfsnum(p)
-//  for each edge p->q
-//      if q is not already in T
-//      {
-//      add p->q to T
-//      visit(q)
-//      low(p) = min(low(p), low(q))
-//      } else low(p) = min(low(p), dfsnum(q))
-//
-//  if low(p)=dfsnum(p)
-//  {
-//      output "component:"
-//      repeat
-//      remove last element v from L
-//      output v
-//      remove v from G
-//      until v=p
-//  }
-//  }
-//  --------------------------------------------------------------------
+import java.util.*;
 
 public class StrongConnectivityHelper {
+  private final List<List<Statement>> components;
+  private final Set<Statement> setProcessed;
 
   private ListStack<Statement> lstack;
-
   private int ncounter;
-
-  private HashSet<Statement> tset;
-  private HashMap<Statement, Integer> dfsnummap;
-  private HashMap<Statement, Integer> lowmap;
-
-  private List<List<Statement>> components;
-
-  private HashSet<Statement> setProcessed;
-
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
-  public StrongConnectivityHelper() {
-  }
+  private Set<Statement> tset;
+  private Map<Statement, Integer> dfsnummap;
+  private Map<Statement, Integer> lowmap;
 
   public StrongConnectivityHelper(Statement stat) {
-    findComponents(stat);
-  }
-
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public List<List<Statement>> findComponents(Statement stat) {
-
     components = new ArrayList<>();
     setProcessed = new HashSet<>();
 
@@ -95,38 +34,8 @@ public class StrongConnectivityHelper {
         visitTree(st);
       }
     }
-
-    return components;
   }
 
-  public static boolean isExitComponent(List<Statement> lst) {
-
-    HashSet<Statement> set = new HashSet<>();
-    for (Statement stat : lst) {
-      set.addAll(stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD));
-    }
-    set.removeAll(lst);
-
-    return (set.size() == 0);
-  }
-
-  public static List<Statement> getExitReps(List<List<Statement>> lst) {
-
-    List<Statement> res = new ArrayList<>();
-
-    for (List<Statement> comp : lst) {
-      if (isExitComponent(comp)) {
-        res.add(comp.get(0));
-      }
-    }
-
-    return res;
-  }
-
-  // *****************************************************************************
-  // private methods
-  // *****************************************************************************
-
   private void visitTree(Statement stat) {
     lstack = new ListStack<>();
     ncounter = 0;
@@ -141,7 +50,6 @@ public class StrongConnectivityHelper {
   }
 
   private void visit(Statement stat) {
-
     lstack.push(stat);
     dfsnummap.put(stat, ncounter);
     lowmap.put(stat, ncounter);
@@ -150,8 +58,7 @@ public class StrongConnectivityHelper {
     List<Statement> lstSuccs = stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD); // TODO: set?
     lstSuccs.removeAll(setProcessed);
 
-    for (int i = 0; i < lstSuccs.size(); i++) {
-      Statement succ = lstSuccs.get(i);
+    for (Statement succ : lstSuccs) {
       int secvalue;
 
       if (tset.contains(succ)) {
@@ -178,16 +85,29 @@ public class StrongConnectivityHelper {
     }
   }
 
+  public static boolean isExitComponent(List<Statement> lst) {
+    Set<Statement> set = new HashSet<>();
+    for (Statement stat : lst) {
+      set.addAll(stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD));
+    }
+    set.removeAll(lst);
 
-  // *****************************************************************************
-  // getter and setter methods
-  // *****************************************************************************
+    return (set.size() == 0);
+  }
+
+  public static List<Statement> getExitReps(List<List<Statement>> lst) {
+    List<Statement> res = new ArrayList<>();
+
+    for (List<Statement> comp : lst) {
+      if (isExitComponent(comp)) {
+        res.add(comp.get(0));
+      }
+    }
+
+    return res;
+  }
 
   public List<List<Statement>> getComponents() {
     return components;
   }
-
-  public void setComponents(List<List<Statement>> components) {
-    this.components = components;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
index 9015e3d..92ee80e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
@@ -7,7 +7,6 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
-import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement;
 
 import java.util.ArrayList;
@@ -29,18 +28,15 @@ public class SwitchHelper {
       if (classNode != null) {
         MethodWrapper wrapper = classNode.getWrapper().getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
         if (wrapper != null && wrapper.root != null) {
-          wrapper.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
-            @Override
-            public int processExprent(Exprent exprent) {
-              if (exprent instanceof AssignmentExprent) {
-                AssignmentExprent assignment = (AssignmentExprent)exprent;
-                Exprent left = assignment.getLeft();
-                if (left.type == Exprent.EXPRENT_ARRAY && ((ArrayExprent)left).getArray().equals(arrayField)) {
-                  mapping.put(assignment.getRight(), ((InvocationExprent)((ArrayExprent)left).getIndex()).getInstance());
-                }
+          wrapper.getOrBuildGraph().iterateExprents(exprent -> {
+            if (exprent instanceof AssignmentExprent) {
+              AssignmentExprent assignment = (AssignmentExprent)exprent;
+              Exprent left = assignment.getLeft();
+              if (left.type == Exprent.EXPRENT_ARRAY && ((ArrayExprent)left).getArray().equals(arrayField)) {
+                mapping.put(assignment.getRight(), ((InvocationExprent)((ArrayExprent)left).getIndex()).getInstance());
               }
-              return 0;
             }
+            return 0;
           });
         }
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
index 2cebb3a..89babeb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
@@ -31,7 +31,6 @@ public class DominatorTreeExceptionFilter {
   }
 
   public void initialize() {
-
     domEngine = new DominatorEngine(statement);
     domEngine.initialize();
 
@@ -47,12 +46,11 @@ public class DominatorTreeExceptionFilter {
   }
 
   public boolean acceptStatementPair(Integer head, Integer exit) {
-
     Map<Integer, Integer> filter = mapExceptionRangeUniqueExit.get(head);
     for (Entry<Integer, Integer> entry : filter.entrySet()) {
       if (!head.equals(mapExceptionDoms.get(entry.getKey()))) {
         Integer filterExit = entry.getValue();
-        if (filterExit.intValue() == -1 || !filterExit.equals(exit)) {
+        if (filterExit == -1 || !filterExit.equals(exit)) {
           return false;
         }
       }
@@ -62,19 +60,13 @@ public class DominatorTreeExceptionFilter {
   }
 
   private void buildDominatorTree() {
-
     VBStyleCollection<Integer, Integer> orderedIDoms = domEngine.getOrderedIDoms();
 
     List<Integer> lstKeys = orderedIDoms.getLstKeys();
     for (int index = lstKeys.size() - 1; index >= 0; index--) {
       Integer key = lstKeys.get(index);
       Integer idom = orderedIDoms.get(index);
-
-      Set<Integer> set = mapTreeBranches.get(idom);
-      if (set == null) {
-        mapTreeBranches.put(idom, set = new HashSet<>());
-      }
-      set.add(key);
+      mapTreeBranches.computeIfAbsent(idom, k -> new HashSet<>()).add(key);
     }
 
     Integer firstid = statement.getFirst().id;
@@ -82,7 +74,6 @@ public class DominatorTreeExceptionFilter {
   }
 
   private void buildExceptionRanges() {
-
     for (Statement stat : statement.getStats()) {
       List<Statement> lstPreds = stat.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_BACKWARD);
       if (!lstPreds.isEmpty()) {
@@ -101,7 +92,6 @@ public class DominatorTreeExceptionFilter {
   }
 
   private Map<Integer, Integer> buildExceptionDoms(Integer id) {
-
     Map<Integer, Integer> map = new HashMap<>();
 
     Set<Integer> children = mapTreeBranches.get(id);
@@ -123,21 +113,16 @@ public class DominatorTreeExceptionFilter {
     return map;
   }
 
-
   private void buildFilter(Integer id) {
-
     Map<Integer, Integer> map = new HashMap<>();
 
     Set<Integer> children = mapTreeBranches.get(id);
     if (children != null) {
       for (Integer childid : children) {
-
         buildFilter(childid);
 
         Map<Integer, Integer> mapChild = mapExceptionRangeUniqueExit.get(childid);
-
         for (Entry<Integer, Set<Integer>> entry : mapExceptionRanges.entrySet()) {
-
           Integer handler = entry.getKey();
           Set<Integer> range = entry.getValue();
 
@@ -167,4 +152,4 @@ public class DominatorTreeExceptionFilter {
   public DominatorEngine getDomEngine() {
     return domEngine;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
index 174774f..71ef24b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
@@ -117,12 +117,8 @@ public class FastExtendedPostdominanceHelper {
     }
   }
 
-
   private void filterOnExceptionRanges(DominatorTreeExceptionFilter filter) {
-
-
     for (Integer head : new HashSet<>(mapExtPostdominators.keySet())) {
-
       FastFixedSet<Integer> set = mapExtPostdominators.get(head);
       for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
         if (!filter.acceptStatementPair(head, it.next())) {
@@ -135,64 +131,59 @@ public class FastExtendedPostdominanceHelper {
     }
   }
 
-
   private void removeErroneousNodes() {
-
     mapSupportPoints = new HashMap<>();
 
     calcReachabilitySuppPoints(StatEdge.TYPE_REGULAR);
 
-    iterateReachability(new IReachabilityAction() {
-      public boolean action(Statement node, HashMap<Integer, FastFixedSet<Integer>> mapSets) {
+    iterateReachability((node, mapSets) -> {
+      Integer nodeid = node.id;
 
-        Integer nodeid = node.id;
+      FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
+      List<FastFixedSet<Integer>> lstPredSets = new ArrayList<>();
 
-        FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
-        List<FastFixedSet<Integer>> lstPredSets = new ArrayList<>();
-
-        for (StatEdge prededge : node.getPredecessorEdges(StatEdge.TYPE_REGULAR)) {
-          FastFixedSet<Integer> setPred = mapSets.get(prededge.getSource().id);
-          if (setPred == null) {
-            setPred = mapSupportPoints.get(prededge.getSource().id);
-          }
-
-          // setPred cannot be empty as it is a reachability set
-          lstPredSets.add(setPred);
+      for (StatEdge prededge : node.getPredecessorEdges(StatEdge.TYPE_REGULAR)) {
+        FastFixedSet<Integer> setPred = mapSets.get(prededge.getSource().id);
+        if (setPred == null) {
+          setPred = mapSupportPoints.get(prededge.getSource().id);
         }
 
-        for (Integer id : setReachability) {
+        // setPred cannot be empty as it is a reachability set
+        lstPredSets.add(setPred);
+      }
 
-          FastFixedSet<Integer> setReachabilityCopy = setReachability.getCopy();
+      for (Integer id : setReachability) {
 
-          FastFixedSet<Integer> setIntersection = factory.spawnEmptySet();
-          boolean isIntersectionInitialized = false;
+        FastFixedSet<Integer> setReachabilityCopy = setReachability.getCopy();
 
-          for (FastFixedSet<Integer> predset : lstPredSets) {
-            if (predset.contains(id)) {
-              if (!isIntersectionInitialized) {
-                setIntersection.union(predset);
-                isIntersectionInitialized = true;
-              }
-              else {
-                setIntersection.intersection(predset);
-              }
+        FastFixedSet<Integer> setIntersection = factory.spawnEmptySet();
+        boolean isIntersectionInitialized = false;
+
+        for (FastFixedSet<Integer> predset : lstPredSets) {
+          if (predset.contains(id)) {
+            if (!isIntersectionInitialized) {
+              setIntersection.union(predset);
+              isIntersectionInitialized = true;
+            }
+            else {
+              setIntersection.intersection(predset);
             }
           }
-
-          if (nodeid != id.intValue()) {
-            setIntersection.add(nodeid);
-          }
-          else {
-            setIntersection.remove(nodeid);
-          }
-
-          setReachabilityCopy.complement(setIntersection);
-
-          mapExtPostdominators.get(id).complement(setReachabilityCopy);
         }
 
-        return false;
+        if (nodeid != id.intValue()) {
+          setIntersection.add(nodeid);
+        }
+        else {
+          setIntersection.remove(nodeid);
+        }
+
+        setReachabilityCopy.complement(setIntersection);
+
+        mapExtPostdominators.get(id).complement(setReachabilityCopy);
       }
+
+      return false;
     }, StatEdge.TYPE_REGULAR);
 
     // exception handlers cannot be postdominator nodes
@@ -215,9 +206,7 @@ public class FastExtendedPostdominanceHelper {
     }
   }
 
-
   private void calcDefaultReachableSets() {
-
     int edgetype = StatEdge.TYPE_REGULAR | StatEdge.TYPE_EXCEPTION;
 
     calcReachabilitySuppPoints(edgetype);
@@ -226,50 +215,40 @@ public class FastExtendedPostdominanceHelper {
       mapExtPostdominators.put(stat.id, factory.spawnEmptySet());
     }
 
-    iterateReachability(new IReachabilityAction() {
-      public boolean action(Statement node, HashMap<Integer, FastFixedSet<Integer>> mapSets) {
+    iterateReachability((node, mapSets) -> {
+      Integer nodeid = node.id;
+      FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
 
-        Integer nodeid = node.id;
-        FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
-
-        for (Integer id : setReachability) {
-          mapExtPostdominators.get(id).add(nodeid);
-        }
-
-        return false;
+      for (Integer id : setReachability) {
+        mapExtPostdominators.get(id).add(nodeid);
       }
+
+      return false;
     }, edgetype);
   }
 
-
   private void calcReachabilitySuppPoints(final int edgetype) {
+    iterateReachability((node, mapSets) -> {
+      // consider to be a support point
+      for (StatEdge sucedge : node.getAllSuccessorEdges()) {
+        if ((sucedge.getType() & edgetype) != 0) {
+          if (mapSets.containsKey(sucedge.getDestination().id)) {
+            FastFixedSet<Integer> setReachability = mapSets.get(node.id);
 
-    iterateReachability(new IReachabilityAction() {
-      public boolean action(Statement node, HashMap<Integer, FastFixedSet<Integer>> mapSets) {
-
-        // consider to be a support point
-        for (StatEdge sucedge : node.getAllSuccessorEdges()) {
-          if ((sucedge.getType() & edgetype) != 0) {
-            if (mapSets.containsKey(sucedge.getDestination().id)) {
-              FastFixedSet<Integer> setReachability = mapSets.get(node.id);
-
-              if (!InterpreterUtil.equalObjects(setReachability, mapSupportPoints.get(node.id))) {
-                mapSupportPoints.put(node.id, setReachability);
-                return true;
-              }
+            if (!InterpreterUtil.equalObjects(setReachability, mapSupportPoints.get(node.id))) {
+              mapSupportPoints.put(node.id, setReachability);
+              return true;
             }
           }
         }
-
-        return false;
       }
+
+      return false;
     }, edgetype);
   }
 
   private void iterateReachability(IReachabilityAction action, int edgetype) {
-
     while (true) {
-
       boolean iterate = false;
 
       HashMap<Integer, FastFixedSet<Integer>> mapSets = new HashMap<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
index df89130..01a32f9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
@@ -112,10 +112,6 @@ public class GenericDominatorEngine {
     }
   }
 
-  public VBStyleCollection<IGraphNode, IGraphNode> getOrderedIDoms() {
-    return colOrderedIDoms;
-  }
-
   public boolean isDominator(IGraphNode node, IGraphNode dom) {
 
     while (!node.equals(dom)) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index bf3d550..261f22c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -216,7 +216,7 @@ public class ExceptionDeobfuscator {
       }
 
       public Set<? extends IGraphNode> getRoots() {
-        return new HashSet<>(Arrays.asList(new IGraphNode[]{graph.getFirst()}));
+        return new HashSet<>(Collections.singletonList(graph.getFirst()));
       }
     });
 
@@ -279,16 +279,10 @@ public class ExceptionDeobfuscator {
     return lstRes;
   }
 
-
   public static boolean hasObfuscatedExceptions(ControlFlowGraph graph) {
-
     Map<BasicBlock, Set<BasicBlock>> mapRanges = new HashMap<>();
     for (ExceptionRangeCFG range : graph.getExceptions()) {
-      Set<BasicBlock> set = mapRanges.get(range.getHandler());
-      if (set == null) {
-        mapRanges.put(range.getHandler(), set = new HashSet<>());
-      }
-      set.addAll(range.getProtectedRange());
+      mapRanges.computeIfAbsent(range.getHandler(), k -> new HashSet<>()).addAll(range.getProtectedRange());
     }
 
     for (Entry<BasicBlock, Set<BasicBlock>> ent : mapRanges.entrySet()) {
@@ -312,4 +306,4 @@ public class ExceptionDeobfuscator {
 
     return false;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
index 57aa324..73ae35a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
@@ -176,10 +176,6 @@ public class AssignmentExprent extends Exprent {
     return left;
   }
 
-  public void setLeft(Exprent left) {
-    this.left = left;
-  }
-
   public Exprent getRight() {
     return right;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 58e0b1c..1405fac 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -37,7 +37,7 @@ public class ConstExprent extends Exprent {
   private final boolean boolPermitted;
 
   public ConstExprent(int val, boolean boolPermitted, Set<Integer> bytecodeOffsets) {
-    this(guessType(val, boolPermitted), Integer.valueOf(val), boolPermitted, bytecodeOffsets);
+    this(guessType(val, boolPermitted), val, boolPermitted, bytecodeOffsets);
   }
 
   public ConstExprent(VarType constType, Object value, Set<Integer> bytecodeOffsets) {
@@ -112,7 +112,7 @@ public class ConstExprent extends Exprent {
 
     switch (constType.type) {
       case CodeConstants.TYPE_BOOLEAN:
-        return new TextBuffer(Boolean.toString(((Integer)value).intValue() != 0));
+        return new TextBuffer(Boolean.toString((Integer)value != 0));
 
       case CodeConstants.TYPE_CHAR:
         Integer val = (Integer)value;
@@ -133,7 +133,7 @@ public class ConstExprent extends Exprent {
       case CodeConstants.TYPE_SHORT:
       case CodeConstants.TYPE_SHORTCHAR:
       case CodeConstants.TYPE_INT:
-        int intVal = ((Integer)value).intValue();
+        int intVal = (Integer)value;
         if (!literal) {
           if (intVal == Integer.MAX_VALUE) {
             return new FieldExprent("MAX_VALUE", "java/lang/Integer", true, null, FieldDescriptor.INTEGER_DESCRIPTOR, bytecode).toJava(0, tracer);
@@ -145,7 +145,7 @@ public class ConstExprent extends Exprent {
         return new TextBuffer(value.toString());
 
       case CodeConstants.TYPE_LONG:
-        long longVal = ((Long)value).longValue();
+        long longVal = (Long)value;
         if (!literal) {
           if (longVal == Long.MAX_VALUE) {
             return new FieldExprent("MAX_VALUE", "java/lang/Long", true, null, FieldDescriptor.LONG_DESCRIPTOR, bytecode).toJava(0, tracer);
@@ -157,7 +157,7 @@ public class ConstExprent extends Exprent {
         return new TextBuffer(value.toString()).append('L');
 
       case CodeConstants.TYPE_FLOAT:
-        float floatVal = ((Float)value).floatValue();
+        float floatVal = (Float)value;
         if (!literal) {
           if (Float.isNaN(floatVal)) {
             return new FieldExprent("NaN", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
@@ -187,7 +187,7 @@ public class ConstExprent extends Exprent {
         return new TextBuffer(value.toString()).append('F');
 
       case CodeConstants.TYPE_DOUBLE:
-        double doubleVal = ((Double)value).doubleValue();
+        double doubleVal = (Double)value;
         if (!literal) {
           if (Double.isNaN(doubleVal)) {
             return new FieldExprent("NaN", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
@@ -306,7 +306,7 @@ public class ConstExprent extends Exprent {
       case CodeConstants.TYPE_SHORT:
       case CodeConstants.TYPE_SHORTCHAR:
       case CodeConstants.TYPE_INT:
-        int value = ((Integer)this.value).intValue();
+        int value = (Integer)this.value;
         return value == 0 || (DecompilerContext.getOption(IFernflowerPreferences.BOOLEAN_TRUE_ONE) && value == 1);
     }
 
@@ -322,7 +322,7 @@ public class ConstExprent extends Exprent {
       case CodeConstants.TYPE_SHORT:
       case CodeConstants.TYPE_SHORTCHAR:
       case CodeConstants.TYPE_INT:
-        return ((Integer)value).intValue() == 1;
+        return (Integer)value == 1;
       case CodeConstants.TYPE_LONG:
         return ((Long)value).intValue() == 1;
       case CodeConstants.TYPE_DOUBLE:
@@ -337,13 +337,13 @@ public class ConstExprent extends Exprent {
   public static ConstExprent getZeroConstant(int type) {
     switch (type) {
       case CodeConstants.TYPE_INT:
-        return new ConstExprent(VarType.VARTYPE_INT, Integer.valueOf(0), null);
+        return new ConstExprent(VarType.VARTYPE_INT, 0, null);
       case CodeConstants.TYPE_LONG:
-        return new ConstExprent(VarType.VARTYPE_LONG, Long.valueOf(0), null);
+        return new ConstExprent(VarType.VARTYPE_LONG, 0L, null);
       case CodeConstants.TYPE_DOUBLE:
-        return new ConstExprent(VarType.VARTYPE_DOUBLE, Double.valueOf(0), null);
+        return new ConstExprent(VarType.VARTYPE_DOUBLE, 0d, null);
       case CodeConstants.TYPE_FLOAT:
-        return new ConstExprent(VarType.VARTYPE_FLOAT, Float.valueOf(0), null);
+        return new ConstExprent(VarType.VARTYPE_FLOAT, 0f, null);
     }
 
     throw new RuntimeException("Invalid argument: " + type);
@@ -383,7 +383,7 @@ public class ConstExprent extends Exprent {
   }
 
   public int getIntValue() {
-    return ((Integer)value).intValue();
+    return (Integer)value;
   }
 
   public boolean isBoolPermitted() {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index d5f3880..27412b9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -144,20 +144,13 @@ public class ExitExprent extends Exprent {
   // IMatchable implementation
   // *****************************************************************************
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-
-    if(!super.match(matchNode, engine)) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
 
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_EXITTYPE);
-    if(type != null) {
-      if(this.exitType != type.intValue()) {
-        return false;
-      }
-    }
-
-    return true;
+    return type == null || this.exitType == type;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index 8a2b94e..a4eb39d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -143,8 +143,7 @@ public class Exprent implements IMatchable {
     String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
     if (position != null) {
       if (position.matches("-?\\d+")) {
-        return lstAllExprents
-          .get((lstAllExprents.size() + Integer.parseInt(position)) % lstAllExprents.size()); // care for negative positions
+        return lstAllExprents.get((lstAllExprents.size() + Integer.parseInt(position)) % lstAllExprents.size()); // care for negative positions
       }
     }
     else if (index < lstAllExprents.size()) { // use 'index' parameter
@@ -162,7 +161,7 @@ public class Exprent implements IMatchable {
 
     for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
       MatchProperties key = rule.getKey();
-      if (key == MatchProperties.EXPRENT_TYPE && this.type != ((Integer)rule.getValue().value).intValue()) {
+      if (key == MatchProperties.EXPRENT_TYPE && this.type != (Integer)rule.getValue().value) {
         return false;
       }
       if (key == MatchProperties.EXPRENT_RET && !engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 8fe2a4f..6dbd2db 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -187,22 +187,19 @@ public class FieldExprent extends Exprent {
   // IMatchable implementation
   // *****************************************************************************
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-
-    if(!super.match(matchNode, engine)) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
 
     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_FIELD_NAME);
-    if(rule != null) {
-      if(rule.isVariable()) {
-        if(!engine.checkAndSetVariableValue((String)rule.value, this.name)) {
-          return false;
-        }
-      } else {
-        if(!rule.value.equals(this.name)) {
-          return false;
-        }
+    if (rule != null) {
+      if (rule.isVariable()) {
+        return engine.checkAndSetVariableValue((String)rule.value, this.name);
+      }
+      else {
+        return rule.value.equals(this.name);
       }
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index d164f16..e10b262 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -399,8 +399,7 @@ public class FunctionExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<>(lstOperands);
-    return lst;
+    return new ArrayList<>(lstOperands);
   }
 
   @Override
@@ -609,20 +608,13 @@ public class FunctionExprent extends Exprent {
   // IMatchable implementation
   // *****************************************************************************
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-
-    if(!super.match(matchNode, engine)) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
 
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_FUNCTYPE);
-    if(type != null) {
-      if(this.funcType != type.intValue()) {
-        return false;
-      }
-    }
-
-    return true;
+    return type == null || this.funcType == type;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
index d8f3023..ebecc14 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
@@ -30,10 +30,9 @@ public class IfExprent extends Exprent {
   public static final int IF_ACMPEQ = 14;
   public static final int IF_ACMPNE = 15;
 
-  public static final int IF_CAND = 16;
-  public static final int IF_COR = 17;
-
-  public static final int IF_NOT = 18;
+  //public static final int IF_CAND = 16;
+  //public static final int IF_COR = 17;
+  //public static final int IF_NOT = 18;
   public static final int IF_VALUE = 19;
 
   private static final int[] FUNC_TYPES = {
@@ -132,4 +131,4 @@ public class IfExprent extends Exprent {
   public void setCondition(Exprent condition) {
     this.condition = condition;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index 16b489f..a839fb1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -37,7 +37,7 @@ public class VarExprent extends Exprent {
   private int index;
   private VarType varType;
   private boolean definition = false;
-  private VarProcessor processor;
+  private final VarProcessor processor;
   private final int visibleOffset;
   private int version = 0;
   private boolean classDef = false;
@@ -219,10 +219,6 @@ public class VarExprent extends Exprent {
     return processor;
   }
 
-  public void setProcessor(VarProcessor processor) {
-    this.processor = processor;
-  }
-
   public int getVersion() {
     return version;
   }
@@ -251,26 +247,22 @@ public class VarExprent extends Exprent {
   // IMatchable implementation
   // *****************************************************************************
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-
-    if(!super.match(matchNode, engine)) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
 
     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_VAR_INDEX);
-    if(rule != null) {
-      if(rule.isVariable()) {
-        if(!engine.checkAndSetVariableValue((String)rule.value, this.index)) {
-          return false;
-        }
-      } else {
-        if(this.index != Integer.valueOf((String)rule.value).intValue()) {
-          return false;
-        }
+    if (rule != null) {
+      if (rule.isVariable()) {
+        return engine.checkAndSetVariableValue((String)rule.value, this.index);
+      }
+      else {
+        return this.index == Integer.valueOf((String)rule.value);
       }
     }
 
     return true;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
index 23ce01a..f1dbf9f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
@@ -398,21 +398,19 @@ public class FlattenStatementsHelper {
     }
 
     if (finallyShortRangeSource != null) {
-
       boolean isContinueEdge = (edgetype == StatEdge.TYPE_CONTINUE);
 
-      List<String[]> lst = mapShortRangeFinallyPathIds.get(sourcenode.id);
-      if (lst == null) {
-        mapShortRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<>());
-      }
-      lst.add(new String[]{finallyShortRangeSource.id, destination.id.toString(), finallyShortRangeEntry.id.toString(),
-        isFinallyMonitorExceptionPath ? "1" : null, isContinueEdge ? "1" : null});
+      mapShortRangeFinallyPathIds.computeIfAbsent(sourcenode.id, k -> new ArrayList<>()).add(new String[]{
+        finallyShortRangeSource.id,
+        destination.id.toString(),
+        finallyShortRangeEntry.id.toString(),
+        isFinallyMonitorExceptionPath ? "1" : null,
+        isContinueEdge ? "1" : null});
 
-      lst = mapLongRangeFinallyPathIds.get(sourcenode.id);
-      if (lst == null) {
-        mapLongRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<>());
-      }
-      lst.add(new String[]{finallyLongRangeSource.id, destination.id.toString(), finallyLongRangeEntry.id.toString(),
+      mapLongRangeFinallyPathIds.computeIfAbsent(sourcenode.id, k -> new ArrayList<>()).add(new String[]{
+        finallyLongRangeSource.id,
+        destination.id.toString(),
+        finallyLongRangeEntry.id.toString(),
         isContinueEdge ? "1" : null});
     }
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
index ec130b6..29e7030 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
@@ -19,7 +19,6 @@ import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -45,8 +44,6 @@ public class SSAConstructorSparseEx {
   // var, version
   private final HashMap<Integer, Integer> lastversion = new HashMap<>();
 
-  private final List<VarVersionPair> startVars = new ArrayList<>();
-
   // set factory
   private FastSparseSetFactory<Integer> factory;
 
@@ -246,7 +243,7 @@ public class SSAConstructorSparseEx {
       if (cardinality == 1) { // == 1
         // set version
         Integer it = vers.iterator().next();
-        vardest.setVersion(it.intValue());
+        vardest.setVersion(it);
       }
       else if (cardinality == 2) { // size > 1
         Integer current_vers = vardest.getVersion();
@@ -358,7 +355,7 @@ public class SSAConstructorSparseEx {
         }
 
         // false path?
-        boolean isFalsePath = true;
+        boolean isFalsePath;
 
         if (recFinally) {
           isFalsePath = !finwrap.destination.equals(nodeid);
@@ -463,7 +460,6 @@ public class SSAConstructorSparseEx {
           setCurrentVar(map, varindex, version);
 
           extraVarVersions.put(dgraph.nodes.getWithKey(flatthelper.getMapDestinationNodes().get(stat.getStats().get(i).id)[0]).id, map);
-          startVars.add(new VarVersionPair(varindex, version));
         }
     }
 
@@ -487,7 +483,6 @@ public class SSAConstructorSparseEx {
       FastSparseSet<Integer> set = factory.spawnEmptySet();
       set.add(version);
       map.put(varindex, set);
-      startVars.add(new VarVersionPair(varindex, version));
 
       if (thisvar) {
         if (i == 0) {
@@ -508,8 +503,4 @@ public class SSAConstructorSparseEx {
   public HashMap<VarVersionPair, FastSparseSet<Integer>> getPhi() {
     return phi;
   }
-
-  public List<VarVersionPair> getStartVars() {
-    return startVars;
-  }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
index 8901bd6..4edec05 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
@@ -41,9 +41,6 @@ public class SSAUConstructorSparseEx {
   private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> extraVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
-  // (var, version), version
-  private final HashMap<VarVersionPair, HashSet<Integer>> phi = new HashMap<>();
-
   // var, version
   private final HashMap<Integer, Integer> lastversion = new HashMap<>();
 
@@ -344,7 +341,7 @@ public class SSAUConstructorSparseEx {
             if (calcLiveVars) {
               varMapToGraph(varpaar, varmap);
             }
-            setCurrentVar(varmap, varindex.intValue(), var.getVersion());
+            setCurrentVar(varmap, varindex, var.getVersion());
           }
       }
     }
@@ -359,7 +356,7 @@ public class SSAUConstructorSparseEx {
 
       int cardinality = vers.getCardinality();
       if (cardinality == 1) { // size == 1
-        if (current_vers.intValue() != 0) {
+        if (current_vers != 0) {
           if (calcLiveVars) {
             varMapToGraph(new VarVersionPair(varindex, current_vers), varmap);
           }
@@ -384,7 +381,7 @@ public class SSAUConstructorSparseEx {
       }
       else if (cardinality == 2) { // size > 1
 
-        if (current_vers.intValue() != 0) {
+        if (current_vers != 0) {
           if (calcLiveVars) {
             varMapToGraph(new VarVersionPair(varindex, current_vers), varmap);
           }
@@ -449,7 +446,7 @@ public class SSAUConstructorSparseEx {
 
       Integer tempver = getNextFreeVersion(phivar.var, stat);
 
-      VarVersionNode tempnode = new VarVersionNode(phivar.var, tempver.intValue());
+      VarVersionNode tempnode = new VarVersionNode(phivar.var, tempver);
 
       colnodes.add(tempnode);
       colpaars.add(new VarVersionPair(phivar.var, tempver.intValue()));
@@ -468,9 +465,6 @@ public class SSAUConstructorSparseEx {
     }
 
     ssuversions.addNodes(colnodes, colpaars);
-
-    // update phi node
-    phi.put(phivar, phiVers);
   }
 
   private void varMapToGraph(VarVersionPair varpaar, SFormsFastMapDirect varmap) {
@@ -583,7 +577,7 @@ public class SSAUConstructorSparseEx {
         }
 
         // false path?
-        boolean isFalsePath = true;
+        boolean isFalsePath;
 
         if (recFinally) {
           isFalsePath = !finwrap.destination.equals(nodeid);
@@ -801,10 +795,6 @@ public class SSAUConstructorSparseEx {
     return null;
   }
 
-  public HashMap<VarVersionPair, HashSet<Integer>> getPhi() {
-    return phi;
-  }
-
   public VarVersionsGraph getSsuversions() {
     return ssuversions;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 4089fd7..4b31d07 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -12,10 +12,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 
 public class CatchAllStatement extends Statement {
 
@@ -64,13 +61,11 @@ public class CatchAllStatement extends Statement {
   // *****************************************************************************
 
   public static Statement isHead(Statement head) {
-
     if (head.getLastBasicType() != Statement.LASTBASICTYPE_GENERAL) {
       return null;
     }
 
-    HashSet<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
-
+    Set<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
     if (setHandlers.size() != 1) {
       return null;
     }
@@ -190,27 +185,18 @@ public class CatchAllStatement extends Statement {
     return handler;
   }
 
-
-  public void setHandler(Statement handler) {
-    this.handler = handler;
-  }
-
-
   public boolean isFinally() {
     return isFinally;
   }
 
-
   public void setFinally(boolean isFinally) {
     this.isFinally = isFinally;
   }
 
-
   public VarExprent getMonitor() {
     return monitor;
   }
 
-
   public void setMonitor(VarExprent monitor) {
     this.monitor = monitor;
   }
@@ -218,4 +204,4 @@ public class CatchAllStatement extends Statement {
   public List<VarExprent> getVars() {
     return vars;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index 74d5a43..1f0f854 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -14,13 +14,11 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class CatchStatement extends Statement {
-
   private final List<List<String>> exctstrings = new ArrayList<>();
-
   private final List<VarExprent> vars = new ArrayList<>();
 
   // *****************************************************************************
@@ -31,8 +29,7 @@ public class CatchStatement extends Statement {
     type = TYPE_TRYCATCH;
   }
 
-  private CatchStatement(Statement head, Statement next, HashSet<Statement> setHandlers) {
-
+  private CatchStatement(Statement head, Statement next, Set<Statement> setHandlers) {
     this();
 
     first = head;
@@ -62,15 +59,12 @@ public class CatchStatement extends Statement {
   // *****************************************************************************
 
   public static Statement isHead(Statement head) {
-
     if (head.getLastBasicType() != LASTBASICTYPE_GENERAL) {
       return null;
     }
 
-    HashSet<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
-
+    Set<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
     if (!setHandlers.isEmpty()) {
-
       int hnextcount = 0; // either no statements with connection to next, or more than 1
 
       Statement next = null;
@@ -185,7 +179,6 @@ public class CatchStatement extends Statement {
   }
 
   public Statement getSimpleCopy() {
-
     CatchStatement cs = new CatchStatement();
 
     for (List<String> exc : this.exctstrings) {
@@ -205,4 +198,4 @@ public class CatchStatement extends Statement {
   public List<VarExprent> getVars() {
     return vars;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index a9fd4b0..083b6f0 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -36,8 +36,6 @@ public class IfStatement extends Statement {
 
   private boolean negated = false;
 
-  private boolean iffflag;
-
   private final List<Exprent> headexprent = new ArrayList<>(1); // contains IfExprent
 
   // *****************************************************************************
@@ -190,7 +188,6 @@ public class IfStatement extends Statement {
   }
 
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-    String indstr = TextUtil.getIndentString(indent);
     TextBuffer buf = new TextBuffer();
 
     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
@@ -236,10 +233,10 @@ public class IfStatement extends Statement {
           !elsestat.isLabeled() &&
           (elsestat.getSuccessorEdges(STATEDGE_DIRECT_ALL).isEmpty()
            || !elsestat.getSuccessorEdges(STATEDGE_DIRECT_ALL).get(0).explicit)) { // else if
-        TextBuffer content = ExprProcessor.jmpWrapper(elsestat, indent, false, tracer);
-        content.setStart(indstr.length());
-
         buf.appendIndent(indent).append("} else ");
+
+        TextBuffer content = ExprProcessor.jmpWrapper(elsestat, indent, false, tracer);
+        content.setStart(TextUtil.getIndentString(indent).length());
         buf.append(content);
 
         elseif = true;
@@ -330,7 +327,6 @@ public class IfStatement extends Statement {
     IfStatement is = new IfStatement();
     is.iftype = this.iftype;
     is.negated = this.negated;
-    is.iffflag = this.iffflag;
 
     return is;
   }
@@ -387,14 +383,6 @@ public class IfStatement extends Statement {
     return (IfExprent)headexprent.get(0);
   }
 
-  public boolean isIffflag() {
-    return iffflag;
-  }
-
-  public void setIffflag(boolean iffflag) {
-    this.iffflag = iffflag;
-  }
-
   public void setElseEdge(StatEdge elseedge) {
     this.elseedge = elseedge;
   }
@@ -415,16 +403,16 @@ public class IfStatement extends Statement {
   // IMatchable implementation
   // *****************************************************************************
 
+  @Override
   public IMatchable findObject(MatchNode matchNode, int index) {
-
     IMatchable object = super.findObject(matchNode, index);
-    if(object != null) {
+    if (object != null) {
       return object;
     }
 
-    if(matchNode.getType() == MatchNode.MATCHNODE_EXPRENT) {
+    if (matchNode.getType() == MatchNode.MATCHNODE_EXPRENT) {
       String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
-      if("head".equals(position)) {
+      if ("head".equals(position)) {
         return getHeadexprent();
       }
     }
@@ -432,20 +420,13 @@ public class IfStatement extends Statement {
     return null;
   }
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-
-    if(!super.match(matchNode, engine)) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
 
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.STATEMENT_IFTYPE);
-    if(type != null) {
-      if(this.iftype != type.intValue()) {
-        return false;
-      }
-    }
-
-    return true;
+    return type == null || this.iftype == type;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
index a7421d9..fb99325 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
@@ -5,13 +5,10 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 
-
 public class RootStatement extends Statement {
-
-  private DummyExitStatement dummyExit;
+  private final DummyExitStatement dummyExit;
 
   public RootStatement(Statement head, DummyExitStatement dummyExit) {
-
     type = Statement.TYPE_ROOT;
 
     first = head;
@@ -28,8 +25,4 @@ public class RootStatement extends Statement {
   public DummyExitStatement getDummyExit() {
     return dummyExit;
   }
-
-  public void setDummyExit(DummyExitStatement dummyExit) {
-    this.dummyExit = dummyExit;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index 6249205..974d1cf 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -20,9 +20,8 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class Statement implements IMatchable {
-
-  public static final int STATEDGE_ALL = 1 << 31;
-  public static final int STATEDGE_DIRECT_ALL = 1 << 30;
+  public static final int STATEDGE_ALL = 0x80000000;
+  public static final int STATEDGE_DIRECT_ALL = 0x40000000;
 
   public static final int DIRECTION_BACKWARD = 0;
   public static final int DIRECTION_FORWARD = 1;
@@ -33,7 +32,7 @@ public class Statement implements IMatchable {
   public static final int TYPE_SWITCH = 6;
   public static final int TYPE_TRYCATCH = 7;
   public static final int TYPE_BASICBLOCK = 8;
-  public static final int TYPE_FINALLY = 9;
+  //public static final int TYPE_FINALLY = 9;
   public static final int TYPE_SYNCRONIZED = 10;
   public static final int TYPE_PLACEHOLDER = 11;
   public static final int TYPE_CATCHALL = 12;
@@ -41,7 +40,6 @@ public class Statement implements IMatchable {
   public static final int TYPE_DUMMYEXIT = 14;
   public static final int TYPE_SEQUENCE = 15;
 
-
   public static final int LASTBASICTYPE_IF = 0;
   public static final int LASTBASICTYPE_SWITCH = 1;
   public static final int LASTBASICTYPE_GENERAL = 2;
@@ -240,25 +238,15 @@ public class Statement implements IMatchable {
   }
 
   private void addEdgeDirectInternal(int direction, StatEdge edge, int edgetype) {
-
     Map<Integer, List<StatEdge>> mapEdges = direction == DIRECTION_BACKWARD ? mapPredEdges : mapSuccEdges;
     Map<Integer, List<Statement>> mapStates = direction == DIRECTION_BACKWARD ? mapPredStates : mapSuccStates;
 
-    List<StatEdge> lst = mapEdges.get(edgetype);
-    if (lst == null) {
-      mapEdges.put(edgetype, lst = new ArrayList<>());
-    }
-    lst.add(edge);
+    mapEdges.computeIfAbsent(edgetype, k -> new ArrayList<>()).add(edge);
 
-    List<Statement> lstStates = mapStates.get(edgetype);
-    if (lstStates == null) {
-      mapStates.put(edgetype, lstStates = new ArrayList<>());
-    }
-    lstStates.add(direction == DIRECTION_BACKWARD ? edge.getSource() : edge.getDestination());
+    mapStates.computeIfAbsent(edgetype, k -> new ArrayList<>()).add(direction == DIRECTION_BACKWARD ? edge.getSource() : edge.getDestination());
   }
 
   private void addEdgeInternal(int direction, StatEdge edge) {
-
     int type = edge.getType();
 
     int[] arrtypes;
@@ -466,13 +454,12 @@ public class Statement implements IMatchable {
   }
 
   public boolean containsStatementStrict(Statement stat) {
-
     if (stats.contains(stat)) {
       return true;
     }
 
-    for (int i = 0; i < stats.size(); i++) {
-      if (stats.get(i).containsStatementStrict(stat)) {
+    for (Statement st : stats) {
+      if (st.containsStatementStrict(stat)) {
         return true;
       }
     }
@@ -756,10 +743,6 @@ public class Statement implements IMatchable {
     return post;
   }
 
-  public void setPost(Statement post) {
-    this.post = post;
-  }
-
   public VBStyleCollection<Statement, Integer> getStats() {
     return stats;
   }
@@ -850,26 +833,29 @@ public class Statement implements IMatchable {
   // IMatchable implementation
   // *****************************************************************************
 
+  @Override
   public IMatchable findObject(MatchNode matchNode, int index) {
-
     int node_type = matchNode.getType();
 
     if (node_type == MatchNode.MATCHNODE_STATEMENT && !this.stats.isEmpty()) {
       String position = (String)matchNode.getRuleValue(MatchProperties.STATEMENT_POSITION);
-      if(position != null) {
-        if(position.matches("-?\\d+")) {
+      if (position != null) {
+        if (position.matches("-?\\d+")) {
           return this.stats.get((this.stats.size() + Integer.parseInt(position)) % this.stats.size()); // care for negative positions
         }
-      } else if(index < this.stats.size()) { // use 'index' parameter
+      }
+      else if (index < this.stats.size()) { // use 'index' parameter
         return this.stats.get(index);
       }
-    } else if(node_type == MatchNode.MATCHNODE_EXPRENT && this.exprents != null && !this.exprents.isEmpty()) {
+    }
+    else if (node_type == MatchNode.MATCHNODE_EXPRENT && this.exprents != null && !this.exprents.isEmpty()) {
       String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
-      if(position != null) {
-        if(position.matches("-?\\d+")) {
+      if (position != null) {
+        if (position.matches("-?\\d+")) {
           return this.exprents.get((this.exprents.size() + Integer.parseInt(position)) % this.exprents.size()); // care for negative positions
         }
-      } else if(index < this.exprents.size()) { // use 'index' parameter
+      }
+      else if (index < this.exprents.size()) { // use 'index' parameter
         return this.exprents.get(index);
       }
     }
@@ -877,46 +863,45 @@ public class Statement implements IMatchable {
     return null;
   }
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-
-    if(matchNode.getType() != MatchNode.MATCHNODE_STATEMENT) {
+    if (matchNode.getType() != MatchNode.MATCHNODE_STATEMENT) {
       return false;
     }
 
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
-      switch(rule.getKey()) {
-      case STATEMENT_TYPE:
-        if(this.type != ((Integer)rule.getValue().value).intValue()) {
-          return false;
-        }
-        break;
-      case STATEMENT_STATSIZE:
-        if(this.stats.size() != ((Integer)rule.getValue().value).intValue()) {
-          return false;
-        }
-        break;
-      case STATEMENT_EXPRSIZE:
-        int exprsize = ((Integer)rule.getValue().value).intValue();
-        if(exprsize == -1) {
-          if(this.exprents != null) {
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+      switch (rule.getKey()) {
+        case STATEMENT_TYPE:
+          if (this.type != (Integer)rule.getValue().value) {
             return false;
           }
-        } else {
-          if(this.exprents == null || this.exprents.size() != exprsize) {
+          break;
+        case STATEMENT_STATSIZE:
+          if (this.stats.size() != (Integer)rule.getValue().value) {
             return false;
           }
-        }
-        break;
-      case STATEMENT_RET:
-        if(!engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
-          return false;
-        }
-        break;
+          break;
+        case STATEMENT_EXPRSIZE:
+          int exprsize = (Integer)rule.getValue().value;
+          if (exprsize == -1) {
+            if (this.exprents != null) {
+              return false;
+            }
+          }
+          else {
+            if (this.exprents == null || this.exprents.size() != exprsize) {
+              return false;
+            }
+          }
+          break;
+        case STATEMENT_RET:
+          if (!engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
+            return false;
+          }
+          break;
       }
-
     }
 
     return true;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
index ea4c19c..cadf50f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
@@ -33,11 +33,9 @@ public class Statements {
     if (inv.getFunctype() == InvocationExprent.TYP_INIT && inv.getInstance().type == Exprent.EXPRENT_VAR) {
       VarExprent instVar = (VarExprent)inv.getInstance();
       VarVersionPair varPair = new VarVersionPair(instVar);
-      String classname = method.varproc.getThisVars().get(varPair);
-      if (classname != null) { // any this instance. TODO: Restrict to current class?
-        if (withThis || !wrapper.getClassStruct().qualifiedName.equals(inv.getClassname())) {
-          return true;
-        }
+      String className = method.varproc.getThisVars().get(varPair);
+      if (className != null) { // any this instance. TODO: Restrict to current class?
+        return withThis || !wrapper.getClassStruct().qualifiedName.equals(inv.getClassname());
       }
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
index 7010283..699a853 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
@@ -137,15 +137,7 @@ public class SynchronizedStatement extends Statement {
     return body;
   }
 
-  public void setBody(Statement body) {
-    this.body = body;
-  }
-
   public List<Exprent> getHeadexprentList() {
     return headexprent;
   }
-
-  public Exprent getHeadexprent() {
-    return headexprent.get(0);
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
index 3fce94d..f668aa7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
@@ -8,17 +8,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CheckTypesResult {
-
   private final List<ExprentTypePair> lstMaxTypeExprents = new ArrayList<>();
-
   private final List<ExprentTypePair> lstMinTypeExprents = new ArrayList<>();
 
   public void addMaxTypeExprent(Exprent exprent, VarType type) {
-    lstMaxTypeExprents.add(new ExprentTypePair(exprent, type, null));
+    lstMaxTypeExprents.add(new ExprentTypePair(exprent, type));
   }
 
   public void addMinTypeExprent(Exprent exprent, VarType type) {
-    lstMinTypeExprents.add(new ExprentTypePair(exprent, type, null));
+    lstMinTypeExprents.add(new ExprentTypePair(exprent, type));
   }
 
   public List<ExprentTypePair> getLstMaxTypeExprents() {
@@ -32,12 +30,10 @@ public class CheckTypesResult {
   public static class ExprentTypePair {
     public final Exprent exprent;
     public final VarType type;
-    public final VarType desttype;
 
-    public ExprentTypePair(Exprent exprent, VarType type, VarType desttype) {
+    public ExprentTypePair(Exprent exprent, VarType type) {
       this.exprent = exprent;
       this.type = type;
-      this.desttype = desttype;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
index e8331c4..b1d4e49 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -132,7 +132,7 @@ public class VarDefinitionHelper {
           else {
             List<Exprent> lstSpecial = Arrays.asList(dstat.getConditionExprent(), dstat.getIncExprent());
             for (VarExprent var : getAllVars(lstSpecial)) {
-              if (var.getIndex() == index.intValue()) {
+              if (var.getIndex() == index) {
                 stat = stat.getParent();
                 break;
               }
@@ -181,7 +181,7 @@ public class VarDefinitionHelper {
       }
 
       if (!defset) {
-        VarExprent var = new VarExprent(index.intValue(), varproc.getVarType(new VarVersionPair(index.intValue(), 0)), varproc);
+        VarExprent var = new VarExprent(index, varproc.getVarType(new VarVersionPair(index.intValue(), 0)), varproc);
         var.setDefinition(true);
 
         lst.add(addindex, var);
@@ -295,7 +295,7 @@ public class VarDefinitionHelper {
 
     // put all variables defined in this statement into the set
     for (Entry<Integer, Integer> en : mapCount.entrySet()) {
-      if (en.getValue().intValue() > 1) {
+      if (en.getValue() > 1) {
         mapVarDefStatements.put(en.getKey(), stat);
       }
     }
@@ -329,7 +329,7 @@ public class VarDefinitionHelper {
       Exprent left = ((AssignmentExprent)expr).getLeft();
       if (left.type == Exprent.EXPRENT_VAR) {
         VarExprent var = (VarExprent)left;
-        if (var.getIndex() == index.intValue()) {
+        if (var.getIndex() == index) {
           var.setDefinition(true);
           return true;
         }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 4dcc5be..9999b50 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -45,7 +45,7 @@ public class VarProcessor {
     Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
 
     List<VarVersionPair> listVars = new ArrayList<>(mapVarNames.keySet());
-    Collections.sort(listVars, Comparator.comparingInt(o -> o.var));
+    listVars.sort(Comparator.comparingInt(o -> o.var));
 
     Map<String, Integer> mapNames = new HashMap<>();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
index ec401d1..6339f9a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
@@ -90,35 +90,27 @@ public class VarTypeProcessor {
   }
 
   private static void resetExprentTypes(DirectGraph graph) {
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+    graph.iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-        for (Exprent expr : lst) {
-          if (expr.type == Exprent.EXPRENT_VAR) {
-            ((VarExprent)expr).setVarType(VarType.VARTYPE_UNKNOWN);
-          }
-          else if (expr.type == Exprent.EXPRENT_CONST) {
-            ConstExprent constExpr = (ConstExprent)expr;
-            if (constExpr.getConstType().typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
-              constExpr.setConstType(new ConstExprent(constExpr.getIntValue(), constExpr.isBoolPermitted(), null).getConstType());
-            }
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_VAR) {
+          ((VarExprent)expr).setVarType(VarType.VARTYPE_UNKNOWN);
+        }
+        else if (expr.type == Exprent.EXPRENT_CONST) {
+          ConstExprent constExpr = (ConstExprent)expr;
+          if (constExpr.getConstType().typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
+            constExpr.setConstType(new ConstExprent(constExpr.getIntValue(), constExpr.isBoolPermitted(), null).getConstType());
           }
         }
-        return 0;
       }
+      return 0;
     });
   }
 
   private boolean processVarTypes(DirectGraph graph) {
-    return graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        return checkTypeExprent(exprent) ? 0 : 1;
-      }
-    });
+    return graph.iterateExprents(exprent -> checkTypeExprent(exprent) ? 0 : 1);
   }
 
   private boolean checkTypeExprent(Exprent exprent) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
index 540de93..6c7ae33 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
@@ -31,10 +31,6 @@ public class VarVersionNode implements IGraphNode {
     this.version = version;
   }
 
-  public VarVersionPair getVarPaar() {
-    return new VarVersionPair(var, version);
-  }
-
   public List<IGraphNode> getPredecessors() {
     List<IGraphNode> lst = new ArrayList<>(preds.size());
     for (VarVersionEdge edge : preds) {
@@ -63,4 +59,4 @@ public class VarVersionNode implements IGraphNode {
   public String toString() {
     return "(" + var + "_" + version + ")";
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
index 40a3759..59e29c2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
@@ -16,8 +16,8 @@ public class VarVersionPair {
   }
 
   public VarVersionPair(Integer var, Integer version) {
-    this.var = var.intValue();
-    this.version = version.intValue();
+    this.var = var;
+    this.version = version;
   }
 
   public VarVersionPair(VarExprent var) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index dce2a2b..18efb4c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -8,11 +8,7 @@ import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.util.*;
 
-
 public class VarVersionsGraph {
-
-  public int counter = 0;
-
   public final VBStyleCollection<VarVersionNode, VarVersionPair> nodes = new VBStyleCollection<>();
 
   private GenericDominatorEngine engine;
@@ -109,9 +105,7 @@ public class VarVersionsGraph {
   }
 
   private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, HashSet<VarVersionNode> setVisited) {
-
-    HashMap<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
-
+    Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
 
@@ -125,29 +119,22 @@ public class VarVersionsGraph {
 
       setVisited.add(node);
 
-      List<VarVersionEdge> lstSuccs = mapNodeSuccs.get(node);
-      if (lstSuccs == null) {
-        mapNodeSuccs.put(node, lstSuccs = new ArrayList<>(node.succs));
-      }
-
+      List<VarVersionEdge> lstSuccs = mapNodeSuccs.computeIfAbsent(node, n -> new ArrayList<>(n.succs));
       for (; index < lstSuccs.size(); index++) {
         VarVersionNode succ = lstSuccs.get(index).dest;
 
         if (!setVisited.contains(succ)) {
           stackIndex.add(index + 1);
-
           stackNode.add(succ);
           stackIndex.add(0);
-
           break;
         }
       }
 
       if (index == lstSuccs.size()) {
         lst.add(0, node);
-
         stackNode.removeLast();
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
index b959750..adbb6fd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
@@ -22,7 +22,7 @@ import java.util.Map.Entry;
 public class VarVersionsProcessor {
   private final StructMethod method;
   private Map<Integer, Integer> mapOriginalVarIndices = Collections.emptyMap();
-  private VarTypeProcessor typeProcessor;
+  private final VarTypeProcessor typeProcessor;
 
   public VarVersionsProcessor(StructMethod mt, MethodDescriptor md) {
     method = mt;
@@ -91,24 +91,21 @@ public class VarVersionsProcessor {
   }
 
   private static void updateVersions(DirectGraph graph, final Map<VarVersionPair, Integer> versions) {
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+    graph.iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-        for (Exprent expr : lst) {
-          if (expr.type == Exprent.EXPRENT_VAR) {
-            VarExprent var = (VarExprent)expr;
-            Integer version = versions.get(new VarVersionPair(var));
-            if (version != null) {
-              var.setVersion(version);
-            }
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_VAR) {
+          VarExprent var = (VarExprent)expr;
+          Integer version = versions.get(new VarVersionPair(var));
+          if (version != null) {
+            var.setVersion(version);
           }
         }
-
-        return 0;
       }
+
+      return 0;
     });
   }
 
@@ -145,12 +142,7 @@ public class VarVersionsProcessor {
 
     for (VarVersionPair pair : mapExprentMinTypes.keySet()) {
       if (pair.version >= 0) {  // don't merge constants
-        Set<Integer> set = mapVarVersions.get(pair.var);
-        if (set == null) {
-          set = new HashSet<>();
-          mapVarVersions.put(pair.var, set);
-        }
-        set.add(pair.version);
+        mapVarVersions.computeIfAbsent(pair.var, k -> new HashSet<>()).add(pair.version);
       }
     }
 
@@ -243,31 +235,28 @@ public class VarVersionsProcessor {
     }
 
     // set new vars
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+    graph.iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-        for (Exprent expr : lst) {
-          if (expr.type == Exprent.EXPRENT_VAR) {
-            VarExprent newVar = (VarExprent)expr;
-            Integer newVarIndex = mapVarPaar.get(new VarVersionPair(newVar));
-            if (newVarIndex != null) {
-              newVar.setIndex(newVarIndex);
-              newVar.setVersion(0);
-            }
-          }
-          else if (expr.type == Exprent.EXPRENT_CONST) {
-            VarType maxType = mapExprentMaxTypes.get(new VarVersionPair(expr.id, -1));
-            if (maxType != null && maxType.equals(VarType.VARTYPE_CHAR)) {
-              ((ConstExprent)expr).setConstType(maxType);
-            }
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_VAR) {
+          VarExprent newVar = (VarExprent)expr;
+          Integer newVarIndex = mapVarPaar.get(new VarVersionPair(newVar));
+          if (newVarIndex != null) {
+            newVar.setIndex(newVarIndex);
+            newVar.setVersion(0);
+          }
+        }
+        else if (expr.type == Exprent.EXPRENT_CONST) {
+          VarType maxType = mapExprentMaxTypes.get(new VarVersionPair(expr.id, -1));
+          if (maxType != null && maxType.equals(VarType.VARTYPE_CHAR)) {
+            ((ConstExprent)expr).setConstType(maxType);
           }
         }
-
-        return 0;
       }
+
+      return 0;
     });
 
     if (previousVersionsProcessor != null) {
@@ -286,7 +275,7 @@ public class VarVersionsProcessor {
   }
 
   public VarType getVarType(VarVersionPair pair) {
-    return typeProcessor == null ? null : typeProcessor.getVarType(pair);
+    return typeProcessor.getVarType(pair);
   }
 
   public void setVarType(VarVersionPair pair, VarType type) {
@@ -294,13 +283,8 @@ public class VarVersionsProcessor {
   }
 
   public int getVarFinal(VarVersionPair pair) {
-    int ret = VarTypeProcessor.VAR_FINAL;
-    if (typeProcessor != null) {
-      Integer fin = typeProcessor.getMapFinalVars().get(pair);
-      ret = fin == null ? VarTypeProcessor.VAR_FINAL : fin.intValue();
-    }
-
-    return ret;
+    Integer fin = typeProcessor.getMapFinalVars().get(pair);
+    return fin == null ? VarTypeProcessor.VAR_FINAL : fin;
   }
 
   public void setVarFinal(VarVersionPair pair, int finalType) {
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
index 3267742..714b4af 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
@@ -7,11 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ClassWrapperNode {
-
   private final StructClass classStruct;
-
-  private ClassWrapperNode superclass;
-
   private final List<ClassWrapperNode> subclasses = new ArrayList<>();
 
   public ClassWrapperNode(StructClass cl) {
@@ -19,7 +15,6 @@ public class ClassWrapperNode {
   }
 
   public void addSubclass(ClassWrapperNode node) {
-    node.setSuperclass(this);
     subclasses.add(node);
   }
 
@@ -30,12 +25,4 @@ public class ClassWrapperNode {
   public List<ClassWrapperNode> getSubclasses() {
     return subclasses;
   }
-
-  public ClassWrapperNode getSuperclass() {
-    return superclass;
-  }
-
-  public void setSuperclass(ClassWrapperNode superclass) {
-    this.superclass = superclass;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
index f82f165..40c1193 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
@@ -109,7 +109,7 @@ public class StructContext {
           StructClass cl = new StructClass(in, isOwn, loader);
           classes.put(cl.qualifiedName, cl);
           unit.addClass(cl, filename);
-          loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(LazyLoader.Link.CLASS, file.getAbsolutePath(), null));
+          loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(file.getAbsolutePath(), null));
         }
         catch (IOException ex) {
           String message = "Corrupted class file: " + file;
@@ -145,7 +145,7 @@ public class StructContext {
             StructClass cl = new StructClass(bytes, isOwn, loader);
             classes.put(cl.qualifiedName, cl);
             unit.addClass(cl, name);
-            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(LazyLoader.Link.ENTRY, file.getAbsolutePath(), name));
+            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(file.getAbsolutePath(), name));
           }
           else {
             unit.addOtherEntry(file.getAbsolutePath(), name);
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index 0c482d7..42003f3 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -97,7 +97,7 @@ public class StructMethod extends StructMember {
     }
   }
 
-  public void releaseResources() throws IOException {
+  public void releaseResources() {
     if (containsCode && expanded) {
       seq = null;
       expanded = false;
@@ -141,12 +141,12 @@ public class StructMethod extends StructMember {
       else {
         switch (opcode) {
           case opc_bipush:
-            operands.add(Integer.valueOf(in.readByte()));
+            operands.add((int)in.readByte());
             i++;
             break;
           case opc_ldc:
           case opc_newarray:
-            operands.add(Integer.valueOf(in.readUnsignedByte()));
+            operands.add(in.readUnsignedByte());
             i++;
             break;
           case opc_sipush:
@@ -171,7 +171,7 @@ public class StructMethod extends StructMember {
             if (opcode != opc_sipush) {
               group = GROUP_JUMP;
             }
-            operands.add(Integer.valueOf(in.readShort()));
+            operands.add((int)in.readShort());
             i += 2;
             break;
           case opc_ldc_w:
@@ -230,12 +230,12 @@ public class StructMethod extends StructMember {
           case opc_iinc:
             if (wide) {
               operands.add(in.readUnsignedShort());
-              operands.add(Integer.valueOf(in.readShort()));
+              operands.add((int)in.readShort());
               i += 4;
             }
             else {
               operands.add(in.readUnsignedByte());
-              operands.add(Integer.valueOf(in.readByte()));
+              operands.add((int)in.readByte());
               i += 2;
             }
             break;
@@ -309,11 +309,11 @@ public class StructMethod extends StructMember {
       if (!operands.isEmpty()) {
         ops = new int[operands.size()];
         for (int j = 0; j < operands.size(); j++) {
-          ops[j] = operands.get(j).intValue();
+          ops[j] = operands.get(j);
         }
       }
 
-      Instruction instr = ConstantsUtil.getInstructionInstance(opcode, wide, group, bytecode_version, ops);
+      Instruction instr = Instruction.create(opcode, wide, group, bytecode_version, ops);
 
       instructions.addWithKey(instr, offset);
 
@@ -331,7 +331,6 @@ public class StructMethod extends StructMember {
       handler.handler = in.readUnsignedShort();
 
       int excclass = in.readUnsignedShort();
-      handler.class_index = excclass;
       if (excclass != 0) {
         handler.exceptionClass = pool.getPrimitiveConstant(excclass).getString();
       }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
index 8511b91..f97417e 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
@@ -6,7 +6,6 @@ import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
 import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
index 2998467..a886b98 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
@@ -5,7 +5,6 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 
 public class StructEnclosingMethodAttribute extends StructGeneralAttribute {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
index 5c09e93..a39d902 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
@@ -28,7 +28,7 @@ public class StructExceptionsAttribute extends StructGeneralAttribute {
   }
 
   public String getExcClassname(int index, ConstantPool pool) {
-    return pool.getPrimitiveConstant(throwsExceptions.get(index).intValue()).getString();
+    return pool.getPrimitiveConstant(throwsExceptions.get(index)).getString();
   }
 
   public List<Integer> getThrowsExceptions() {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index 77d6297..8cc8bdb 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -33,7 +33,6 @@ public class StructGeneralAttribute {
   public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
   public static final String ATTRIBUTE_DEPRECATED = "Deprecated";
   public static final String ATTRIBUTE_LINE_NUMBER_TABLE = "LineNumberTable";
-  public static final String ATTRIBUTE_SOURCE_FILE = "SourceFile";
 
   private String name;
 
@@ -82,9 +81,6 @@ public class StructGeneralAttribute {
     else if (ATTRIBUTE_LINE_NUMBER_TABLE.equals(name)) {
       attr = new StructLineNumberTableAttribute();
     }
-    else if (ATTRIBUTE_SOURCE_FILE.equals(name)) {
-      attr = new StructSourceFileAttribute();
-    }
     else {
       // unsupported attribute
       return null;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
index e02a084..4306381 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
@@ -11,7 +11,6 @@ import java.util.List;
 
 public class StructInnerClassesAttribute extends StructGeneralAttribute {
   public static class Entry {
-    public final int innerNameIdx;
     public final int outerNameIdx;
     public final int simpleNameIdx;
     public final int accessFlags;
@@ -19,8 +18,7 @@ public class StructInnerClassesAttribute extends StructGeneralAttribute {
     public final String enclosingName;
     public final String simpleName;
 
-    private Entry(int innerNameIdx, int outerNameIdx, int simpleNameIdx, int accessFlags, String innerName, String enclosingName, String simpleName) {
-      this.innerNameIdx = innerNameIdx;
+    private Entry(int outerNameIdx, int simpleNameIdx, int accessFlags, String innerName, String enclosingName, String simpleName) {
       this.outerNameIdx = outerNameIdx;
       this.simpleNameIdx = simpleNameIdx;
       this.accessFlags = accessFlags;
@@ -48,7 +46,7 @@ public class StructInnerClassesAttribute extends StructGeneralAttribute {
         String outerName = outerNameIdx != 0 ? pool.getPrimitiveConstant(outerNameIdx).getString() : null;
         String simpleName = simpleNameIdx != 0 ? pool.getPrimitiveConstant(simpleNameIdx).getString() : null;
 
-        entries.add(new Entry(innerNameIdx, outerNameIdx, simpleNameIdx, accessFlags, innerName, outerName, simpleName));
+        entries.add(new Entry(outerNameIdx, simpleNameIdx, accessFlags, innerName, outerName, simpleName));
       }
     }
     else {
@@ -59,4 +57,4 @@ public class StructInnerClassesAttribute extends StructGeneralAttribute {
   public List<Entry> getEntries() {
     return entries;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
index 4a0f103..e641b39 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
@@ -33,10 +33,6 @@ public class StructLineNumberTableAttribute extends StructGeneralAttribute {
     }
   }
 
-  public int getFirstLine() {
-    return myLineInfo.length > 0 ? myLineInfo[1] : -1;
-  }
-
   public int findLineNumber(int pc) {
     if (myLineInfo.length >= 2) {
       for (int i = myLineInfo.length - 2; i >= 0; i -= 2) {
@@ -51,4 +47,4 @@ public class StructLineNumberTableAttribute extends StructGeneralAttribute {
   public int[] getRawData() {
     return myLineInfo;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
index 331d680..829c78e 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
@@ -5,7 +5,6 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
-import java.util.Set;
 
 /*
   u2 local_variable_type_table_length;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
deleted file mode 100644
index e33b266..0000000
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.struct.attr;
-
-import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
-import org.jetbrains.java.decompiler.util.DataInputFullStream;
-
-import java.io.IOException;
-
-public class StructSourceFileAttribute extends StructGeneralAttribute {
-
-  private String fileName;
-
-  @Override
-  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
-    int index = data.readUnsignedShort();
-    fileName = pool.getPrimitiveConstant(index).getString();
-  }
-
-  public String getFileName() {
-    return fileName;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index 2bd2d53..0ea6e01 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -46,17 +46,17 @@ public class ConstantPool implements NewClassNameBuilder {
           break;
 
         case CodeConstants.CONSTANT_Float:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Float, Float.valueOf(in.readFloat())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Float, in.readFloat()));
           break;
 
         case CodeConstants.CONSTANT_Long:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Long, Long.valueOf(in.readLong())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Long, in.readLong()));
           pool.add(null);
           i++;
           break;
 
         case CodeConstants.CONSTANT_Double:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Double, Double.valueOf(in.readDouble())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Double, in.readDouble()));
           pool.add(null);
           i++;
           break;
@@ -137,10 +137,6 @@ public class ConstantPool implements NewClassNameBuilder {
     }
   }
 
-  public int size() {
-    return pool.size();
-  }
-
   public String[] getClassElement(int elementType, String className, int nameIndex, int descriptorIndex) {
     String elementName = ((PrimitiveConstant)getConstant(nameIndex)).getString();
     String descriptor = ((PrimitiveConstant)getConstant(descriptorIndex)).getString();
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
index d4daa40..4a24686 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
@@ -1,41 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/*
- *   NameAndType, FieldRef, MethodRef, InterfaceMethodref
- *   InvokeDynamic, MethodHandle
- */
-
 public class LinkConstant extends PooledConstant {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
   public int index1, index2;
-
   public String classname;
-
   public String elementname;
-
   public String descriptor;
 
-  public int paramCount = 0;
-
-  public boolean isVoid = false;
-
-  public boolean returnCategory2 = false;
-
-
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
   public LinkConstant(int type, String classname, String elementname, String descriptor) {
-    this.type = type;
+    super(type);
     this.classname = classname;
     this.elementname = elementname;
     this.descriptor = descriptor;
@@ -44,18 +17,25 @@ public class LinkConstant extends PooledConstant {
   }
 
   public LinkConstant(int type, int index1, int index2) {
-    this.type = type;
+    super(type);
     this.index1 = index1;
     this.index2 = index2;
   }
 
+  private void initConstant() {
+    if (type == CONSTANT_Methodref ||
+        type == CONSTANT_InterfaceMethodref ||
+        type == CONSTANT_InvokeDynamic ||
+        type == CONSTANT_MethodHandle) {
+      int parenth = descriptor.indexOf(')');
+      if (descriptor.length() < 2 || parenth < 0 || descriptor.charAt(0) != '(') {
+        throw new IllegalArgumentException("Invalid descriptor: " + descriptor);
+      }
+    }
+  }
 
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
+  @Override
   public void resolveConstant(ConstantPool pool) {
-
     if (type == CONSTANT_NameAndType) {
       elementname = pool.getPrimitiveConstant(index1).getString();
       descriptor = pool.getPrimitiveConstant(index2).getString();
@@ -80,18 +60,7 @@ public class LinkConstant extends PooledConstant {
     initConstant();
   }
 
-  public void writeToStream(DataOutputStream out) throws IOException {
-    out.writeByte(type);
-    if (type == CONSTANT_MethodHandle) {
-      out.writeByte(index1);
-    }
-    else {
-      out.writeShort(index1);
-    }
-    out.writeShort(index2);
-  }
-
-
+  @Override
   public boolean equals(Object o) {
     if (o == this) return true;
     if (o == null || !(o instanceof LinkConstant)) return false;
@@ -102,51 +71,4 @@ public class LinkConstant extends PooledConstant {
            this.descriptor.equals(cn.descriptor) &&
            (this.type != CONSTANT_NameAndType || this.classname.equals(cn.classname));
   }
-
-  // *****************************************************************************
-  // private methods
-  // *****************************************************************************
-
-  private void initConstant() {
-
-    if (type == CONSTANT_Methodref ||
-        type == CONSTANT_InterfaceMethodref ||
-        type == CONSTANT_InvokeDynamic ||
-        type == CONSTANT_MethodHandle) {
-      resolveDescriptor(descriptor);
-    }
-    else if (type == CONSTANT_Fieldref) {
-      returnCategory2 = ("D".equals(descriptor) || "J".equals(descriptor));
-    }
-  }
-
-  private void resolveDescriptor(String descr) {
-    int parenth = descr.indexOf(')');
-    if (descr.length() < 2 || parenth < 0 || descr.charAt(0) != '(') {
-      throw new IllegalArgumentException("Invalid descriptor: " + descr);
-    }
-
-    int counter = 0;
-    if (parenth > 1) { // params
-      int index = 1;
-      while (index < parenth) {
-        char c = descr.charAt(index);
-        if (c == 'L') {
-          index = descr.indexOf(";", index);
-        }
-        else if (c == '[') {
-          index++;
-          continue;
-        }
-        counter++;
-        index++;
-      }
-    }
-
-    paramCount = counter;
-    char retChar = descr.charAt(parenth + 1);
-    isVoid = retChar == 'V';
-    returnCategory2 = (retChar == 'D') || (retChar == 'J');
-   }
-}
-
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
index 7a3d9b0..7486fb3 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
@@ -3,101 +3,12 @@ package org.jetbrains.java.decompiler.struct.consts;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
+public class PooledConstant implements CodeConstants {
+  public final int type;
 
-/*
-    cp_info {
-    	u1 tag;
-    	u1 info[];
-    }
-
-*/
-
-public class PooledConstant implements CodeConstants, VariableTypeEnum {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
-  public int type;
-
-  public boolean own = false;
-
-  public int returnType;
-
-
-  // *****************************************************************************
-  // private fields
-  // *****************************************************************************
-
-  private Object[] values;
-
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
-  public PooledConstant() {
-  }
-
-  public PooledConstant(int type, Object[] values) {
+  public PooledConstant(int type) {
     this.type = type;
-    this.values = values;
-    this.returnType = poolTypeToIntern(type);
   }
 
-  public PooledConstant(int type, boolean own, Object[] values) {
-    this.type = type;
-    this.own = own;
-    this.values = values;
-    this.returnType = poolTypeToIntern(type);
-  }
-
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public void resolveConstant(ConstantPool pool) {
-    // to be overwritten
-  }
-
-  public void writeToStream(DataOutputStream out) throws IOException {
-    // to be overwritten
-  }
-
-  public int poolTypeToIntern(int type) {
-
-    switch (type) {
-      case CONSTANT_Integer:
-        return INT;
-      case CONSTANT_Float:
-        return FLOAT;
-      case CONSTANT_Long:
-        return LONG;
-      case CONSTANT_Double:
-        return DOUBLE;
-      case CONSTANT_String:
-      case CONSTANT_Class:  // 1.5 -> ldc class
-        return REFERENCE;
-      default:
-        throw new RuntimeException("Huh?? What are you trying to load?");
-    }
-  }
-
-  public Object getValue(int index) {
-    return values[index];
-  }
-
-
-  // *****************************************************************************
-  // getter and setter methods
-  // *****************************************************************************
-
-  public Object[] getValues() {
-    return values;
-  }
-
-  public void setValues(Object[] values) {
-    this.values = values;
-  }
-}
+  public void resolveConstant(ConstantPool pool) { }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
index 8a12c8a..3d8bfb0 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
@@ -1,97 +1,43 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/*
- *   Integer, Long, Float, Double, String, Class, UTF8
- */
-
 public class PrimitiveConstant extends PooledConstant {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
   public int index;
-
   public Object value;
-
   public boolean isArray;
 
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
   public PrimitiveConstant(int type, Object value) {
-    this.type = type;
+    super(type);
     this.value = value;
 
     initConstant();
   }
 
   public PrimitiveConstant(int type, int index) {
-    this.type = type;
+    super(type);
     this.index = index;
   }
 
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public int getInt() {
-    return ((Integer)value).intValue();
-  }
-
-  public long getLong() {
-    return ((Long)value).longValue();
-  }
-
-  public float getFloat() {
-    return ((Float)value).floatValue();
-  }
-
-  public double getDouble() {
-    return ((Double)value).doubleValue();
+  private void initConstant() {
+    if (type == CONSTANT_Class) {
+      String className = getString();
+      isArray = (className.length() > 0 && className.charAt(0) == '['); // empty string for a class name seems to be possible in some android files
+    }
   }
 
   public String getString() {
     return (String)value;
   }
 
+  @Override
   public void resolveConstant(ConstantPool pool) {
-
     if (type == CONSTANT_Class || type == CONSTANT_String || type == CONSTANT_MethodType) {
       value = pool.getPrimitiveConstant(index).getString();
       initConstant();
     }
   }
 
-  public void writeToStream(DataOutputStream out) throws IOException {
-
-    out.writeByte(type);
-    switch (type) {
-      case CONSTANT_Integer:
-        out.writeInt(getInt());
-        break;
-      case CONSTANT_Float:
-        out.writeFloat(getFloat());
-        break;
-      case CONSTANT_Long:
-        out.writeLong(getLong());
-        break;
-      case CONSTANT_Double:
-        out.writeDouble(getDouble());
-        break;
-      case CONSTANT_Utf8:
-        out.writeUTF(getString());
-        break;
-      default: // CONSTANT_Class, CONSTANT_String, CONSTANT_MethodType
-        out.writeShort(index);
-    }
-  }
-
+  @Override
   public boolean equals(Object o) {
     if (o == this) return true;
     if (o == null || !(o instanceof PrimitiveConstant)) return false;
@@ -101,12 +47,4 @@ public class PrimitiveConstant extends PooledConstant {
            this.isArray == cn.isArray &&
            this.value.equals(cn.value);
   }
-
-  private void initConstant() {
-    if (type == CONSTANT_Class) {
-      String className = getString();
-      isArray =
-        (className.length() > 0 && className.charAt(0) == '['); // empty string for a class name seems to be possible in some android files
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java b/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
deleted file mode 100644
index 7770972..0000000
--- a/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.struct.consts;
-
-public interface VariableTypeEnum {
-
-  int BOOLEAN = 1;
-  int BYTE = 2;
-  int CHAR = 3;
-  int SHORT = 4;
-  int INT = 5;
-  int FLOAT = 6;
-  int LONG = 7;
-  int DOUBLE = 8;
-  int RETURN_ADDRESS = 9;
-  int REFERENCE = 10;
-  int INSTANCE_UNINITIALIZED = 11;
-  int VALUE_UNKNOWN = 12;
-  int VOID = 13;
-
-  Integer BOOLEAN_OBJ = new Integer(BOOLEAN);
-  Integer BYTE_OBJ = new Integer(BYTE);
-  Integer CHAR_OBJ = new Integer(CHAR);
-  Integer SHORT_OBJ = new Integer(SHORT);
-  Integer INT_OBJ = new Integer(INT);
-  Integer FLOAT_OBJ = new Integer(FLOAT);
-  Integer LONG_OBJ = new Integer(LONG);
-  Integer DOUBLE_OBJ = new Integer(DOUBLE);
-  Integer RETURN_ADDRESS_OBJ = new Integer(RETURN_ADDRESS);
-  Integer REFERENCE_OBJ = new Integer(REFERENCE);
-  Integer INSTANCE_UNINITIALIZED_OBJ = new Integer(INSTANCE_UNINITIALIZED);
-  Integer VALUE_UNKNOWN_OBJ = new Integer(VALUE_UNKNOWN);
-  Integer VOID_OBJ = new Integer(VOID);
-}
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 324441b..d531fe4 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -157,12 +158,9 @@ public class GenericMain {
   }
 
   public static String getGenericCastTypeName(GenericType type) {
-    String s = getTypeName(type);
-    int dim = type.arrayDim;
-    while (dim-- > 0) {
-      s += "[]";
-    }
-    return s;
+    StringBuilder s = new StringBuilder(getTypeName(type));
+    TextUtil.append(s, "[]", type.arrayDim);
+    return s.toString();
   }
 
   private static String getTypeName(GenericType type) {
diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
index eaf5615..abd24f9 100644
--- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
@@ -12,7 +12,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class LazyLoader {
-
   private final Map<String, Link> mapClassLinks = new HashMap<>();
   private final IBytecodeProvider provider;
 
@@ -130,17 +129,11 @@ public class LazyLoader {
     }
   }
 
-
   public static class Link {
-    public static final int CLASS = 1;
-    public static final int ENTRY = 2;
-
-    public final int type;
     public final String externalPath;
     public final String internalPath;
 
-    public Link(int type, String externalPath, String internalPath) {
-      this.type = type;
+    public Link(String externalPath, String internalPath) {
       this.externalPath = externalPath;
       this.internalPath = internalPath;
     }
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
index e2f0d81..3c38e6b 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
@@ -1,13 +1,6 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
 import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
@@ -17,6 +10,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 
+import java.util.*;
+
 
 public class MatchEngine {
 
@@ -114,9 +109,9 @@ public class MatchEngine {
         MatchProperties property = (node_type == MatchNode.MATCHNODE_STATEMENT ? stat_properties : expr_properties).get(values[0]);
         if(property == null) { // unknown property defined
           throw new RuntimeException("Unknown matching property");
-        } else {
-
-          Object value = null;
+        }
+        else {
+          Object value;
           int parameter = 0;
 
           String strValue = values[1];
@@ -222,19 +217,17 @@ public class MatchEngine {
   }
 
   public boolean checkAndSetVariableValue(String name, Object value) {
-
     Object old_value = variables.get(name);
-    if(old_value == null) {
-      variables.put(name, value);
-    } else if(!old_value.equals(value)) {
-      return false;
+    if (old_value != null) {
+      return old_value.equals(value);
+    }
+    else {
+      variables.put(name, value);
+      return true;
     }
-
-    return true;
   }
 
   public Object getVariableValue(String name) {
     return variables.get(name);
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
index ab374c8..c852838 100644
--- a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
@@ -97,12 +97,6 @@ public class FastFixedSetFactory<E> {
       data[index[0]] &= ~index[1];
     }
 
-    public void removeAll(Collection<E> set) {
-      for (E element : set) {
-        remove(element);
-      }
-    }
-
     public boolean contains(E element) {
       int[] index = colValuesInternal.getWithKey(element);
       return (data[index[0]] & index[1]) != 0;
@@ -139,15 +133,6 @@ public class FastFixedSetFactory<E> {
       }
     }
 
-    public void symdiff(FastFixedSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        intdata[i] ^= extdata[i];
-      }
-    }
-
     public void complement(FastFixedSet<E> set) {
       int[] extdata = set.getData();
       int[] intdata = data;
@@ -194,11 +179,6 @@ public class FastFixedSetFactory<E> {
       return toPlainCollection(new HashSet<>());
     }
 
-    public List<E> toPlainList() {
-      return toPlainCollection(new ArrayList<>());
-    }
-
-
     private <T extends Collection<E>> T toPlainCollection(T cl) {
 
       int[] intdata = data;
@@ -219,18 +199,6 @@ public class FastFixedSetFactory<E> {
       return cl;
     }
 
-    public String toBinary() {
-
-      StringBuilder buffer = new StringBuilder();
-      int[] intdata = data;
-
-      for (int i = 0; i < intdata.length; i++) {
-        buffer.append(" ").append(Integer.toBinaryString(intdata[i]));
-      }
-
-      return buffer.toString();
-    }
-
     public String toString() {
 
       StringBuilder buffer = new StringBuilder("{");
@@ -342,5 +310,4 @@ public class FastFixedSetFactory<E> {
       data[index[0]] &= ~index[1];
     }
   }
-}
-
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
deleted file mode 100644
index b58901d..0000000
--- a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
+++ /dev/null
@@ -1,475 +0,0 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.util;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-public class FastSetFactory<E> {
-
-  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<>();
-
-  private int lastBlock;
-
-  private int lastMask;
-
-  public FastSetFactory(Collection<E> set) {
-
-    int block = -1;
-    int mask = -1;
-    int index = 0;
-
-    for (E element : set) {
-
-      block = index / 32;
-
-      if (index % 32 == 0) {
-        mask = 1;
-      }
-      else {
-        mask <<= 1;
-      }
-
-      colValuesInternal.putWithKey(new int[]{block, mask}, element);
-
-      index++;
-    }
-
-    lastBlock = block;
-    lastMask = mask;
-  }
-
-  private int[] addElement(E element) {
-
-    if (lastMask == -1 || lastMask == 0x80000000) {
-      lastMask = 1;
-      lastBlock++;
-    }
-    else {
-      lastMask <<= 1;
-    }
-
-    int[] pointer = new int[]{lastBlock, lastMask};
-    colValuesInternal.putWithKey(pointer, element);
-
-    return pointer;
-  }
-
-  public FastSet<E> spawnEmptySet() {
-    return new FastSet<>(this);
-  }
-
-  public int getLastBlock() {
-    return lastBlock;
-  }
-
-  public int getLastMask() {
-    return lastMask;
-  }
-
-  private VBStyleCollection<int[], E> getInternalValuesCollection() {
-    return colValuesInternal;
-  }
-
-
-  public static class FastSet<E> implements Iterable<E> {
-
-    private final FastSetFactory<E> factory;
-
-    private final VBStyleCollection<int[], E> colValuesInternal;
-
-    private int[] data;
-
-    private FastSet(FastSetFactory<E> factory) {
-      this.factory = factory;
-      this.colValuesInternal = factory.getInternalValuesCollection();
-      this.data = new int[factory.getLastBlock() + 1];
-    }
-
-    public FastSet<E> getCopy() {
-
-      FastSet<E> copy = new FastSet<>(factory);
-
-      int arrlength = data.length;
-      int[] cpdata = new int[arrlength];
-
-      System.arraycopy(data, 0, cpdata, 0, arrlength);
-      copy.setData(cpdata);
-
-      return copy;
-    }
-
-    private int[] ensureCapacity(int index) {
-
-      int newlength = data.length;
-      if (newlength == 0) {
-        newlength = 1;
-      }
-
-      while (newlength <= index) {
-        newlength *= 2;
-      }
-
-      int[] newdata = new int[newlength];
-      System.arraycopy(data, 0, newdata, 0, data.length);
-
-      return data = newdata;
-    }
-
-    public void add(E element) {
-      int[] index = colValuesInternal.getWithKey(element);
-
-      if (index == null) {
-        index = factory.addElement(element);
-      }
-
-      if (index[0] >= data.length) {
-        ensureCapacity(index[0]);
-      }
-
-      data[index[0]] |= index[1];
-    }
-
-    public void setAllElements() {
-
-      int lastblock = factory.getLastBlock();
-      int lastmask = factory.getLastMask();
-
-      if (lastblock >= data.length) {
-        ensureCapacity(lastblock);
-      }
-
-      for (int i = lastblock - 1; i >= 0; i--) {
-        data[i] = 0xFFFFFFFF;
-      }
-
-      data[lastblock] = lastmask | (lastmask - 1);
-    }
-
-    public void addAll(Set<E> set) {
-      for (E element : set) {
-        add(element);
-      }
-    }
-
-    public void remove(E element) {
-      int[] index = colValuesInternal.getWithKey(element);
-
-      if (index == null) {
-        index = factory.addElement(element);
-      }
-
-      if (index[0] < data.length) {
-        data[index[0]] &= ~index[1];
-      }
-    }
-
-    public void removeAll(Set<E> set) {
-      for (E element : set) {
-        remove(element);
-      }
-    }
-
-    public boolean contains(E element) {
-      int[] index = colValuesInternal.getWithKey(element);
-
-      if (index == null) {
-        index = factory.addElement(element);
-      }
-
-      return index[0] < data.length && ((data[index[0]] & index[1]) != 0);
-    }
-
-    public boolean contains(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        if ((extdata[i] & ~intdata[i]) != 0) {
-          return false;
-        }
-      }
-
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    public void union(FastSet<E> set) {
-
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] |= extdata[i];
-      }
-
-      boolean expanded = false;
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          if (!expanded) {
-            intdata = ensureCapacity(extdata.length - 1);
-          }
-          intdata[i] = extdata[i];
-        }
-      }
-    }
-
-    public void intersection(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] &= extdata[i];
-      }
-
-      for (int i = intdata.length - 1; i >= minlength; i--) {
-        intdata[i] = 0;
-      }
-    }
-
-    public void symdiff(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] ^= extdata[i];
-      }
-
-      boolean expanded = false;
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          if (!expanded) {
-            intdata = ensureCapacity(extdata.length - 1);
-          }
-          intdata[i] = extdata[i];
-        }
-      }
-    }
-
-    public void complement(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] &= ~extdata[i];
-      }
-    }
-
-
-    public boolean equals(Object o) {
-      if (o == this) return true;
-      if (o == null || !(o instanceof FastSet)) return false;
-
-      int[] longdata = ((FastSet)o).getData();
-      int[] shortdata = data;
-
-      if (data.length > longdata.length) {
-        shortdata = longdata;
-        longdata = data;
-      }
-
-      for (int i = shortdata.length - 1; i >= 0; i--) {
-        if (shortdata[i] != longdata[i]) {
-          return false;
-        }
-      }
-
-      for (int i = longdata.length - 1; i >= shortdata.length; i--) {
-        if (longdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    public int getCardinality() {
-
-      boolean found = false;
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        int block = intdata[i];
-        if (block != 0) {
-          if (found) {
-            return 2;
-          }
-          else {
-            if ((block & (block - 1)) == 0) {
-              found = true;
-            }
-            else {
-              return 2;
-            }
-          }
-        }
-      }
-
-      return found ? 1 : 0;
-    }
-
-    public int size() {
-
-      int size = 0;
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        size += Integer.bitCount(intdata[i]);
-      }
-
-      return size;
-    }
-
-    public boolean isEmpty() {
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        if (intdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    public Iterator<E> iterator() {
-      return new FastSetIterator<>(this);
-    }
-
-    public Set<E> toPlainSet() {
-      HashSet<E> set = new HashSet<>();
-
-      int[] intdata = data;
-
-      int size = data.length * 32;
-      if (size > colValuesInternal.size()) {
-        size = colValuesInternal.size();
-      }
-
-      for (int i = size - 1; i >= 0; i--) {
-        int[] index = colValuesInternal.get(i);
-
-        if ((intdata[index[0]] & index[1]) != 0) {
-          set.add(colValuesInternal.getKey(i));
-        }
-      }
-
-      return set;
-    }
-
-    public String toBinary() {
-
-      StringBuilder buffer = new StringBuilder();
-      int[] intdata = data;
-
-      for (int i = 0; i < intdata.length; i++) {
-        buffer.append(" ").append(Integer.toBinaryString(intdata[i]));
-      }
-
-      return buffer.toString();
-    }
-
-    private int[] getData() {
-      return data;
-    }
-
-    private void setData(int[] data) {
-      this.data = data;
-    }
-
-    public int[] getLoad() {
-      int[] intdata = data;
-      int notempty = 0;
-
-      for (int i = 0; i < intdata.length; i++) {
-        if (intdata[i] != 0) {
-          notempty++;
-        }
-      }
-
-      return new int[]{intdata.length, notempty};
-    }
-
-    public FastSetFactory<E> getFactory() {
-      return factory;
-    }
-  }
-
-  public static class FastSetIterator<E> implements Iterator<E> {
-
-    private final VBStyleCollection<int[], E> colValuesInternal;
-    private final int[] data;
-    private int size;
-
-    private int pointer = -1;
-    private int next_pointer = -1;
-
-    private FastSetIterator(FastSet<E> set) {
-      colValuesInternal = set.getFactory().getInternalValuesCollection();
-      data = set.getData();
-
-      size = colValuesInternal.size();
-      int datasize = data.length * 32;
-
-      if (datasize < size) {
-        size = datasize;
-      }
-    }
-
-    public boolean hasNext() {
-
-      next_pointer = pointer;
-
-      while (++next_pointer < size) {
-        int[] index = colValuesInternal.get(next_pointer);
-        if ((data[index[0]] & index[1]) != 0) {
-          return true;
-        }
-      }
-
-      next_pointer = -1;
-      return false;
-    }
-
-    public E next() {
-      if (next_pointer >= 0) {
-        pointer = next_pointer;
-      }
-      else {
-        while (++pointer < size) {
-          int[] index = colValuesInternal.get(pointer);
-          if ((data[index[0]] & index[1]) != 0) {
-            break;
-          }
-        }
-      }
-
-      next_pointer = -1;
-      return pointer < size ? colValuesInternal.getKey(pointer) : null;
-    }
-
-    public void remove() {
-      int[] index = colValuesInternal.get(pointer);
-      data[index[0]] &= ~index[1];
-
-      pointer--;
-    }
-  }
-}
-
diff --git a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
index 4748312..f94360d 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
@@ -64,10 +64,6 @@ public class FastSparseSetFactory<E> {
     return lastBlock;
   }
 
-  public int getLastMask() {
-    return lastMask;
-  }
-
   private VBStyleCollection<int[], E> getInternalValuesCollection() {
     return colValuesInternal;
   }
@@ -151,30 +147,6 @@ public class FastSparseSetFactory<E> {
       changeNext(next, block, next[block], block);
     }
 
-    public void setAllElements() {
-
-      int lastblock = factory.getLastBlock();
-      int lastmask = factory.getLastMask();
-
-      if (lastblock >= data.length) {
-        ensureCapacity(lastblock);
-      }
-
-      for (int i = lastblock - 1; i >= 0; i--) {
-        data[i] = 0xFFFFFFFF;
-        next[i] = i + 1;
-      }
-
-      data[lastblock] = lastmask | (lastmask - 1);
-      next[lastblock] = 0;
-    }
-
-    public void addAll(Set<E> set) {
-      for (E element : set) {
-        add(element);
-      }
-    }
-
     public void remove(E element) {
       int[] index = colValuesInternal.getWithKey(element);
 
@@ -192,12 +164,6 @@ public class FastSparseSetFactory<E> {
       }
     }
 
-    public void removeAll(Set<E> set) {
-      for (E element : set) {
-        remove(element);
-      }
-    }
-
     public boolean contains(E element) {
       int[] index = colValuesInternal.getWithKey(element);
 
@@ -208,27 +174,6 @@ public class FastSparseSetFactory<E> {
       return index[0] < data.length && ((data[index[0]] & index[1]) != 0);
     }
 
-    public boolean contains(FastSparseSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        if ((extdata[i] & ~intdata[i]) != 0) {
-          return false;
-        }
-      }
-
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
     private void setNext() {
 
       int link = 0;
@@ -293,29 +238,6 @@ public class FastSparseSetFactory<E> {
       setNext();
     }
 
-    public void symdiff(FastSparseSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] ^= extdata[i];
-      }
-
-      boolean expanded = false;
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          if (!expanded) {
-            intdata = ensureCapacity(extdata.length - 1);
-          }
-          intdata[i] = extdata[i];
-        }
-      }
-
-      setNext();
-    }
-
     public void complement(FastSparseSet<E> set) {
 
       int[] extdata = set.getData();
@@ -424,18 +346,6 @@ public class FastSparseSetFactory<E> {
       return toPlainSet().toString();
     }
 
-    public String toBinary() {
-
-      StringBuilder buffer = new StringBuilder();
-      int[] intdata = data;
-
-      for (int i = 0; i < intdata.length; i++) {
-        buffer.append(" ").append(Integer.toBinaryString(intdata[i]));
-      }
-
-      return buffer.toString();
-    }
-
     private int[] getData() {
       return data;
     }
@@ -444,19 +354,6 @@ public class FastSparseSetFactory<E> {
       return next;
     }
 
-    public int[] getLoad() {
-      int[] intdata = data;
-      int notempty = 0;
-
-      for (int i = 0; i < intdata.length; i++) {
-        if (intdata[i] != 0) {
-          notempty++;
-        }
-      }
-
-      return new int[]{intdata.length, notempty};
-    }
-
     public FastSparseSetFactory<E> getFactory() {
       return factory;
     }
diff --git a/src/org/jetbrains/java/decompiler/util/ListStack.java b/src/org/jetbrains/java/decompiler/util/ListStack.java
index 3502045..e1d169f 100644
--- a/src/org/jetbrains/java/decompiler/util/ListStack.java
+++ b/src/org/jetbrains/java/decompiler/util/ListStack.java
@@ -4,7 +4,6 @@ package org.jetbrains.java.decompiler.util;
 import java.util.ArrayList;
 
 public class ListStack<T> extends ArrayList<T> {
-
   protected int pointer = 0;
 
   public ListStack() {
@@ -15,16 +14,16 @@ public class ListStack<T> extends ArrayList<T> {
     super(list);
   }
 
+  @SuppressWarnings("MethodDoesntCallSuperMethod")
   public ListStack<T> clone() {
-    ListStack<T> newstack = new ListStack<>(this);
-    newstack.pointer = this.pointer;
-    return newstack;
+    ListStack<T> copy = new ListStack<>(this);
+    copy.pointer = this.pointer;
+    return copy;
   }
 
-  public T push(T item) {
+  public void push(T item) {
     this.add(item);
     pointer++;
-    return item;
   }
 
   public T pop() {
@@ -42,11 +41,6 @@ public class ListStack<T> extends ArrayList<T> {
     return o;
   }
 
-  public void remove() {
-    pointer--;
-    this.remove(pointer);
-  }
-
   public void removeMultiple(int count) {
     while (count > 0) {
       pointer--;
@@ -55,10 +49,6 @@ public class ListStack<T> extends ArrayList<T> {
     }
   }
 
-  public boolean empty() {
-    return (pointer == 0);
-  }
-
   public int getPointer() {
     return pointer;
   }
@@ -76,4 +66,4 @@ public class ListStack<T> extends ArrayList<T> {
     super.clear();
     pointer = 0;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
index d5e95fc..d1465c6 100644
--- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
+++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
@@ -105,10 +105,6 @@ public class SFormsFastMapDirect {
     putInternal(key, value, false);
   }
 
-  public void remove(int key) {
-    putInternal(key, null, true);
-  }
-
   public void removeAllFields() {
     FastSparseSet<Integer>[] arr = elements[2];
     int[] arrnext = next[2];
@@ -397,4 +393,4 @@ public class SFormsFastMapDirect {
 
     return arrnew;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index c8a74b0..4198992 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -30,12 +30,14 @@ public class TextUtil {
     if (length == 0) return "";
     StringBuilder buf = new StringBuilder();
     String indent = (String)DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
-    while (length-- > 0) {
-      buf.append(indent);
-    }
+    append(buf, indent, length);
     return buf.toString();
   }
 
+  public static void append(StringBuilder buf, String string, int times) {
+    while (times-- > 0) buf.append(string);
+  }
+
   public static boolean isPrintableUnicode(char c) {
     int t = Character.getType(c);
     return t != Character.UNASSIGNED && t != Character.LINE_SEPARATOR && t != Character.PARAGRAPH_SEPARATOR &&
diff --git a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
index 1d4a46c..8200843 100644
--- a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
+++ b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
@@ -3,7 +3,6 @@ package org.jetbrains.java.decompiler.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 
 public class VBStyleCollection<E, K> extends ArrayList<E> {
@@ -22,10 +21,6 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     map = new HashMap<>(initialCapacity);
   }
 
-  public VBStyleCollection(Collection<E> c) {
-    super(c);
-  }
-
   public boolean add(E element) {
     lstKeys.add(null);
     super.add(element);
@@ -43,12 +38,6 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     return super.addAll(c);
   }
 
-  public void addAllWithKey(VBStyleCollection<E, K> c) {
-    for (int i = 0; i < c.size(); i++) {
-      addWithKey(c.get(i), c.getKey(i));
-    }
-  }
-
   public void addAllWithKey(Collection<E> elements, Collection<K> keys) {
     int index = super.size();
 
@@ -92,7 +81,7 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
   }
 
   public void removeWithKey(K key) {
-    int index = map.get(key).intValue();
+    int index = map.get(key);
     addToListIndex(index + 1, -1);
     super.remove(index);
     lstKeys.remove(index);
@@ -114,11 +103,11 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     if (index == null) {
       return null;
     }
-    return super.get(index.intValue());
+    return super.get(index);
   }
 
   public int getIndexByKey(K key) {
-    return map.get(key).intValue();
+    return map.get(key);
   }
 
   public E getLast() {
@@ -143,26 +132,6 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     return c;
   }
 
-  public void swap(int index1, int index2) {
-
-    Collections.swap(this, index1, index2);
-    Collections.swap(lstKeys, index1, index2);
-
-    K key = lstKeys.get(index1);
-    if (key != null) {
-      map.put(key, index1);
-    }
-
-    key = lstKeys.get(index2);
-    if (key != null) {
-      map.put(key, index2);
-    }
-  }
-
-  public HashMap<K, Integer> getMap() {
-    return map;
-  }
-
   public void setMap(HashMap<K, Integer> map) {
     this.map = map;
   }
@@ -187,4 +156,4 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
       }
     }
   }
-}
+}
\ No newline at end of file

From bb913e6814ecb0f44a4bc31ff1d094a548ee8eb4 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 1 Dec 2017 20:16:59 +0100
Subject: [PATCH 160/252] [java decompiler] fixes NPE in import collector

---
 .../java/decompiler/main/collectors/ImportCollector.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 2b10963..0423381 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -72,7 +72,7 @@ public class ImportCollector {
 
     StringBuilder result = null;
     if (node != null && node.classStruct.isOwn()) {
-      result = new StringBuilder(node.simpleName);
+      result = new StringBuilder(String.valueOf(node.simpleName));
 
       while (node.parent != null && node.type == ClassNode.CLASS_MEMBER) {
         result.insert(0, node.parent.simpleName + '.');

From 149d7ee681ae866255816b2acfce1bcfc0124bcf Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Dec 2017 14:42:59 +0100
Subject: [PATCH 161/252] [java decompiler] reverts incorrect optimization

---
 .../main/collectors/ImportCollector.java        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 0423381..cdc48e9 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
@@ -68,14 +70,15 @@ public class ImportCollector {
   }
 
   public String getShortName(String fullName, boolean imported) {
-    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(fullName.replace('.', '/'));
+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(fullName.replace('.', '/')); //todo[r.sh] anonymous classes?
 
-    StringBuilder result = null;
+    String result = null;
     if (node != null && node.classStruct.isOwn()) {
-      result = new StringBuilder(String.valueOf(node.simpleName));
+      result = node.simpleName;
 
       while (node.parent != null && node.type == ClassNode.CLASS_MEMBER) {
-        result.insert(0, node.parent.simpleName + '.');
+        //noinspection StringConcatenationInLoop
+        result = node.parent.simpleName + '.' + result;
         node = node.parent;
       }
 
@@ -84,7 +87,7 @@ public class ImportCollector {
         fullName = fullName.replace('/', '.');
       }
       else {
-        return result.toString();
+        return result;
       }
     }
     else {
@@ -121,7 +124,7 @@ public class ImportCollector {
       }
     }
 
-    return result == null ? shortName : result.toString();
+    return result == null ? shortName : result;
   }
 
   public int writeImports(TextBuffer buffer) {

From 93429bc8a5990beb6405bae1a2ae74a767adc6d7 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Dec 2017 14:44:19 +0100
Subject: [PATCH 162/252] Cleanup (formatting; typos)

---
 .../jetbrains/java/decompiler/main/ClassWriter.java  | 12 +++++++-----
 .../decompiler/modules/decompiler/ExprProcessor.java |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index ad96ccd..a296a0d 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -422,9 +424,9 @@ public class ClassWriter {
     }
     if (initializer != null) {
       if (isEnum && initializer.type == Exprent.EXPRENT_NEW) {
-        NewExprent nexpr = (NewExprent)initializer;
-        nexpr.setEnumConst(true);
-        buffer.append(nexpr.toJava(indent, tracer));
+        NewExprent expr = (NewExprent)initializer;
+        expr.setEnumConst(true);
+        buffer.append(expr.toJava(indent, tracer));
       }
       else {
         buffer.append(" = ");
@@ -433,7 +435,7 @@ public class ClassWriter {
           ((ConstExprent) initializer).adjustConstType(fieldType);
         }
 
-        // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction.
+        // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode instruction
         buffer.append(initializer.toJava(indent, tracer));
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 05926c9..00536fc 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -675,7 +677,6 @@ public class ExprProcessor implements CodeConstants {
   }
 
   public static String getTypeName(VarType type, boolean getShort) {
-
     int tp = type.type;
     if (tp <= CodeConstants.TYPE_BOOLEAN) {
       return typeNames[tp];

From acf6646941222f48e7e77f7f51592bed64ec3528 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 5 Dec 2017 12:57:55 +0100
Subject: [PATCH 163/252] [java decompiler] excludes false inner classes

---
 .../decompiler/main/ClassesProcessor.java     |  45 ++++++++----------
 .../java/decompiler/SingleClassesTest.java    |   2 +
 .../TestGroovyTrait$Trait$FieldHelper.class   | Bin 0 -> 467 bytes
 .../pkg/TestGroovyTrait$Trait$Helper.class    | Bin 0 -> 5192 bytes
 testData/classes/pkg/TestGroovyTrait.class    | Bin 0 -> 530 bytes
 testData/results/TestGroovyTrait.dec          |  17 +++++++
 testData/src/pkg/TestGroovyTrait.groovy       |   8 ++++
 7 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 testData/classes/pkg/TestGroovyTrait$Trait$FieldHelper.class
 create mode 100644 testData/classes/pkg/TestGroovyTrait$Trait$Helper.class
 create mode 100644 testData/classes/pkg/TestGroovyTrait.class
 create mode 100644 testData/results/TestGroovyTrait.dec
 create mode 100644 testData/src/pkg/TestGroovyTrait.groovy

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 9995121..26817be 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -77,37 +77,33 @@ public class ClassesProcessor {
 
               Inner rec = new Inner();
               rec.simpleName = simpleName;
-              rec.type = entry.outerNameIdx != 0 ? ClassNode.CLASS_MEMBER : entry.simpleNameIdx != 0 ? ClassNode.CLASS_LOCAL : ClassNode.CLASS_ANONYMOUS;
+              rec.type = entry.simpleNameIdx == 0 ? ClassNode.CLASS_ANONYMOUS : entry.outerNameIdx == 0 ? ClassNode.CLASS_LOCAL : ClassNode.CLASS_MEMBER;
               rec.accessFlags = entry.accessFlags;
 
               // enclosing class
-              String enclClassName;
-              if (entry.outerNameIdx != 0) {
-                enclClassName = entry.enclosingName;
+              String enclClassName = entry.outerNameIdx != 0 ? entry.enclosingName : cl.qualifiedName;
+              if (enclClassName == null || innerName.equals(enclClassName)) {
+                continue;  // invalid name or self reference
               }
-              else {
-                enclClassName = cl.qualifiedName;
+              if (rec.type == ClassNode.CLASS_MEMBER && !innerName.equals(enclClassName + '$' + entry.simpleName)) {
+                continue;  // not a real inner class
               }
 
-              if (!innerName.equals(enclClassName)) {  // self reference
-                StructClass enclosing_class = context.getClasses().get(enclClassName);
-                if (enclosing_class != null && enclosing_class.isOwn()) { // own classes only
-
-                  Inner existingRec = mapInnerClasses.get(innerName);
-                  if (existingRec == null) {
-                    mapInnerClasses.put(innerName, rec);
-                  }
-                  else if (!Inner.equal(existingRec, rec)) {
-                    String message = "Inconsistent inner class entries for " + innerName + "!";
-                    DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-                  }
-
-                  // reference to the nested class
-                  mapNestedClassReferences.computeIfAbsent(enclClassName, k1 -> new HashSet<>()).add(innerName);
-
-                  // reference to the enclosing class
-                  mapEnclosingClassReferences.computeIfAbsent(innerName, k -> new HashSet<>()).add(enclClassName);
+              StructClass enclosingClass = context.getClasses().get(enclClassName);
+              if (enclosingClass != null && enclosingClass.isOwn()) { // own classes only
+                Inner existingRec = mapInnerClasses.get(innerName);
+                if (existingRec == null) {
+                  mapInnerClasses.put(innerName, rec);
                 }
+                else if (!Inner.equal(existingRec, rec)) {
+                  String message = "Inconsistent inner class entries for " + innerName + "!";
+                  DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+                }
+
+                // reference to the nested class
+                mapNestedClassReferences.computeIfAbsent(enclClassName, k -> new HashSet<>()).add(innerName);
+                // reference to the enclosing class
+                mapEnclosingClassReferences.computeIfAbsent(innerName, k -> new HashSet<>()).add(enclClassName);
               }
             }
           }
@@ -136,7 +132,6 @@ public class ClassesProcessor {
 
             Set<String> setNestedClasses = mapNestedClassReferences.get(superClass);
             if (setNestedClasses != null) {
-
               StructClass scl = superNode.classStruct;
               StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttribute("InnerClasses");
 
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 11d393e..0c24ed8 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -111,6 +111,8 @@ public class SingleClassesTest {
   //@Test public void testInUse() { doTest("pkg/TestInUse"); }
   //@Test public void testInterfaceSuper() { doTest("pkg/TestInterfaceSuper"); }
 
+  @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
+
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
 
diff --git a/testData/classes/pkg/TestGroovyTrait$Trait$FieldHelper.class b/testData/classes/pkg/TestGroovyTrait$Trait$FieldHelper.class
new file mode 100644
index 0000000000000000000000000000000000000000..ebf6bf55a6dbab1100279607a64b59767fd5d046
GIT binary patch
literal 467
zcmaKpK}*9x5QX2wn%K13SVizAx=Ov6)T>9Ktsr=?_psI>q^?QXjivo-9{d6RC~*@n
zl9pWN!OXmG;LZ2X=NEt>`h?5HTM|y$6l0y|%k@;tv=D!Fl(KrAuv)P8K!ji}moii`
zOTwp@InN3YJA{*(`6j7AgbNX^qA0qx2jbdJ9KWwCI-&nqr`{3HMVc8gY<8YCjfLTY
za5dPZUvIVu&8(zk9S^oTkGACJVV}_X7azfY&Oh{wN2y{$_aVzz-z#Yh8<*gqW#8ch
jr*Po`R`*JU(;~Ft16DiemK_9D-Nm6*AEoyIJ-7V}<tT;i

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestGroovyTrait$Trait$Helper.class b/testData/classes/pkg/TestGroovyTrait$Trait$Helper.class
new file mode 100644
index 0000000000000000000000000000000000000000..e97d36099f3bfce6057b7412b1c2e51eb27bb308
GIT binary patch
literal 5192
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
T;X@Gr=68r#K8)ktuJ-=}{ZMqJ

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestGroovyTrait.class b/testData/classes/pkg/TestGroovyTrait.class
new file mode 100644
index 0000000000000000000000000000000000000000..561230c93b923035db6dbdfa73783cd49612b7d3
GIT binary patch
literal 530
zcmZ`$O-n*S6g{K%{H)AWYS+R*H$B<~ts<}lB`9$}>g_r9-i*wQf`6?=KcF8KU6jJq
z7Q?ysaL&1RxSwC|9{{dV7dV~0MPZ+uf3U_ZmVGOg&q4^4r*a{~Sn4Qz8cu1%Y+9hc
zCB2GPHi5J5x(dCO+PxZ^gsZGufn2iek)N2cK(*QGZs)S%rfX~zj?9=Qa_+*NB+gWR
zo#z^zWEN9G+S8b=g@}A_*;W*De8FurwdU@q)<EE5&yO3cT^o-S&&XzRC=je`fy@8p
ztEoSpvOsZz5IBFHYp)U-D5r)o-Dz#S^vY<*i@un-9Z_4wBv9&TP4+&P&XEfQQpoUi
xfOJM6iyZh!+y#tzfVsjRu87iK9nz?>D}@8p7%N;I@jI^Oal%*$^1rD8@C_q9iK_qr

literal 0
HcmV?d00001

diff --git a/testData/results/TestGroovyTrait.dec b/testData/results/TestGroovyTrait.dec
new file mode 100644
index 0000000..f36832a
--- /dev/null
+++ b/testData/results/TestGroovyTrait.dec
@@ -0,0 +1,17 @@
+package pkg;
+
+import groovy.transform.Trait;
+import org.codehaus.groovy.transform.trait.Traits.Implemented;
+
+@Trait
+public interface TestGroovyTrait {
+   @Implemented
+   Object myMethod();
+
+   @Implemented
+   Object getMyField();
+
+   @Implemented
+   void setMyField(Object var1);
+}
+
diff --git a/testData/src/pkg/TestGroovyTrait.groovy b/testData/src/pkg/TestGroovyTrait.groovy
new file mode 100644
index 0000000..5bbc203
--- /dev/null
+++ b/testData/src/pkg/TestGroovyTrait.groovy
@@ -0,0 +1,8 @@
+package pkg
+
+trait TestGroovyTrait {
+  def myField = 42
+  def myMethod() {
+    42
+  }
+}
\ No newline at end of file

From b3171e60c99f1f1a4668b4219e7296139e77f438 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 5 Dec 2017 14:29:45 +0100
Subject: [PATCH 164/252] [java decompiler] cleanup (duplicates; dead code;
 typos; formatting)

---
 .../main/ClassReference14Processor.java       |  21 +-
 .../java/decompiler/main/ClassWriter.java     |  17 +-
 .../decompiler/main/rels/MethodWrapper.java   |   5 +-
 .../main/rels/NestedClassProcessor.java       |  60 ++-
 .../modules/decompiler/IfHelper.java          |  34 +-
 .../decompiler/SimplifyExprentsHelper.java    | 356 ++++++++----------
 .../decompiler/StackVarsProcessor.java        | 119 ++----
 .../modules/decompiler/exps/ExprUtil.java     |  35 ++
 .../decompiler/exps/FunctionExprent.java      |   8 +-
 .../decompiler/exps/InvocationExprent.java    |  32 +-
 .../modules/decompiler/exps/NewExprent.java   |  82 ++--
 .../decompiler/vars/VarDefinitionHelper.java  |   2 +-
 .../decompiler/vars/VarVersionsGraph.java     |  26 +-
 .../struct/gen/MethodDescriptor.java          |   3 +-
 .../decompiler/struct/match/IMatchable.java   |   5 +-
 .../decompiler/struct/match/MatchEngine.java  | 117 +++---
 .../decompiler/struct/match/MatchNode.java    |  11 +-
 .../decompiler/DecompilerTestFixture.java     |   2 +-
 18 files changed, 387 insertions(+), 548 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 22c0bf0..a6369f5 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -42,10 +42,8 @@ public class ClassReference14Processor {
     ctor.setStringDescriptor("()V");
     ctor.setFunctype(InvocationExprent.TYP_INIT);
     ctor.setDescriptor(MethodDescriptor.parseDescriptor("()V"));
-
     NewExprent newExpr = new NewExprent(new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/NoClassDefFoundError"), new ArrayList<>(), null);
     newExpr.setConstructor(ctor);
-
     InvocationExprent invCause = new InvocationExprent();
     invCause.setName("initCause");
     invCause.setClassname("java/lang/NoClassDefFoundError");
@@ -54,18 +52,18 @@ public class ClassReference14Processor {
     invCause.setInstance(newExpr);
     invCause.setLstParameters(
       Collections.singletonList(new VarExprent(2, new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/ClassNotFoundException"), null)));
-
     HANDLER_EXPR = new ExitExprent(ExitExprent.EXIT_THROW, invCause, null, null);
   }
 
   public static void processClassReferences(ClassNode node) {
     // find the synthetic method Class class$(String) if present
-    HashMap<ClassWrapper, MethodWrapper> mapClassMeths = new HashMap<>();
+    Map<ClassWrapper, MethodWrapper> mapClassMeths = new HashMap<>();
     mapClassMethods(node, mapClassMeths);
     if (mapClassMeths.isEmpty()) {
       return;
     }
-    HashSet<ClassWrapper> setFound = new HashSet<>();
+
+    Set<ClassWrapper> setFound = new HashSet<>();
     processClassRec(node, mapClassMeths, setFound);
 
     if (!setFound.isEmpty()) {
@@ -76,15 +74,11 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node,
-                                      final HashMap<ClassWrapper, MethodWrapper> mapClassMeths,
-                                      final HashSet<ClassWrapper> setFound) {
-
-    final ClassWrapper wrapper = node.getWrapper();
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
+    ClassWrapper wrapper = node.getWrapper();
 
     // search code
     for (MethodWrapper meth : wrapper.getMethods()) {
-
       RootStatement root = meth.root;
       if (root != null) {
         DirectGraph graph = meth.getOrBuildGraph();
@@ -166,13 +160,10 @@ public class ClassReference14Processor {
     }
   }
 
-
   private static boolean replaceInvocations(Exprent exprent, ClassWrapper wrapper, MethodWrapper meth) {
-
     boolean res = false;
 
     while (true) {
-
       boolean found = false;
 
       for (Exprent expr : exprent.getAllExprents()) {
@@ -195,9 +186,7 @@ public class ClassReference14Processor {
     return res;
   }
 
-
   private static String isClass14Invocation(Exprent exprent, ClassWrapper wrapper, MethodWrapper meth) {
-
     if (exprent.type == Exprent.EXPRENT_FUNCTION) {
       FunctionExprent fexpr = (FunctionExprent)exprent;
       if (fexpr.getFuncType() == FunctionExprent.FUNCTION_IIF) {
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index a296a0d..5b6ae7e 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -647,11 +647,13 @@ public class ClassWriter {
           descriptor = GenericMain.parseMethodSignature(attr.getSignature());
           if (descriptor != null) {
             long actualParams = md.params.length;
-            List<VarVersionPair> sigFields = methodWrapper.signatureFields;
-            if (sigFields != null) {
-              actualParams = sigFields.stream().filter(Objects::isNull).count();
+            List<VarVersionPair> mask = methodWrapper.synthParameters;
+            if (mask != null) {
+              actualParams = mask.stream().filter(Objects::isNull).count();
+            }
+            else if (isEnum && init) {
+              actualParams -= 2;
             }
-            else if (isEnum && init) actualParams -= 2;
             if (actualParams != descriptor.params.size()) {
               String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
               DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
@@ -685,12 +687,11 @@ public class ClassWriter {
         buffer.append(toValidJavaIdentifier(name));
         buffer.append('(');
 
-        // parameters
-        List<VarVersionPair> signFields = methodWrapper.signatureFields;
+        List<VarVersionPair> mask = methodWrapper.synthParameters;
 
         int lastVisibleParameterIndex = -1;
         for (int i = 0; i < md.params.length; i++) {
-          if (signFields == null || signFields.get(i) == null) {
+          if (mask == null || mask.get(i) == null) {
             lastVisibleParameterIndex = i;
           }
         }
@@ -701,7 +702,7 @@ public class ClassWriter {
         int start = isEnum && init && !hasDescriptor ? 2 : 0;
         int params = hasDescriptor ? descriptor.params.size() : md.params.length;
         for (int i = start; i < params; i++) {
-          if (hasDescriptor || (signFields == null || signFields.get(i) == null)) {
+          if (hasDescriptor || mask == null || mask.get(i) == null) {
             if (!firstParameter) {
               buffer.append(", ");
             }
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
index 4fabf23..51a768d 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
@@ -11,16 +11,17 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class MethodWrapper {
   public final RootStatement root;
   public final VarProcessor varproc;
   public final StructMethod methodStruct;
   public final CounterContainer counter;
-  public final HashSet<String> setOuterVarNames = new HashSet<>();
+  public final Set<String> setOuterVarNames = new HashSet<>();
 
   public DirectGraph graph;
-  public List<VarVersionPair> signatureFields;
+  public List<VarVersionPair> synthParameters;
   public boolean decompiledWithErrors;
 
   public MethodWrapper(RootStatement root, VarProcessor varproc, StructMethod methodStruct, CounterContainer counter) {
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index b213031..4a77471 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -28,7 +28,6 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class NestedClassProcessor {
-
   public void processClass(ClassNode root, ClassNode node) {
     // hide synthetic lambda content methods
     if (node.type == ClassNode.CLASS_LAMBDA && !node.lambdaInformation.is_method_reference) {
@@ -93,22 +92,18 @@ public class NestedClassProcessor {
     }
 
     MethodWrapper method = parent.getWrapper().getMethods().getWithKey(child.lambdaInformation.content_method_key);
-    final MethodWrapper enclosingMethod = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
+    MethodWrapper enclosingMethod = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
 
     MethodDescriptor md_lambda = MethodDescriptor.parseDescriptor(child.lambdaInformation.method_descriptor);
-    final MethodDescriptor md_content = MethodDescriptor.parseDescriptor(child.lambdaInformation.content_method_descriptor);
+    MethodDescriptor md_content = MethodDescriptor.parseDescriptor(child.lambdaInformation.content_method_descriptor);
 
-    final int vars_count = md_content.params.length - md_lambda.params.length;
-    //		if(vars_count < 0) { // should not happen, but just in case...
-    //			vars_count = 0;
-    //		}
-
-    final boolean is_static_lambda_content = child.lambdaInformation.is_content_method_static;
+    int vars_count = md_content.params.length - md_lambda.params.length;
+    boolean is_static_lambda_content = child.lambdaInformation.is_content_method_static;
 
     String parent_class_name = parent.getWrapper().getClassStruct().qualifiedName;
     String lambda_class_name = child.simpleName;
 
-    final VarType lambda_class_type = new VarType(lambda_class_name, true);
+    VarType lambda_class_type = new VarType(lambda_class_name, true);
 
     // this pointer
     if (!is_static_lambda_content && DecompilerContext.getOption(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS)) {
@@ -116,7 +111,7 @@ public class NestedClassProcessor {
       method.varproc.setVarName(new VarVersionPair(0, 0), parent.simpleName + ".this");
     }
 
-    final Map<VarVersionPair, String> mapNewNames = new HashMap<>();
+    Map<VarVersionPair, String> mapNewNames = new HashMap<>();
 
     enclosingMethod.getOrBuildGraph().iterateExprents(exprent -> {
       List<Exprent> lst = exprent.getAllExprents(true);
@@ -172,7 +167,7 @@ public class NestedClassProcessor {
     List<ClassNode> copy = new ArrayList<>(node.nested);
 
     for (ClassNode child : copy) {
-      if (child.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
+      if (child.classStruct.isSynthetic()) {
         continue;
       }
 
@@ -234,19 +229,15 @@ public class NestedClassProcessor {
     return false;
   }
 
-  private static void computeLocalVarsAndDefinitions(final ClassNode node) {
-    // local var masks
-    // class name, constructor descriptor, field mask
-    final Map<String, Map<String, List<VarFieldPair>>> mapVarMasks = new HashMap<>();
+  private static void computeLocalVarsAndDefinitions(ClassNode node) {
+    // class name -> constructor descriptor -> var to field link
+    Map<String, Map<String, List<VarFieldPair>>> mapVarMasks = new HashMap<>();
 
     int clTypes = 0;
 
     for (ClassNode nd : node.nested) {
-      if (nd.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
-        continue;
-      }
-
       if (nd.type != ClassNode.CLASS_LAMBDA &&
+          !nd.classStruct.isSynthetic() &&
           (nd.access & CodeConstants.ACC_STATIC) == 0 &&
           (nd.access & CodeConstants.ACC_INTERFACE) == 0) {
         clTypes |= nd.type;
@@ -263,11 +254,11 @@ public class NestedClassProcessor {
     }
 
     // local var masks
-    final Map<String, Map<String, List<VarFieldPair>>> mapVarFieldPairs = new HashMap<>();
+    Map<String, Map<String, List<VarFieldPair>>> mapVarFieldPairs = new HashMap<>();
 
     if (clTypes != ClassNode.CLASS_MEMBER) {
       // iterate enclosing class
-      for (final MethodWrapper method : node.getWrapper().getMethods()) {
+      for (MethodWrapper method : node.getWrapper().getMethods()) {
         if (method.root != null) { // neither abstract, nor native
           method.getOrBuildGraph().iterateExprents(exprent -> {
             List<Exprent> lst = exprent.getAllExprents(true);
@@ -388,34 +379,33 @@ public class NestedClassProcessor {
       for (Entry<String, List<VarFieldPair>> entry : enclosing.getValue().entrySet()) {
         mergeListSignatures(entry.getValue(), interPairMask, false);
 
-        MethodWrapper method = nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entry.getKey());
-        method.signatureFields = new ArrayList<>();
-
+        List<VarVersionPair> mask = new ArrayList<>(entry.getValue().size());
         boolean firstSignField = nestedNode.type != ClassNode.CLASS_ANONYMOUS;
         for (VarFieldPair pair : entry.getValue()) {
-          method.signatureFields.add(pair == null || (!firstSignField && pair.fieldKey.isEmpty()) ? null : pair.varPair);
+          mask.add(pair == null || (!firstSignField && pair.fieldKey.isEmpty()) ? null : pair.varPair);
           firstSignField = false;
         }
+        nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entry.getKey()).synthParameters = mask;
       }
     }
   }
 
-  private static void insertLocalVars(ClassNode parent, final ClassNode child) {
+  private static void insertLocalVars(ClassNode parent, ClassNode child) {
     // enclosing method, is null iff member class
     MethodWrapper enclosingMethod = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
 
     // iterate all child methods
-    for (final MethodWrapper method : child.getWrapper().getMethods()) {
+    for (MethodWrapper method : child.getWrapper().getMethods()) {
       if (method.root != null) { // neither abstract nor native
         Map<VarVersionPair, String> mapNewNames = new HashMap<>();  // local var names
         Map<VarVersionPair, VarType> mapNewTypes = new HashMap<>();  // local var types
 
-        final Map<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<>();
-        if (method.signatureFields != null) {
+        Map<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<>();
+        if (method.synthParameters != null) {
           int index = 0, varIndex = 1;
           MethodDescriptor md = MethodDescriptor.parseDescriptor(method.methodStruct.getDescriptor());
 
-          for (VarVersionPair pair : method.signatureFields) {
+          for (VarVersionPair pair : method.synthParameters) {
             if (pair != null) {
               VarVersionPair newVar = new VarVersionPair(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
 
@@ -450,7 +440,7 @@ public class NestedClassProcessor {
           }
         }
 
-        final Map<String, VarVersionPair> mapFieldsToNewVars = new HashMap<>();
+        Map<String, VarVersionPair> mapFieldsToNewVars = new HashMap<>();
         for (ClassNode classNode = child; classNode != null; classNode = classNode.parent) {
           for (Entry<String, VarVersionPair> entry : classNode.mapFieldsToVars.entrySet()) {
             VarVersionPair newVar = new VarVersionPair(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
@@ -632,10 +622,10 @@ public class NestedClassProcessor {
               assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
             FieldExprent left = (FieldExprent)assignExpr.getLeft();
             StructField fd = cl.getField(left.getName(), left.getDescriptor().descriptorString);
-
-            if (fd != null && cl.qualifiedName.equals(left.getClassname()) &&
+            if (fd != null &&
+                cl.qualifiedName.equals(left.getClassname()) &&
                 fd.hasModifier(CodeConstants.ACC_FINAL) &&
-                (fd.isSynthetic() || (noSynthFlag && fd.hasModifier(CodeConstants.ACC_PRIVATE)))) {
+                (fd.isSynthetic() || noSynthFlag && fd.hasModifier(CodeConstants.ACC_PRIVATE))) {
               // local (== not inherited) field
               field = InterpreterUtil.makeUniqueKey(left.getName(), left.getDescriptor().descriptorString);
               break;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index 379fb52..b46cdae 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -9,39 +9,25 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
+import java.util.*;
 
 public class IfHelper {
-
-
   public static boolean mergeAllIfs(RootStatement root) {
-
     boolean res = mergeAllIfsRec(root, new HashSet<>());
-
     if (res) {
       SequenceHelper.condenseSequences(root);
     }
-
     return res;
   }
 
-
-  private static boolean mergeAllIfsRec(Statement stat, HashSet<Integer> setReorderedIfs) {
-
+  private static boolean mergeAllIfsRec(Statement stat, Set<Integer> setReorderedIfs) {
     boolean res = false;
 
     if (stat.getExprents() == null) {
-
       while (true) {
-
         boolean changed = false;
 
         for (Statement st : stat.getStats()) {
-
           res |= mergeAllIfsRec(st, setReorderedIfs);
 
           // collapse composed if's
@@ -61,7 +47,7 @@ public class IfHelper {
     return res;
   }
 
-  public static boolean mergeIfs(Statement statement, HashSet<Integer> setReorderedIfs) {
+  public static boolean mergeIfs(Statement statement, Set<Integer> setReorderedIfs) {
     if (statement.type != Statement.TYPE_IF && statement.type != Statement.TYPE_SEQUENCE) {
       return false;
     }
@@ -193,11 +179,9 @@ public class IfHelper {
   }
 
   private static boolean collapseIfElse(IfNode rtnode) {
-
     if (rtnode.edgetypes.get(0) == 0) {
       IfNode ifbranch = rtnode.succs.get(0);
       if (ifbranch.succs.size() == 2) {
-
         // if-else branch
         if (ifbranch.succs.get(0).value == rtnode.succs.get(1).value) {
 
@@ -245,9 +229,7 @@ public class IfHelper {
     return false;
   }
 
-
   private static boolean collapseElse(IfNode rtnode) {
-
     if (rtnode.edgetypes.get(1) == 0) {
       IfNode elsebranch = rtnode.succs.get(1);
       if (elsebranch.succs.size() == 2) {
@@ -308,9 +290,7 @@ public class IfHelper {
         }
       }
       else if (elsebranch.succs.size() == 1) {
-
         if (elsebranch.succs.get(0).value == rtnode.succs.get(0).value) {
-
           IfStatement firstif = (IfStatement)rtnode.value;
           Statement second = elsebranch.value;
 
@@ -349,9 +329,7 @@ public class IfHelper {
     return false;
   }
 
-
   private static IfNode buildGraph(IfStatement stat, boolean stsingle) {
-
     if (stat.iftype == IfStatement.IFTYPE_IFELSE) {
       return null;
     }
@@ -664,9 +642,7 @@ public class IfHelper {
     return false;
   }
 
-
   private static Statement getNextStatement(Statement stat) {
-
     Statement parent = stat.getParent();
     switch (parent.type) {
       case Statement.TYPE_ROOT:
@@ -688,7 +664,6 @@ public class IfHelper {
   }
 
   private static boolean existsPath(Statement from, Statement to) {
-
     for (StatEdge edge : to.getAllPredecessorEdges()) {
       if (from.containsStatementStrict(edge.getSource())) {
         return true;
@@ -700,7 +675,6 @@ public class IfHelper {
 
   private static class IfNode {
     public final Statement value;
-
     public final List<IfNode> succs = new ArrayList<>();
     public final List<Integer> edgetypes = new ArrayList<>();
 
@@ -713,4 +687,4 @@ public class IfHelper {
       edgetypes.add(type);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index 3a4d088..0bade66 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -21,7 +21,29 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class SimplifyExprentsHelper {
-  static final MatchEngine class14Builder = new MatchEngine();
+  @SuppressWarnings("SpellCheckingInspection") private static final MatchEngine class14Builder = new MatchEngine(
+    "statement type:if iftype:if exprsize:-1\n" +
+    " exprent position:head type:if\n" +
+    "  exprent type:function functype:eq\n" +
+    "   exprent type:field name:$fieldname$\n" +
+    "   exprent type:constant consttype:null\n" +
+    " statement type:basicblock\n" +
+    "  exprent position:-1 type:assignment ret:$assignfield$\n" +
+    "   exprent type:var index:$var$\n" +
+    "   exprent type:field name:$fieldname$\n" +
+    " statement type:sequence statsize:2\n" +
+    "  statement type:trycatch\n" +
+    "   statement type:basicblock exprsize:1\n" +
+    "    exprent type:assignment\n" +
+    "     exprent type:var index:$var$\n" +
+    "     exprent type:invocation invclass:java/lang/Class signature:forName(Ljava/lang/String;)Ljava/lang/Class;\n" +
+    "      exprent position:0 type:constant consttype:string constvalue:$classname$\n" +
+    "   statement type:basicblock exprsize:1\n" +
+    "    exprent type:exit exittype:throw\n" +
+    "  statement type:basicblock exprsize:1\n" +
+    "   exprent type:assignment\n" +
+    "    exprent type:field name:$fieldname$ ret:$field$\n" +
+    "    exprent type:var index:$var$");
 
   private final boolean firstInvocation;
 
@@ -29,10 +51,11 @@ public class SimplifyExprentsHelper {
     this.firstInvocation = firstInvocation;
   }
 
-  public boolean simplifyStackVarsStatement(Statement stat, HashSet<Integer> setReorderedIfs, SSAConstructorSparseEx ssa, StructClass cl) {
+  public boolean simplifyStackVarsStatement(Statement stat, Set<Integer> setReorderedIfs, SSAConstructorSparseEx ssa, StructClass cl) {
     boolean res = false;
 
-    if (stat.getExprents() == null) {
+    List<Exprent> expressions = stat.getExprents();
+    if (expressions == null) {
       boolean processClass14 = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4);
 
       while (true) {
@@ -65,7 +88,7 @@ public class SimplifyExprentsHelper {
       }
     }
     else {
-      res = simplifyStackVarsExprents(stat.getExprents(), cl);
+      res = simplifyStackVarsExprents(expressions, cl);
     }
 
     return res;
@@ -75,7 +98,6 @@ public class SimplifyExprentsHelper {
     boolean res = false;
 
     int index = 0;
-
     while (index < list.size()) {
       Exprent current = list.get(index);
 
@@ -131,9 +153,9 @@ public class SimplifyExprentsHelper {
       }
 
       // direct initialization of an array
-      int arrcount = isArrayInitializer(list, index);
-      if (arrcount > 0) {
-        for (int i = 0; i < arrcount; i++) {
+      int arrCount = isArrayInitializer(list, index);
+      if (arrCount > 0) {
+        for (int i = 0; i < arrCount; i++) {
           list.remove(index + 1);
         }
         res = true;
@@ -163,13 +185,13 @@ public class SimplifyExprentsHelper {
       }
 
       // assignment on stack
-      if (isStackAssignement(current, next)) {
+      if (isStackAssignment(current, next)) {
         list.remove(index + 1);
         res = true;
         continue;
       }
 
-      if (!firstInvocation && isStackAssignement2(current, next)) {
+      if (!firstInvocation && isStackAssignment2(current, next)) {
         list.remove(index + 1);
         res = true;
         continue;
@@ -186,38 +208,38 @@ public class SimplifyExprentsHelper {
       AssignmentExprent as = (AssignmentExprent)first;
 
       if (as.getRight().type == Exprent.EXPRENT_NEW && as.getLeft().type == Exprent.EXPRENT_VAR) {
-        NewExprent newex = (NewExprent)as.getRight();
+        NewExprent newExpr = (NewExprent)as.getRight();
 
-        if (!newex.getLstArrayElements().isEmpty()) {
-          VarExprent arrvar = (VarExprent)as.getLeft();
+        if (!newExpr.getLstArrayElements().isEmpty()) {
+          VarExprent arrVar = (VarExprent)as.getLeft();
 
           if (second.type == Exprent.EXPRENT_ASSIGNMENT) {
             AssignmentExprent aas = (AssignmentExprent)second;
             if (aas.getLeft().type == Exprent.EXPRENT_ARRAY) {
-              ArrayExprent arrex = (ArrayExprent)aas.getLeft();
-              if (arrex.getArray().type == Exprent.EXPRENT_VAR && arrvar.equals(arrex.getArray())
-                  && arrex.getIndex().type == Exprent.EXPRENT_CONST) {
+              ArrayExprent arrExpr = (ArrayExprent)aas.getLeft();
+              if (arrExpr.getArray().type == Exprent.EXPRENT_VAR &&
+                  arrVar.equals(arrExpr.getArray()) &&
+                  arrExpr.getIndex().type == Exprent.EXPRENT_CONST) {
+                int constValue = ((ConstExprent)arrExpr.getIndex()).getIntValue();
 
-                int constvalue = ((ConstExprent)arrex.getIndex()).getIntValue();
-
-                if (constvalue < newex.getLstArrayElements().size()) {
-                  Exprent init = newex.getLstArrayElements().get(constvalue);
+                if (constValue < newExpr.getLstArrayElements().size()) {
+                  Exprent init = newExpr.getLstArrayElements().get(constValue);
                   if (init.type == Exprent.EXPRENT_CONST) {
                     ConstExprent cinit = (ConstExprent)init;
-                    VarType arrtype = newex.getNewType().decreaseArrayDim();
-                    ConstExprent defaultval = ExprProcessor.getDefaultArrayValue(arrtype);
+                    VarType arrType = newExpr.getNewType().decreaseArrayDim();
+                    ConstExprent defaultVal = ExprProcessor.getDefaultArrayValue(arrType);
 
-                    if (cinit.equals(defaultval)) {
-                      Exprent tempexpr = aas.getRight();
+                    if (cinit.equals(defaultVal)) {
+                      Exprent tempExpr = aas.getRight();
 
-                      if (!tempexpr.containsExprent(arrvar)) {
-                        newex.getLstArrayElements().set(constvalue, tempexpr);
+                      if (!tempExpr.containsExprent(arrVar)) {
+                        newExpr.getLstArrayElements().set(constValue, tempExpr);
 
-                        if (tempexpr.type == Exprent.EXPRENT_NEW) {
-                          NewExprent tempnewex = (NewExprent)tempexpr;
-                          int dims = newex.getNewType().arrayDim;
-                          if (dims > 1 && !tempnewex.getLstArrayElements().isEmpty()) {
-                            tempnewex.setDirectArrayInit(true);
+                        if (tempExpr.type == Exprent.EXPRENT_NEW) {
+                          NewExprent tempNewExpr = (NewExprent)tempExpr;
+                          int dims = newExpr.getNewType().arrayDim;
+                          if (dims > 1 && !tempNewExpr.getLstArrayElements().isEmpty()) {
+                            tempNewExpr.setDirectArrayInit(true);
                           }
                         }
 
@@ -242,19 +264,18 @@ public class SimplifyExprentsHelper {
       AssignmentExprent as = (AssignmentExprent)current;
 
       if (as.getRight().type == Exprent.EXPRENT_NEW && as.getLeft().type == Exprent.EXPRENT_VAR) {
-        NewExprent newex = (NewExprent)as.getRight();
+        NewExprent newExpr = (NewExprent)as.getRight();
 
-        if (newex.getExprType().arrayDim > 0 && newex.getLstDims().size() == 1 && newex.getLstArrayElements().isEmpty() &&
-            newex.getLstDims().get(0).type == Exprent.EXPRENT_CONST) {
+        if (newExpr.getExprType().arrayDim > 0 && newExpr.getLstDims().size() == 1 && newExpr.getLstArrayElements().isEmpty() &&
+            newExpr.getLstDims().get(0).type == Exprent.EXPRENT_CONST) {
 
-          int size = (Integer)((ConstExprent)newex.getLstDims().get(0)).getValue();
+          int size = (Integer)((ConstExprent)newExpr.getLstDims().get(0)).getValue();
           if (size == 0) {
             return 0;
           }
 
-          VarExprent arrvar = (VarExprent)as.getLeft();
-
-          HashMap<Integer, Exprent> mapInit = new HashMap<>();
+          VarExprent arrVar = (VarExprent)as.getLeft();
+          Map<Integer, Exprent> mapInit = new HashMap<>();
 
           int i = 1;
           while (index + i < list.size() && i <= size) {
@@ -264,17 +285,14 @@ public class SimplifyExprentsHelper {
             if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
               AssignmentExprent aas = (AssignmentExprent)expr;
               if (aas.getLeft().type == Exprent.EXPRENT_ARRAY) {
-                ArrayExprent arrex = (ArrayExprent)aas.getLeft();
-                if (arrex.getArray().type == Exprent.EXPRENT_VAR && arrvar.equals(arrex.getArray())
-                    && arrex.getIndex().type == Exprent.EXPRENT_CONST) {
-
-                  int constvalue = ((ConstExprent)arrex.getIndex())
-                    .getIntValue(); // TODO: check for a number type. Failure extremely improbable, but nevertheless...
-
-                  if (constvalue < size && !mapInit.containsKey(constvalue)) {
-
-                    if (!aas.getRight().containsExprent(arrvar)) {
-                      mapInit.put(constvalue, aas.getRight());
+                ArrayExprent arrExpr = (ArrayExprent)aas.getLeft();
+                if (arrExpr.getArray().type == Exprent.EXPRENT_VAR && arrVar.equals(arrExpr.getArray()) &&
+                    arrExpr.getIndex().type == Exprent.EXPRENT_CONST) {
+                  // TODO: check for a number type. Failure extremely improbable, but nevertheless...
+                  int constValue = ((ConstExprent)arrExpr.getIndex()).getIntValue();
+                  if (constValue < size && !mapInit.containsKey(constValue)) {
+                    if (!aas.getRight().containsExprent(arrVar)) {
+                      mapInit.put(constValue, aas.getRight());
                       found = true;
                     }
                   }
@@ -291,33 +309,29 @@ public class SimplifyExprentsHelper {
 
           double fraction = ((double)mapInit.size()) / size;
 
-          if ((arrvar.isStack() && fraction > 0) || (size <= 7 && fraction >= 0.3) ||
-              (size > 7 && fraction >= 0.7)) {
-
+          if ((arrVar.isStack() && fraction > 0) || (size <= 7 && fraction >= 0.3) || (size > 7 && fraction >= 0.7)) {
             List<Exprent> lstRet = new ArrayList<>();
 
-            VarType arrtype = newex.getNewType().decreaseArrayDim();
-
-            ConstExprent defaultval = ExprProcessor.getDefaultArrayValue(arrtype);
-
+            VarType arrayType = newExpr.getNewType().decreaseArrayDim();
+            ConstExprent defaultVal = ExprProcessor.getDefaultArrayValue(arrayType);
             for (int j = 0; j < size; j++) {
-              lstRet.add(defaultval.copy());
+              lstRet.add(defaultVal.copy());
             }
 
-            int dims = newex.getNewType().arrayDim;
+            int dims = newExpr.getNewType().arrayDim;
             for (Entry<Integer, Exprent> ent : mapInit.entrySet()) {
-              Exprent tempexpr = ent.getValue();
-              lstRet.set(ent.getKey(), tempexpr);
+              Exprent tempExpr = ent.getValue();
+              lstRet.set(ent.getKey(), tempExpr);
 
-              if (tempexpr.type == Exprent.EXPRENT_NEW) {
-                NewExprent tempnewex = (NewExprent)tempexpr;
-                if (dims > 1 && !tempnewex.getLstArrayElements().isEmpty()) {
-                  tempnewex.setDirectArrayInit(true);
+              if (tempExpr.type == Exprent.EXPRENT_NEW) {
+                NewExprent tempNewExpr = (NewExprent)tempExpr;
+                if (dims > 1 && !tempNewExpr.getLstArrayElements().isEmpty()) {
+                  tempNewExpr.setDirectArrayInit(true);
                 }
               }
             }
 
-            newex.setLstArrayElements(lstRet);
+            newExpr.setLstArrayElements(lstRet);
 
             return mapInit.size();
           }
@@ -333,17 +347,16 @@ public class SimplifyExprentsHelper {
       AssignmentExprent asf = (AssignmentExprent)first;
 
       if (asf.getLeft().type == Exprent.EXPRENT_VAR && asf.getRight().type == Exprent.EXPRENT_VAR) {
-        VarExprent varleft = (VarExprent)asf.getLeft();
-        VarExprent varright = (VarExprent)asf.getRight();
-
-        return varleft.getIndex() == varright.getIndex() && varleft.isStack() && varright.isStack();
+        VarExprent left = (VarExprent)asf.getLeft();
+        VarExprent right = (VarExprent)asf.getRight();
+        return left.getIndex() == right.getIndex() && left.isStack() && right.isStack();
       }
     }
 
     return false;
   }
 
-  private static boolean isStackAssignement2(Exprent first, Exprent second) {  // e.g. 1.4-style class invocation
+  private static boolean isStackAssignment2(Exprent first, Exprent second) {  // e.g. 1.4-style class invocation
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
       AssignmentExprent ass = (AssignmentExprent)second;
@@ -360,7 +373,7 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-  private static boolean isStackAssignement(Exprent first, Exprent second) {
+  private static boolean isStackAssignment(Exprent first, Exprent second) {
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
       AssignmentExprent ass = (AssignmentExprent)second;
@@ -395,8 +408,7 @@ public class SimplifyExprentsHelper {
       if (as.getRight().type == Exprent.EXPRENT_FUNCTION) {
         FunctionExprent func = (FunctionExprent)as.getRight();
 
-        if (func.getFuncType() == FunctionExprent.FUNCTION_ADD ||
-            func.getFuncType() == FunctionExprent.FUNCTION_SUB) {
+        if (func.getFuncType() == FunctionExprent.FUNCTION_ADD || func.getFuncType() == FunctionExprent.FUNCTION_SUB) {
           Exprent econd = func.getLstOperands().get(0);
           Exprent econst = func.getLstOperands().get(1);
 
@@ -410,9 +422,8 @@ public class SimplifyExprentsHelper {
             Exprent left = as.getLeft();
 
             if (left.type != Exprent.EXPRENT_VAR && left.equals(econd)) {
-              FunctionExprent ret = new FunctionExprent(
-                func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
-                econd, func.bytecode);
+              int type = func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI;
+              FunctionExprent ret = new FunctionExprent(type, econd, func.bytecode);
               ret.setImplicitType(VarType.VARTYPE_INT);
               return ret;
             }
@@ -449,10 +460,10 @@ public class SimplifyExprentsHelper {
 
   private static boolean isMonitorExit(Exprent first) {
     if (first.type == Exprent.EXPRENT_MONITOR) {
-      MonitorExprent monexpr = (MonitorExprent)first;
-      return monexpr.getMonType() == MonitorExprent.MONITOR_EXIT &&
-             monexpr.getValue().type == Exprent.EXPRENT_VAR &&
-             !((VarExprent)monexpr.getValue()).isStack();
+      MonitorExprent expr = (MonitorExprent)first;
+      return expr.getMonType() == MonitorExprent.MONITOR_EXIT &&
+             expr.getValue().type == Exprent.EXPRENT_VAR &&
+             !((VarExprent)expr.getValue()).isStack();
     }
 
     return false;
@@ -460,21 +471,21 @@ public class SimplifyExprentsHelper {
 
   private static boolean isQualifiedNewGetClass(Exprent first, Exprent second) {
     if (first.type == Exprent.EXPRENT_INVOCATION) {
-      InvocationExprent invexpr = (InvocationExprent)first;
+      InvocationExprent invocation = (InvocationExprent)first;
 
-      if (!invexpr.isStatic() && invexpr.getInstance().type == Exprent.EXPRENT_VAR && invexpr.getName().equals("getClass") &&
-          invexpr.getStringDescriptor().equals("()Ljava/lang/Class;")) {
+      if (!invocation.isStatic() && invocation.getInstance().type == Exprent.EXPRENT_VAR && invocation.getName().equals("getClass") &&
+          invocation.getStringDescriptor().equals("()Ljava/lang/Class;")) {
 
         List<Exprent> lstExprents = second.getAllExprents();
         lstExprents.add(second);
 
         for (Exprent expr : lstExprents) {
           if (expr.type == Exprent.EXPRENT_NEW) {
-            NewExprent nexpr = (NewExprent)expr;
-            if (nexpr.getConstructor() != null && !nexpr.getConstructor().getLstParameters().isEmpty() &&
-                nexpr.getConstructor().getLstParameters().get(0).equals(invexpr.getInstance())) {
+            NewExprent newExpr = (NewExprent)expr;
+            if (newExpr.getConstructor() != null && !newExpr.getConstructor().getLstParameters().isEmpty() &&
+                newExpr.getConstructor().getLstParameters().get(0).equals(invocation.getInstance())) {
 
-              String classname = nexpr.getNewType().value;
+              String classname = newExpr.getNewType().value;
               ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
               if (node != null && node.type != ClassNode.CLASS_ROOT) {
                 return true;
@@ -488,7 +499,7 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-  // propagate (var = new X) forward to the <init> invokation
+  // propagate (var = new X) forward to the <init> invocation
   private static boolean isConstructorInvocationRemote(List<Exprent> list, int index) {
     Exprent current = list.get(index);
 
@@ -497,12 +508,11 @@ public class SimplifyExprentsHelper {
 
       if (as.getLeft().type == Exprent.EXPRENT_VAR && as.getRight().type == Exprent.EXPRENT_NEW) {
 
-        NewExprent newexpr = (NewExprent)as.getRight();
-        VarType newtype = newexpr.getNewType();
-        VarVersionPair leftPaar = new VarVersionPair((VarExprent)as.getLeft());
-
-        if (newtype.type == CodeConstants.TYPE_OBJECT && newtype.arrayDim == 0 && newexpr.getConstructor() == null) {
+        NewExprent newExpr = (NewExprent)as.getRight();
+        VarType newType = newExpr.getNewType();
+        VarVersionPair leftPair = new VarVersionPair((VarExprent)as.getLeft());
 
+        if (newType.type == CodeConstants.TYPE_OBJECT && newType.arrayDim == 0 && newExpr.getConstructor() == null) {
           for (int i = index + 1; i < list.size(); i++) {
             Exprent remote = list.get(i);
 
@@ -513,8 +523,7 @@ public class SimplifyExprentsHelper {
               if (in.getFunctype() == InvocationExprent.TYP_INIT &&
                   in.getInstance().type == Exprent.EXPRENT_VAR &&
                   as.getLeft().equals(in.getInstance())) {
-
-                newexpr.setConstructor(in);
+                newExpr.setConstructor(in);
                 in.setInstance(null);
 
                 list.set(i, as.copy());
@@ -525,7 +534,7 @@ public class SimplifyExprentsHelper {
 
             // check for variable in use
             Set<VarVersionPair> setVars = remote.getAllVariables();
-            if (setVars.contains(leftPaar)) { // variable used somewhere in between -> exit, need a better reduced code
+            if (setVars.contains(leftPair)) { // variable used somewhere in between -> exit, need a better reduced code
               return false;
             }
           }
@@ -553,13 +562,13 @@ public class SimplifyExprentsHelper {
         ClassNode lambda_class = DecompilerContext.getClassProcessor().getMapRootClasses().get(lambda_class_name);
 
         if (lambda_class != null) { // real lambda class found, replace invocation with an anonymous class
-          NewExprent newexp = new NewExprent(new VarType(lambda_class_name, true), null, 0, in.bytecode);
-          newexp.setConstructor(in);
-          // note: we don't set the instance to null with in.setInstance(null) like it is done for a common constructor invokation
+          NewExprent newExpr = new NewExprent(new VarType(lambda_class_name, true), null, 0, in.bytecode);
+          newExpr.setConstructor(in);
+          // note: we don't set the instance to null with in.setInstance(null) like it is done for a common constructor invocation
           // lambda can also be a reference to a virtual method (e.g. String x; ...(x::toString);)
           // in this case instance will hold the corresponding object
 
-          return newexp;
+          return newExpr;
         }
       }
     }
@@ -579,10 +588,10 @@ public class SimplifyExprentsHelper {
     if (exprent.type == Exprent.EXPRENT_INVOCATION) {
       InvocationExprent in = (InvocationExprent)exprent;
       if (in.getFunctype() == InvocationExprent.TYP_INIT && in.getInstance().type == Exprent.EXPRENT_NEW) {
-        NewExprent newexp = (NewExprent)in.getInstance();
-        newexp.setConstructor(in);
+        NewExprent newExpr = (NewExprent)in.getInstance();
+        newExpr.setConstructor(in);
         in.setInstance(null);
-        return newexp;
+        return newExpr;
       }
     }
 
@@ -591,37 +600,35 @@ public class SimplifyExprentsHelper {
 
   private static boolean buildIff(Statement stat, SSAConstructorSparseEx ssa) {
     if (stat.type == Statement.TYPE_IF && stat.getExprents() == null) {
-      IfStatement stif = (IfStatement)stat;
+      IfStatement statement = (IfStatement)stat;
+      Exprent ifHeadExpr = statement.getHeadexprent();
+      Set<Integer> ifHeadExprBytecode = (ifHeadExpr == null ? null : ifHeadExpr.bytecode);
 
-      Exprent ifheadexpr = stif.getHeadexprent();
-      Set<Integer> ifheadexpr_bytecode = (ifheadexpr == null ? null : ifheadexpr.bytecode);
+      if (statement.iftype == IfStatement.IFTYPE_IFELSE) {
+        Statement ifStatement = statement.getIfstat();
+        Statement elseStatement = statement.getElsestat();
 
-      if (stif.iftype == IfStatement.IFTYPE_IFELSE) {
-        Statement ifstat = stif.getIfstat();
-        Statement elsestat = stif.getElsestat();
+        if (ifStatement.getExprents() != null && ifStatement.getExprents().size() == 1 &&
+            elseStatement.getExprents() != null && elseStatement.getExprents().size() == 1 &&
+            ifStatement.getAllSuccessorEdges().size() == 1 && elseStatement.getAllSuccessorEdges().size() == 1 &&
+            ifStatement.getAllSuccessorEdges().get(0).getDestination() == elseStatement.getAllSuccessorEdges().get(0).getDestination()) {
+          Exprent ifExpr = ifStatement.getExprents().get(0);
+          Exprent elseExpr = elseStatement.getExprents().get(0);
 
-        if (ifstat.getExprents() != null && ifstat.getExprents().size() == 1
-            && elsestat.getExprents() != null && elsestat.getExprents().size() == 1
-            && ifstat.getAllSuccessorEdges().size() == 1 && elsestat.getAllSuccessorEdges().size() == 1
-            && ifstat.getAllSuccessorEdges().get(0).getDestination() == elsestat.getAllSuccessorEdges().get(0).getDestination()) {
+          if (ifExpr.type == Exprent.EXPRENT_ASSIGNMENT && elseExpr.type == Exprent.EXPRENT_ASSIGNMENT) {
+            AssignmentExprent ifAssign = (AssignmentExprent)ifExpr;
+            AssignmentExprent elseAssign = (AssignmentExprent)elseExpr;
 
-          Exprent ifexpr = ifstat.getExprents().get(0);
-          Exprent elseexpr = elsestat.getExprents().get(0);
+            if (ifAssign.getLeft().type == Exprent.EXPRENT_VAR && elseAssign.getLeft().type == Exprent.EXPRENT_VAR) {
+              VarExprent ifVar = (VarExprent)ifAssign.getLeft();
+              VarExprent elseVar = (VarExprent)elseAssign.getLeft();
 
-          if (ifexpr.type == Exprent.EXPRENT_ASSIGNMENT && elseexpr.type == Exprent.EXPRENT_ASSIGNMENT) {
-            AssignmentExprent ifas = (AssignmentExprent)ifexpr;
-            AssignmentExprent elseas = (AssignmentExprent)elseexpr;
-
-            if (ifas.getLeft().type == Exprent.EXPRENT_VAR && elseas.getLeft().type == Exprent.EXPRENT_VAR) {
-              VarExprent ifvar = (VarExprent)ifas.getLeft();
-              VarExprent elsevar = (VarExprent)elseas.getLeft();
-
-              if (ifvar.getIndex() == elsevar.getIndex() && ifvar.isStack()) { // ifvar.getIndex() >= VarExprent.STACK_BASE) {
+              if (ifVar.getIndex() == elseVar.getIndex() && ifVar.isStack()) { // ifVar.getIndex() >= VarExprent.STACK_BASE) {
                 boolean found = false;
 
                 for (Entry<VarVersionPair, FastSparseSet<Integer>> ent : ssa.getPhi().entrySet()) {
-                  if (ent.getKey().var == ifvar.getIndex()) {
-                    if (ent.getValue().contains(ifvar.getVersion()) && ent.getValue().contains(elsevar.getVersion())) {
+                  if (ent.getKey().var == ifVar.getIndex()) {
+                    if (ent.getValue().contains(ifVar.getVersion()) && ent.getValue().contains(elseVar.getVersion())) {
                       found = true;
                       break;
                     }
@@ -629,65 +636,61 @@ public class SimplifyExprentsHelper {
                 }
 
                 if (found) {
-                  List<Exprent> data = new ArrayList<>(stif.getFirst().getExprents());
+                  List<Exprent> data = new ArrayList<>(statement.getFirst().getExprents());
 
-                  data.add(new AssignmentExprent(ifvar, new FunctionExprent(FunctionExprent.FUNCTION_IIF,
-                                                                            Arrays.asList(
-                                                                              stif.getHeadexprent().getCondition(),
-                                                                              ifas.getRight(),
-                                                                              elseas.getRight()), ifheadexpr_bytecode), ifheadexpr_bytecode));
-                  stif.setExprents(data);
+                  List<Exprent> operands = Arrays.asList(statement.getHeadexprent().getCondition(), ifAssign.getRight(), elseAssign.getRight());
+                  data.add(new AssignmentExprent(ifVar, new FunctionExprent(FunctionExprent.FUNCTION_IIF, operands, ifHeadExprBytecode), ifHeadExprBytecode));
+                  statement.setExprents(data);
 
-                  if (stif.getAllSuccessorEdges().isEmpty()) {
-                    StatEdge ifedge = ifstat.getAllSuccessorEdges().get(0);
-                    StatEdge edge = new StatEdge(ifedge.getType(), stif, ifedge.getDestination());
+                  if (statement.getAllSuccessorEdges().isEmpty()) {
+                    StatEdge ifEdge = ifStatement.getAllSuccessorEdges().get(0);
+                    StatEdge edge = new StatEdge(ifEdge.getType(), statement, ifEdge.getDestination());
 
-                    stif.addSuccessor(edge);
-                    if (ifedge.closure != null) {
-                      ifedge.closure.addLabeledEdge(edge);
+                    statement.addSuccessor(edge);
+                    if (ifEdge.closure != null) {
+                      ifEdge.closure.addLabeledEdge(edge);
                     }
                   }
 
-                  SequenceHelper.destroyAndFlattenStatement(stif);
+                  SequenceHelper.destroyAndFlattenStatement(statement);
 
                   return true;
                 }
               }
             }
           }
-          else if (ifexpr.type == Exprent.EXPRENT_EXIT && elseexpr.type == Exprent.EXPRENT_EXIT) {
-            ExitExprent ifex = (ExitExprent)ifexpr;
-            ExitExprent elseex = (ExitExprent)elseexpr;
-
-            if (ifex.getExitType() == elseex.getExitType() && ifex.getValue() != null && elseex.getValue() != null &&
-                ifex.getExitType() == ExitExprent.EXIT_RETURN) {
+          else if (ifExpr.type == Exprent.EXPRENT_EXIT && elseExpr.type == Exprent.EXPRENT_EXIT) {
+            ExitExprent ifExit = (ExitExprent)ifExpr;
+            ExitExprent elseExit = (ExitExprent)elseExpr;
 
+            if (ifExit.getExitType() == elseExit.getExitType() && ifExit.getValue() != null && elseExit.getValue() != null &&
+                ifExit.getExitType() == ExitExprent.EXIT_RETURN) {
               // throw is dangerous, because of implicit casting to a common superclass
               // e.g. throws IOException and throw true?new RuntimeException():new IOException(); won't work
-              if (ifex.getExitType() == ExitExprent.EXIT_THROW &&
-                  !ifex.getValue().getExprType().equals(elseex.getValue().getExprType())) {  // note: getExprType unreliable at this point!
+              if (ifExit.getExitType() == ExitExprent.EXIT_THROW &&
+                  !ifExit.getValue().getExprType().equals(elseExit.getValue().getExprType())) {  // note: getExprType unreliable at this point!
                 return false;
               }
 
               // avoid flattening to 'iff' if any of the branches is an 'iff' already
-              if (isIff(ifex.getValue()) || isIff(elseex.getValue())) {
+              if (isIff(ifExit.getValue()) || isIff(elseExit.getValue())) {
                 return false;
               }
 
-              List<Exprent> data = new ArrayList<>(stif.getFirst().getExprents());
+              List<Exprent> data = new ArrayList<>(statement.getFirst().getExprents());
 
-              data.add(new ExitExprent(ifex.getExitType(), new FunctionExprent(FunctionExprent.FUNCTION_IIF,
+              data.add(new ExitExprent(ifExit.getExitType(), new FunctionExprent(FunctionExprent.FUNCTION_IIF,
                                                                                Arrays.asList(
-                                                                                 stif.getHeadexprent().getCondition(),
-                                                                                 ifex.getValue(),
-                                                                                 elseex.getValue()), ifheadexpr_bytecode), ifex.getRetType(), ifheadexpr_bytecode));
-              stif.setExprents(data);
+                                                                                 statement.getHeadexprent().getCondition(),
+                                                                                 ifExit.getValue(),
+                                                                                 elseExit.getValue()), ifHeadExprBytecode), ifExit.getRetType(), ifHeadExprBytecode));
+              statement.setExprents(data);
 
-              StatEdge retedge = ifstat.getAllSuccessorEdges().get(0);
-              stif.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, stif, retedge.getDestination(),
-                                             retedge.closure == stif ? stif.getParent() : retedge.closure));
+              StatEdge retEdge = ifStatement.getAllSuccessorEdges().get(0);
+              Statement closure = retEdge.closure == statement ? statement.getParent() : retEdge.closure;
+              statement.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, statement, retEdge.getDestination(), closure));
 
-              SequenceHelper.destroyAndFlattenStatement(stif);
+              SequenceHelper.destroyAndFlattenStatement(statement);
 
               return true;
             }
@@ -703,41 +706,14 @@ public class SimplifyExprentsHelper {
     return exp.type == Exprent.EXPRENT_FUNCTION && ((FunctionExprent) exp).getFuncType() == FunctionExprent.FUNCTION_IIF;
   }
 
-  static {
-    class14Builder.parse(
-          "statement type:if iftype:if exprsize:-1\n" +
-          " exprent position:head type:if\n" +
-          "  exprent type:function functype:eq\n" +
-          "   exprent type:field name:$fieldname$\n" +
-          "   exprent type:constant consttype:null\n" +
-          " statement type:basicblock\n" +
-          "  exprent position:-1 type:assignment ret:$assignfield$\n" +
-          "   exprent type:var index:$var$\n" +
-          "   exprent type:field name:$fieldname$\n" +
-          " statement type:sequence statsize:2\n" +
-          "  statement type:trycatch\n" +
-          "   statement type:basicblock exprsize:1\n" +
-          "    exprent type:assignment\n" +
-          "     exprent type:var index:$var$\n" +
-          "     exprent type:invocation invclass:java/lang/Class signature:forName(Ljava/lang/String;)Ljava/lang/Class;\n" +
-          "      exprent position:0 type:constant consttype:string constvalue:$classname$\n" +
-          "   statement type:basicblock exprsize:1\n" +
-          "    exprent type:exit exittype:throw\n" +
-          "  statement type:basicblock exprsize:1\n" +
-          "   exprent type:assignment\n" +
-          "    exprent type:field name:$fieldname$ ret:$field$\n" +
-          "    exprent type:var index:$var$"
-        );
-  }
-
   private static boolean collapseInlinedClass14(Statement stat) {
     boolean ret = class14Builder.match(stat);
     if (ret) {
       String class_name = (String)class14Builder.getVariableValue("$classname$");
-      AssignmentExprent assfirst = (AssignmentExprent)class14Builder.getVariableValue("$assignfield$");
-      FieldExprent fieldexpr = (FieldExprent)class14Builder.getVariableValue("$field$");
+      AssignmentExprent assignment = (AssignmentExprent)class14Builder.getVariableValue("$assignfield$");
+      FieldExprent fieldExpr = (FieldExprent)class14Builder.getVariableValue("$field$");
 
-      assfirst.replaceExprent(assfirst.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null));
+      assignment.replaceExprent(assignment.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null));
 
       List<Exprent> data = new ArrayList<>(stat.getFirst().getExprents());
 
@@ -747,7 +723,7 @@ public class SimplifyExprentsHelper {
 
       ClassWrapper wrapper = (ClassWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_WRAPPER);
       if (wrapper != null) {
-        wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldexpr.getName(), fieldexpr.getDescriptor().descriptorString));
+        wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldExpr.getName(), fieldExpr.getDescriptor().descriptorString));
       }
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index a3b25de..c235387 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -20,36 +20,22 @@ import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
 import java.util.*;
 import java.util.Map.Entry;
 
-
 public class StackVarsProcessor {
-
   public void simplifyStackVars(RootStatement root, StructMethod mt, StructClass cl) {
-
-    HashSet<Integer> setReorderedIfs = new HashSet<>();
-
+    Set<Integer> setReorderedIfs = new HashSet<>();
     SSAUConstructorSparseEx ssau = null;
 
     while (true) {
-
       boolean found = false;
 
-      //			System.out.println("--------------- \r\n"+root.toJava());
-
       SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
       ssa.splitVariables(root, mt);
 
-      //			System.out.println("--------------- \r\n"+root.toJava());
-
-
       SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(ssau == null);
       while (sehelper.simplifyStackVarsStatement(root, setReorderedIfs, ssa, cl)) {
-        //				System.out.println("--------------- \r\n"+root.toJava());
         found = true;
       }
 
-
-      //			System.out.println("=============== \r\n"+root.toJava());
-
       setVersionsToNull(root);
 
       SequenceHelper.condenseSequences(root);
@@ -57,21 +43,10 @@ public class StackVarsProcessor {
       ssau = new SSAUConstructorSparseEx();
       ssau.splitVariables(root, mt);
 
-      //			try {
-      //				DotExporter.toDotFile(ssau.getSsuversions(), new File("c:\\Temp\\gr12_my.dot"));
-      //			} catch(Exception ex) {
-      //				ex.printStackTrace();
-      //			}
-
-      //			System.out.println("++++++++++++++++ \r\n"+root.toJava());
-
-
       if (iterateStatements(root, ssau)) {
         found = true;
       }
 
-      //			System.out.println("***************** \r\n"+root.toJava());
-
       setVersionsToNull(root);
 
       if (!found) {
@@ -83,21 +58,12 @@ public class StackVarsProcessor {
     ssau = new SSAUConstructorSparseEx();
     ssau.splitVariables(root, mt);
 
-    //		try {
-    //			DotExporter.toDotFile(ssau.getSsuversions(), new File("c:\\Temp\\gr12_my.dot"));
-    //		} catch(Exception ex) {
-    //			ex.printStackTrace();
-    //		}
-
     iterateStatements(root, ssau);
 
-    //		System.out.println("~~~~~~~~~~~~~~~~~~~~~~ \r\n"+root.toJava());
-
     setVersionsToNull(root);
   }
 
   private static void setVersionsToNull(Statement stat) {
-
     if (stat.getExprents() == null) {
       for (Object obj : stat.getSequentialObjects()) {
         if (obj instanceof Statement) {
@@ -116,7 +82,6 @@ public class StackVarsProcessor {
   }
 
   private static void setExprentVersionsToNull(Exprent exprent) {
-
     List<Exprent> lst = exprent.getAllExprents(true);
     lst.add(exprent);
 
@@ -127,25 +92,22 @@ public class StackVarsProcessor {
     }
   }
 
-
   private boolean iterateStatements(RootStatement root, SSAUConstructorSparseEx ssa) {
-
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
     boolean res = false;
 
-    HashSet<DirectNode> setVisited = new HashSet<>();
+    Set<DirectNode> setVisited = new HashSet<>();
     LinkedList<DirectNode> stack = new LinkedList<>();
-    LinkedList<HashMap<VarVersionPair, Exprent>> stackMaps = new LinkedList<>();
+    LinkedList<Map<VarVersionPair, Exprent>> stackMaps = new LinkedList<>();
 
     stack.add(dgraph.first);
     stackMaps.add(new HashMap<>());
 
     while (!stack.isEmpty()) {
-
       DirectNode nd = stack.removeFirst();
-      HashMap<VarVersionPair, Exprent> mapVarValues = stackMaps.removeFirst();
+      Map<VarVersionPair, Exprent> mapVarValues = stackMaps.removeFirst();
 
       if (setVisited.contains(nd)) {
         continue;
@@ -182,9 +144,6 @@ public class StackVarsProcessor {
           }
 
           int[] ret = iterateExprent(lst, index, next, mapVarValues, ssa);
-
-          //System.out.println("***************** \r\n"+root.toJava());
-
           if (ret[0] >= 0) {
             index = ret[0];
           }
@@ -221,26 +180,21 @@ public class StackVarsProcessor {
     return res;
   }
 
-
-  private static Exprent isReplaceableVar(Exprent exprent, HashMap<VarVersionPair, Exprent> mapVarValues) {
-
+  private static Exprent isReplaceableVar(Exprent exprent, Map<VarVersionPair, Exprent> mapVarValues) {
     Exprent dest = null;
-
     if (exprent.type == Exprent.EXPRENT_VAR) {
       VarExprent var = (VarExprent)exprent;
       dest = mapVarValues.get(new VarVersionPair(var));
     }
-
     return dest;
   }
 
   private static void replaceSingleVar(Exprent parent, VarExprent var, Exprent dest, SSAUConstructorSparseEx ssau) {
-
     parent.replaceExprent(var, dest);
 
     // live sets
     SFormsFastMapDirect livemap = ssau.getLiveVarVersionsMap(new VarVersionPair(var));
-    HashSet<VarVersionPair> setVars = getAllVersions(dest);
+    Set<VarVersionPair> setVars = getAllVersions(dest);
 
     for (VarVersionPair varpaar : setVars) {
       VarVersionNode node = ssau.getSsuversions().nodes.getWithKey(varpaar);
@@ -265,9 +219,11 @@ public class StackVarsProcessor {
     }
   }
 
-  private int[] iterateExprent(List<Exprent> lstExprents, int index, Exprent next, HashMap<VarVersionPair,
-    Exprent> mapVarValues, SSAUConstructorSparseEx ssau) {
-
+  private int[] iterateExprent(List<Exprent> lstExprents,
+                               int index,
+                               Exprent next,
+                               Map<VarVersionPair, Exprent> mapVarValues,
+                               SSAUConstructorSparseEx ssau) {
     Exprent exprent = lstExprents.get(index);
 
     int changed = 0;
@@ -354,14 +310,14 @@ public class StackVarsProcessor {
       return new int[]{-1, changed};
     }
 
-    HashMap<Integer, HashSet<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
+    Map<Integer, Set<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
 
     boolean isSelfReference = mapVars.containsKey(leftpaar.var);
     if (isSelfReference && notdom) {
       return new int[]{-1, changed};
     }
 
-    HashSet<VarVersionPair> setNextVars = next == null ? null : getAllVersions(next);
+    Set<VarVersionPair> setNextVars = next == null ? null : getAllVersions(next);
 
     // FIXME: fix the entire method!
     if (right.type != Exprent.EXPRENT_CONST &&
@@ -380,8 +336,7 @@ public class StackVarsProcessor {
     boolean vernotreplaced = false;
     boolean verreplaced = false;
 
-
-    HashSet<VarVersionPair> setTempUsedVers = new HashSet<>();
+    Set<VarVersionPair> setTempUsedVers = new HashSet<>();
 
     for (VarVersionNode usedvar : usedVers) {
       VarVersionPair usedver = new VarVersionPair(usedvar.var, usedvar.version);
@@ -424,9 +379,8 @@ public class StackVarsProcessor {
     }
   }
 
-  private static HashSet<VarVersionPair> getAllVersions(Exprent exprent) {
-
-    HashSet<VarVersionPair> res = new HashSet<>();
+  private static Set<VarVersionPair> getAllVersions(Exprent exprent) {
+    Set<VarVersionPair> res = new HashSet<>();
 
     List<Exprent> listTemp = new ArrayList<>(exprent.getAllExprents(true));
     listTemp.add(exprent);
@@ -444,9 +398,8 @@ public class StackVarsProcessor {
   private static Object[] iterateChildExprent(Exprent exprent,
                                               Exprent parent,
                                               Exprent next,
-                                              HashMap<VarVersionPair, Exprent> mapVarValues,
+                                              Map<VarVersionPair, Exprent> mapVarValues,
                                               SSAUConstructorSparseEx ssau) {
-
     boolean changed = false;
 
     for (Exprent expr : exprent.getAllExprents()) {
@@ -527,23 +480,21 @@ public class StackVarsProcessor {
       return new Object[]{null, changed, false};
     }
 
-    HashMap<Integer, HashSet<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
-
+    Map<Integer, Set<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
     if (mapVars.containsKey(leftpaar.var) && notdom) {
       return new Object[]{null, changed, false};
     }
 
-
     mapVars.remove(leftpaar.var);
 
-    HashSet<VarVersionPair> setAllowedVars = getAllVersions(parent);
+    Set<VarVersionPair> setAllowedVars = getAllVersions(parent);
     if (next != null) {
       setAllowedVars.addAll(getAllVersions(next));
     }
 
     boolean vernotreplaced = false;
 
-    HashSet<VarVersionPair> setTempUsedVers = new HashSet<>();
+    Set<VarVersionPair> setTempUsedVers = new HashSet<>();
 
     for (VarVersionNode usedvar : usedVers) {
       VarVersionPair usedver = new VarVersionPair(usedvar.var, usedvar.version);
@@ -558,7 +509,6 @@ public class StackVarsProcessor {
     }
 
     if (!notdom && !vernotreplaced) {
-
       for (VarVersionPair usedver : setTempUsedVers) {
         Exprent copy = right.copy();
         if (right.type == Exprent.EXPRENT_FIELD && ssau.getMapFieldVars().containsKey(right.id)) {
@@ -576,19 +526,16 @@ public class StackVarsProcessor {
   }
 
   private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
-
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
-    HashSet<VarVersionNode> setVisited = new HashSet<>();
-
-    HashSet<VarVersionNode> setNotDoms = new HashSet<>();
+    Set<VarVersionNode> setVisited = new HashSet<>();
+    Set<VarVersionNode> setNotDoms = new HashSet<>();
 
     LinkedList<VarVersionNode> stack = new LinkedList<>();
     stack.add(varnode);
 
     while (!stack.isEmpty()) {
-
       VarVersionNode nd = stack.remove(0);
       setVisited.add(nd);
 
@@ -625,10 +572,9 @@ public class StackVarsProcessor {
   }
 
   private static boolean isVersionToBeReplaced(VarVersionPair usedvar,
-                                               HashMap<Integer, HashSet<VarVersionPair>> mapVars,
+                                               Map<Integer, Set<VarVersionPair>> mapVars,
                                                SSAUConstructorSparseEx ssau,
                                                VarVersionPair leftpaar) {
-
     VarVersionsGraph ssuversions = ssau.getSsuversions();
 
     SFormsFastMapDirect mapLiveVars = ssau.getLiveVarVersionsMap(usedvar);
@@ -643,13 +589,13 @@ public class StackVarsProcessor {
       return false;
     }
 
-    for (Entry<Integer, HashSet<VarVersionPair>> ent : mapVars.entrySet()) {
+    for (Entry<Integer, Set<VarVersionPair>> ent : mapVars.entrySet()) {
       FastSparseSet<Integer> liveverset = mapLiveVars.get(ent.getKey());
       if (liveverset == null) {
         return false;
       }
 
-      HashSet<VarVersionNode> domset = new HashSet<>();
+      Set<VarVersionNode> domset = new HashSet<>();
       for (VarVersionPair verpaar : ent.getValue()) {
         domset.add(ssuversions.nodes.getWithKey(verpaar));
       }
@@ -673,11 +619,10 @@ public class StackVarsProcessor {
     return true;
   }
 
-  private static HashMap<Integer, HashSet<VarVersionPair>> getAllVarVersions(VarVersionPair leftvar,
-                                                                             Exprent exprent,
-                                                                             SSAUConstructorSparseEx ssau) {
-
-    HashMap<Integer, HashSet<VarVersionPair>> map = new HashMap<>();
+  private static Map<Integer, Set<VarVersionPair>> getAllVarVersions(VarVersionPair leftvar,
+                                                                     Exprent exprent,
+                                                                     SSAUConstructorSparseEx ssau) {
+    Map<Integer, Set<VarVersionPair>> map = new HashMap<>();
     SFormsFastMapDirect mapLiveVars = ssau.getLiveVarVersionsMap(leftvar);
 
     List<Exprent> lst = exprent.getAllExprents(true);
@@ -688,7 +633,7 @@ public class StackVarsProcessor {
         int varindex = ((VarExprent)expr).getIndex();
         if (leftvar.var != varindex) {
           if (mapLiveVars.containsKey(varindex)) {
-            HashSet<VarVersionPair> verset = new HashSet<>();
+            Set<VarVersionPair> verset = new HashSet<>();
             for (Integer vers : mapLiveVars.get(varindex)) {
               verset.add(new VarVersionPair(varindex, vers.intValue()));
             }
@@ -706,7 +651,7 @@ public class StackVarsProcessor {
         if (ssau.getMapFieldVars().containsKey(expr.id)) {
           int varindex = ssau.getMapFieldVars().get(expr.id);
           if (mapLiveVars.containsKey(varindex)) {
-            HashSet<VarVersionPair> verset = new HashSet<>();
+            Set<VarVersionPair> verset = new HashSet<>();
             for (Integer vers : mapLiveVars.get(varindex)) {
               verset.add(new VarVersionPair(varindex, vers.intValue()));
             }
@@ -718,4 +663,4 @@ public class StackVarsProcessor {
 
     return map;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
new file mode 100644
index 0000000..712845f
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -0,0 +1,35 @@
+package org.jetbrains.java.decompiler.modules.decompiler.exps;
+
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ExprUtil {
+  public static List<VarVersionPair> getSyntheticParametersMask(String className, String descriptor, int parameters) {
+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(className);
+    return node != null ? getSyntheticParametersMask(node, descriptor, parameters) : null;
+  }
+
+  public static List<VarVersionPair> getSyntheticParametersMask(ClassNode node, String descriptor, int parameters) {
+    List<VarVersionPair> mask = null;
+
+    ClassWrapper wrapper = node.getWrapper();
+    if (wrapper != null) {
+      // own class
+      mask = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor).synthParameters;
+    }
+    else if (parameters > 0 && node.type == ClassNode.CLASS_MEMBER && node.classStruct.hasModifier(CodeConstants.ACC_STATIC)) {
+      // non-static member class
+      mask = new ArrayList<>(Collections.nCopies(parameters, null));
+      mask.set(0, new VarVersionPair(-1, 0));
+    }
+
+    return mask;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index e10b262..da19f41 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -217,9 +217,7 @@ public class FunctionExprent extends Exprent {
   public VarType getExprType() {
     VarType exprType = null;
 
-    if (funcType <= FUNCTION_NEG || funcType == FUNCTION_IPP || funcType == FUNCTION_PPI
-        || funcType == FUNCTION_IMM || funcType == FUNCTION_MMI) {
-
+    if (funcType <= FUNCTION_NEG || funcType == FUNCTION_IPP || funcType == FUNCTION_PPI || funcType == FUNCTION_IMM || funcType == FUNCTION_MMI) {
       VarType type1 = lstOperands.get(0).getExprType();
       VarType type2 = null;
       if (lstOperands.size() > 1) {
@@ -268,7 +266,6 @@ public class FunctionExprent extends Exprent {
       Exprent param1 = lstOperands.get(1);
       Exprent param2 = lstOperands.get(2);
       VarType supertype = VarType.getCommonSupertype(param1.getExprType(), param2.getExprType());
-
       if (param1.type == Exprent.EXPRENT_CONST && param2.type == Exprent.EXPRENT_CONST &&
           supertype.type != CodeConstants.TYPE_BOOLEAN && VarType.VARTYPE_INT.isSuperset(supertype)) {
         exprType = VarType.VARTYPE_INT;
@@ -324,9 +321,6 @@ public class FunctionExprent extends Exprent {
     switch (funcType) {
       case FUNCTION_IIF:
         VarType supertype = getExprType();
-        if (supertype == null) {
-          supertype = getExprType();
-        }
         result.addMinTypeExprent(param1, VarType.VARTYPE_BOOLEAN);
         result.addMinTypeExprent(param2, VarType.getMinTypeInFamily(supertype.typeFamily));
         result.addMinTypeExprent(lstOperands.get(2), VarType.getMinTypeInFamily(supertype.typeFamily));
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 6886540..ecbb55c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -300,10 +300,11 @@ public class InvocationExprent extends Exprent {
           buf.append("<invokedynamic>");
         }
         buf.append("(");
-
         break;
+
       case TYP_CLINIT:
         throw new RuntimeException("Explicit invocation of " + CodeConstants.CLINIT_NAME);
+
       case TYP_INIT:
         if (super_qualifier != null) {
           buf.append("super(");
@@ -311,31 +312,20 @@ public class InvocationExprent extends Exprent {
         else if (isInstanceThis) {
           buf.append("this(");
         }
+        else if (instance != null) {
+          buf.append(instance.toJava(indent, tracer)).append(".<init>(");
+        }
         else {
-          if (instance != null) {
-            buf.append(instance.toJava(indent, tracer)).append(".<init>(");
-          }
-          else {
-            throw new RuntimeException("Unrecognized invocation of " + CodeConstants.INIT_NAME);
-          }
+          throw new RuntimeException("Unrecognized invocation of " + CodeConstants.INIT_NAME);
         }
     }
 
-    List<VarVersionPair> sigFields = null;
+    List<VarVersionPair> mask = null;
     boolean isEnum = false;
     if (functype == TYP_INIT) {
       ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
-
-      if (newNode != null) {  // own class
-        if (newNode.getWrapper() != null) {
-          sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, stringDescriptor).signatureFields;
-        }
-        else {
-          if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0) { // non-static member class
-            sigFields = new ArrayList<>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
-            sigFields.set(0, new VarVersionPair(-1, 0));
-          }
-        }
+      if (newNode != null) {
+        mask = ExprUtil.getSyntheticParametersMask(newNode, stringDescriptor, lstParameters.size());
         isEnum = newNode.classStruct.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
       }
     }
@@ -353,7 +343,7 @@ public class InvocationExprent extends Exprent {
     boolean firstParameter = true;
     int start = isEnum ? 2 : 0;
     for (int i = start; i < lstParameters.size(); i++) {
-      if (sigFields == null || sigFields.get(i) == null) {
+      if (mask == null || mask.get(i) == null) {
         TextBuffer buff = new TextBuffer();
         boolean ambiguous = setAmbiguousParameters.get(i);
 
@@ -373,7 +363,7 @@ public class InvocationExprent extends Exprent {
       }
     }
 
-    buf.append(")");
+    buf.append(')');
 
     return buf;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 5538546..95cf2f7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -20,7 +20,6 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -90,10 +89,8 @@ public class NewExprent extends Exprent {
         }
       }
     }
-    else {
-      if (constructor != null) {
-        return constructor.checkExprTypeBounds();
-      }
+    else if (constructor != null) {
+      return constructor.checkExprTypeBounds();
     }
 
     return result;
@@ -102,21 +99,18 @@ public class NewExprent extends Exprent {
   @Override
   public List<Exprent> getAllExprents() {
     List<Exprent> lst = new ArrayList<>();
-    if (newType.arrayDim == 0) {
-      if (constructor != null) {
-        Exprent constructor_instance = constructor.getInstance();
 
-        if (constructor_instance != null) { // should be true only for a lambda expression with a virtual content method
-          lst.add(constructor_instance);
-        }
-
-        lst.addAll(constructor.getLstParameters());
-      }
-    }
-    else {
+    if (newType.arrayDim != 0) {
       lst.addAll(lstDims);
       lst.addAll(lstArrayElements);
     }
+    else if (constructor != null) {
+      Exprent constructor = this.constructor.getInstance();
+      if (constructor != null) { // should be true only for a lambda expression with a virtual content method
+        lst.add(constructor);
+      }
+      lst.addAll(this.constructor.getLstParameters());
+    }
 
     return lst;
   }
@@ -193,35 +187,22 @@ public class NewExprent extends Exprent {
       buf.append('(');
 
       if (!lambda && constructor != null) {
-        InvocationExprent invSuper = child.superInvocation;
-
-        ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(invSuper.getClassname());
-
-        List<VarVersionPair> sigFields = child.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).signatureFields;
-        if (sigFields == null && newNode != null) { // own class
-          if (newNode.getWrapper() != null) {
-            sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, invSuper.getStringDescriptor()).signatureFields;
-          }
-          else {
-            if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0 &&
-                !constructor.getLstParameters().isEmpty()) { // member non-static class invoked with enclosing class instance
-              sigFields = new ArrayList<>(Collections.nCopies(constructor.getLstParameters().size(), (VarVersionPair)null));
-              sigFields.set(0, new VarVersionPair(-1, 0));
-            }
-          }
+        List<Exprent> parameters = constructor.getLstParameters();
+        List<VarVersionPair> mask = child.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).synthParameters;
+        if (mask == null) {
+          InvocationExprent superCall = child.superInvocation;
+          mask = ExprUtil.getSyntheticParametersMask(superCall.getClassname(), superCall.getStringDescriptor(), parameters.size());
         }
 
-        List<Exprent> lstParameters = constructor.getLstParameters();
-
         int start = enumConst ? 2 : 0;
         boolean firstParam = true;
-        for (int i = start; i < lstParameters.size(); i++) {
-          if (sigFields == null || sigFields.get(i) == null) {
+        for (int i = start; i < parameters.size(); i++) {
+          if (mask == null || mask.get(i) == null) {
             if (!firstParam) {
               buf.append(", ");
             }
 
-            ExprProcessor.getCastedExprent(lstParameters.get(i), constructor.getDescriptor().params[i], buf, indent, true, tracer);
+            ExprProcessor.getCastedExprent(parameters.get(i), constructor.getDescriptor().params[i], buf, indent, true, tracer);
 
             firstParam = false;
           }
@@ -289,33 +270,20 @@ public class NewExprent extends Exprent {
       }
 
       if (constructor != null) {
-        List<Exprent> lstParameters = constructor.getLstParameters();
-
-        ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(constructor.getClassname());
-
-        List<VarVersionPair> sigFields = null;
-        if (newNode != null) { // own class
-          if (newNode.getWrapper() != null) {
-            sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).signatureFields;
-          }
-          else if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0 && !constructor.getLstParameters().isEmpty()) {
-            // member non-static class invoked with enclosing class instance
-            sigFields = new ArrayList<>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
-            sigFields.set(0, new VarVersionPair(-1, 0));
-          }
-        }
+        List<Exprent> parameters = constructor.getLstParameters();
+        List<VarVersionPair> mask = ExprUtil.getSyntheticParametersMask(constructor.getClassname(), constructor.getStringDescriptor(), parameters.size());
 
         int start = enumConst ? 2 : 0;
-        if (!enumConst || start < lstParameters.size()) {
+        if (!enumConst || start < parameters.size()) {
           buf.append('(');
 
           boolean firstParam = true;
-          for (int i = start; i < lstParameters.size(); i++) {
-            if (sigFields == null || sigFields.get(i) == null) {
-              Exprent expr = InvocationExprent.unboxIfNeeded(lstParameters.get(i));
+          for (int i = start; i < parameters.size(); i++) {
+            if (mask == null || mask.get(i) == null) {
+              Exprent expr = InvocationExprent.unboxIfNeeded(parameters.get(i));
               VarType leftType = constructor.getDescriptor().params[i];
 
-              if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
+              if (i == parameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
                 ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
                 if (node != null && node.namelessConstructorStub) {
                   break;  // skip last parameter of synthetic constructor call
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
index b1d4e49..0402097 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -158,7 +158,7 @@ public class VarDefinitionHelper {
 
       boolean defset = false;
 
-      // search for the first assignement to var [index]
+      // search for the first assignment to var [index]
       int addindex = 0;
       for (Exprent expr : lst) {
         if (setDefinition(expr, index)) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 18efb4c..ef0fc4b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -23,24 +23,21 @@ public class VarVersionsGraph {
     nodes.addAllWithKey(colnodes, colpaars);
   }
 
-  public boolean isDominatorSet(VarVersionNode node, HashSet<VarVersionNode> domnodes) {
-
+  public boolean isDominatorSet(VarVersionNode node, Set<VarVersionNode> domnodes) {
     if (domnodes.size() == 1) {
       return engine.isDominator(node, domnodes.iterator().next());
     }
     else {
-
-      HashSet<VarVersionNode> marked = new HashSet<>();
+      Set<VarVersionNode> marked = new HashSet<>();
 
       if (domnodes.contains(node)) {
         return true;
       }
 
-      LinkedList<VarVersionNode> lstNodes = new LinkedList<>();
+      List<VarVersionNode> lstNodes = new LinkedList<>();
       lstNodes.add(node);
 
       while (!lstNodes.isEmpty()) {
-
         VarVersionNode nd = lstNodes.remove(0);
         if (marked.contains(nd)) {
           continue;
@@ -66,8 +63,7 @@ public class VarVersionsGraph {
   }
 
   public void initDominators() {
-
-    final HashSet<VarVersionNode> roots = new HashSet<>();
+    Set<VarVersionNode> roots = new HashSet<>();
 
     for (VarVersionNode node : nodes) {
       if (node.preds.isEmpty()) {
@@ -88,23 +84,20 @@ public class VarVersionsGraph {
     engine.initialize();
   }
 
-  private static LinkedList<VarVersionNode> getReversedPostOrder(Collection<VarVersionNode> roots) {
-
-    LinkedList<VarVersionNode> lst = new LinkedList<>();
-    HashSet<VarVersionNode> setVisited = new HashSet<>();
+  private static List<VarVersionNode> getReversedPostOrder(Collection<VarVersionNode> roots) {
+    List<VarVersionNode> lst = new LinkedList<>();
+    Set<VarVersionNode> setVisited = new HashSet<>();
 
     for (VarVersionNode root : roots) {
-
-      LinkedList<VarVersionNode> lstTemp = new LinkedList<>();
+      List<VarVersionNode> lstTemp = new LinkedList<>();
       addToReversePostOrderListIterative(root, lstTemp, setVisited);
-
       lst.addAll(lstTemp);
     }
 
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, HashSet<VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -113,7 +106,6 @@ public class VarVersionsGraph {
     stackIndex.add(0);
 
     while (!stackNode.isEmpty()) {
-
       VarVersionNode node = stackNode.getLast();
       int index = stackIndex.removeLast();
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
index 41f3ae8..89c0cc8 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
@@ -8,7 +8,6 @@ import java.util.Arrays;
 import java.util.List;
 
 public class MethodDescriptor {
-
   public final VarType[] params;
   public final VarType ret;
 
@@ -127,4 +126,4 @@ public class MethodDescriptor {
     result = 31 * result + params.length;
     return result;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java b/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
index 6e038f8..7cc7cf9 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
@@ -1,9 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
-
 public interface IMatchable {
-
   enum MatchProperties {
     STATEMENT_TYPE,
     STATEMENT_RET,
@@ -29,5 +27,4 @@ public interface IMatchable {
   IMatchable findObject(MatchNode matchNode, int index);
 
   boolean match(MatchNode matchNode, MatchEngine engine);
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
index 3c38e6b..0eebccf 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
@@ -12,13 +12,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 
 import java.util.*;
 
-
 public class MatchEngine {
-
-  private MatchNode rootNode = null;
-
-  private final Map<String, Object> variables = new HashMap<>();
-
   private static final Map<String, MatchProperties> stat_properties = new HashMap<>();
   private static final Map<String, MatchProperties> expr_properties = new HashMap<>();
   private static final Map<String, Integer> stat_type = new HashMap<>();
@@ -83,19 +77,19 @@ public class MatchEngine {
     expr_const_type.put("string", VarType.VARTYPE_STRING);
   }
 
+  private final MatchNode rootNode;
+  private final Map<String, Object> variables = new HashMap<>();
 
-  public void parse(String description) {
-
+  public MatchEngine(String description) {
     // each line is a separate statement/exprent
     String[] lines = description.split("\n");
 
     int depth = 0;
     LinkedList<MatchNode> stack = new LinkedList<>();
 
-    for(String line : lines) {
-
+    for (String line : lines) {
       List<String> properties = new ArrayList<>(Arrays.asList(line.split("\\s+"))); // split on any number of whitespaces
-      if(properties.get(0).isEmpty()) {
+      if (properties.get(0).isEmpty()) {
         properties.remove(0);
       }
 
@@ -103,11 +97,11 @@ public class MatchEngine {
 
       // create new node
       MatchNode matchNode = new MatchNode(node_type);
-      for(int i = 1; i < properties.size(); ++i) {
+      for (int i = 1; i < properties.size(); ++i) {
         String[] values = properties.get(i).split(":");
 
         MatchProperties property = (node_type == MatchNode.MATCHNODE_STATEMENT ? stat_properties : expr_properties).get(values[0]);
-        if(property == null) { // unknown property defined
+        if (property == null) { // unknown property defined
           throw new RuntimeException("Unknown matching property");
         }
         else {
@@ -115,61 +109,61 @@ public class MatchEngine {
           int parameter = 0;
 
           String strValue = values[1];
-          if(values.length == 3) {
+          if (values.length == 3) {
             parameter = Integer.parseInt(values[1]);
             strValue = values[2];
           }
 
-          switch(property) {
-          case STATEMENT_TYPE:
-            value = stat_type.get(strValue);
-            break;
-          case STATEMENT_STATSIZE:
-          case STATEMENT_EXPRSIZE:
-            value = Integer.valueOf(strValue);
-            break;
-          case STATEMENT_POSITION:
-          case EXPRENT_POSITION:
-          case EXPRENT_INVOCATION_CLASS:
-          case EXPRENT_INVOCATION_SIGNATURE:
-          case EXPRENT_INVOCATION_PARAMETER:
-          case EXPRENT_VAR_INDEX:
-          case EXPRENT_FIELD_NAME:
-          case EXPRENT_CONSTVALUE:
-          case STATEMENT_RET:
-          case EXPRENT_RET:
-            value = strValue;
-            break;
-          case STATEMENT_IFTYPE:
-            value = stat_if_type.get(strValue);
-            break;
-          case EXPRENT_FUNCTYPE:
-            value = expr_func_type.get(strValue);
-            break;
-          case EXPRENT_EXITTYPE:
-            value = expr_exit_type.get(strValue);
-            break;
-          case EXPRENT_CONSTTYPE:
-            value = expr_const_type.get(strValue);
-            break;
-          case EXPRENT_TYPE:
-            value = expr_type.get(strValue);
-            break;
-          default:
-            throw new RuntimeException("Unhandled matching property");
+          switch (property) {
+            case STATEMENT_TYPE:
+              value = stat_type.get(strValue);
+              break;
+            case STATEMENT_STATSIZE:
+            case STATEMENT_EXPRSIZE:
+              value = Integer.valueOf(strValue);
+              break;
+            case STATEMENT_POSITION:
+            case EXPRENT_POSITION:
+            case EXPRENT_INVOCATION_CLASS:
+            case EXPRENT_INVOCATION_SIGNATURE:
+            case EXPRENT_INVOCATION_PARAMETER:
+            case EXPRENT_VAR_INDEX:
+            case EXPRENT_FIELD_NAME:
+            case EXPRENT_CONSTVALUE:
+            case STATEMENT_RET:
+            case EXPRENT_RET:
+              value = strValue;
+              break;
+            case STATEMENT_IFTYPE:
+              value = stat_if_type.get(strValue);
+              break;
+            case EXPRENT_FUNCTYPE:
+              value = expr_func_type.get(strValue);
+              break;
+            case EXPRENT_EXITTYPE:
+              value = expr_exit_type.get(strValue);
+              break;
+            case EXPRENT_CONSTTYPE:
+              value = expr_const_type.get(strValue);
+              break;
+            case EXPRENT_TYPE:
+              value = expr_type.get(strValue);
+              break;
+            default:
+              throw new RuntimeException("Unhandled matching property");
           }
 
           matchNode.addRule(property, new RuleValue(parameter, value));
         }
       }
 
-      if(stack.isEmpty()) { // first line, root node
+      if (stack.isEmpty()) { // first line, root node
         stack.push(matchNode);
-      } else {
-
+      }
+      else {
         // return to the correct parent on the stack
         int new_depth = line.lastIndexOf(' ', depth) + 1;
-        for(int i = new_depth; i <= depth; ++i) {
+        for (int i = new_depth; i <= depth; ++i) {
           stack.pop();
         }
 
@@ -190,25 +184,24 @@ public class MatchEngine {
   }
 
   private boolean match(MatchNode matchNode, IMatchable object) {
-
-    if(!object.match(matchNode, this)) {
+    if (!object.match(matchNode, this)) {
       return false;
     }
 
     int expr_index = 0;
     int stat_index = 0;
-
-    for(MatchNode childNode : matchNode.getChildren()) {
+    for (MatchNode childNode : matchNode.getChildren()) {
       boolean isStatement = childNode.getType() == MatchNode.MATCHNODE_STATEMENT;
 
       IMatchable childObject = object.findObject(childNode, isStatement ? stat_index : expr_index);
-      if(childObject == null || !match(childNode, childObject)) {
+      if (childObject == null || !match(childNode, childObject)) {
         return false;
       }
 
-      if(isStatement) {
+      if (isStatement) {
         stat_index++;
-      } else {
+      }
+      else {
         expr_index++;
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
index 7320954..ff33e75 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
@@ -1,15 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
+import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
-
 public class MatchNode {
-
   public static class RuleValue {
     public final int parameter;
     public final Object value;
@@ -33,12 +32,9 @@ public class MatchNode {
   public static final int MATCHNODE_EXPRENT = 1;
 
   private final int type;
-
   private final Map<MatchProperties, RuleValue> rules = new HashMap<>();
-
   private final List<MatchNode> children = new ArrayList<>();
 
-
   public MatchNode(int type) {
     this.type = type;
   }
@@ -67,5 +63,4 @@ public class MatchNode {
     RuleValue rule = rules.get(property);
     return rule == null ? null : rule.value;
   }
-
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index 677bb2d..aebf570 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -14,7 +14,7 @@ import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class DecompilerTestFixture {

From f83c480383d02966143c5c6b85f454a3941a0b43 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 6 Dec 2017 12:20:13 +0100
Subject: [PATCH 165/252] [java decompiler] better filter for synthetic
 constructor parameters

---
 .../jetbrains/java/decompiler/main/ClassWriter.java  |  2 +-
 .../java/decompiler/main/ClassesProcessor.java       |  1 -
 .../decompiler/main/rels/NestedClassProcessor.java   |  4 ----
 .../modules/decompiler/exps/NewExprent.java          | 12 +++++++-----
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 5b6ae7e..dc3b829 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -227,7 +227,7 @@ public class ClassWriter {
       for (ClassNode inner : node.nested) {
         if (inner.type == ClassNode.CLASS_MEMBER) {
           StructClass innerCl = inner.classStruct;
-          boolean isSynthetic = (inner.access & CodeConstants.ACC_SYNTHETIC) != 0 || innerCl.isSynthetic() || inner.namelessConstructorStub;
+          boolean isSynthetic = (inner.access & CodeConstants.ACC_SYNTHETIC) != 0 || innerCl.isSynthetic();
           boolean hide = isSynthetic && DecompilerContext.getOption(IFernflowerPreferences.REMOVE_SYNTHETIC) ||
                          wrapper.getHiddenMembers().contains(innerCl.qualifiedName);
           if (hide) continue;
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 26817be..bda88c6 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -327,7 +327,6 @@ public class ClassesProcessor {
     public final Set<String> enclosingClasses = new HashSet<>();
     public ClassNode parent;
     public LambdaInformation lambdaInformation;
-    public boolean namelessConstructorStub = false;
 
     public ClassNode(String content_class_name,
                      String content_method_name,
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 4a77471..20f4859 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -61,10 +61,6 @@ public class NestedClassProcessor {
           DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
           child.simpleName = "NamelessClass_" + (++nameless);
         }
-        child.namelessConstructorStub = !cl.hasModifier(CodeConstants.ACC_STATIC) && cl.getMethods().size() + cl.getFields().size() == 0;
-      }
-      else if (child.type == ClassNode.CLASS_ANONYMOUS && (child.access & CodeConstants.ACC_SYNTHETIC) != 0 || cl.isSynthetic()) {
-        child.namelessConstructorStub = !cl.hasModifier(CodeConstants.ACC_STATIC) && cl.getMethods().size() + cl.getFields().size() == 0;
       }
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 95cf2f7..541e91d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -283,11 +283,8 @@ public class NewExprent extends Exprent {
               Exprent expr = InvocationExprent.unboxIfNeeded(parameters.get(i));
               VarType leftType = constructor.getDescriptor().params[i];
 
-              if (i == parameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
-                ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
-                if (node != null && node.namelessConstructorStub) {
-                  break;  // skip last parameter of synthetic constructor call
-                }
+              if (i == parameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL && probablySyntheticParameter(leftType.value)) {
+                break;  // skip last parameter of synthetic constructor call
               }
 
               if (!firstParam) {
@@ -360,6 +357,11 @@ public class NewExprent extends Exprent {
     return buf;
   }
 
+  private static boolean probablySyntheticParameter(String className) {
+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(className);
+    return node != null && node.type == ClassNode.CLASS_ANONYMOUS;
+  }
+
   private static String getQualifiedNewInstance(String classname, List<Exprent> lstParams, int indent, BytecodeMappingTracer tracer) {
     ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
 

From a3332a5f31edbb1ed7ff62bc0c0c13ce4b063608 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 6 Dec 2017 19:26:11 +0100
Subject: [PATCH 166/252] [java decompiler] detecting Groovy synthetic
 constructor parameters

---
 .../main/rels/NestedClassProcessor.java       |  11 +-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestGroovyClass$Inner.class   | Bin 0 -> 3870 bytes
 .../classes/pkg/TestGroovyClass$Nested.class  | Bin 0 -> 3807 bytes
 .../pkg/TestGroovyClass$_closure1.class       | Bin 0 -> 2236 bytes
 .../pkg/TestGroovyClass$_closure2.class       | Bin 0 -> 1969 bytes
 testData/classes/pkg/TestGroovyClass.class    | Bin 0 -> 4911 bytes
 testData/results/TestGroovyClass.dec          | 230 ++++++++++++++++++
 testData/src/pkg/TestGroovyClass.groovy       |  13 +
 9 files changed, 250 insertions(+), 5 deletions(-)
 create mode 100644 testData/classes/pkg/TestGroovyClass$Inner.class
 create mode 100644 testData/classes/pkg/TestGroovyClass$Nested.class
 create mode 100644 testData/classes/pkg/TestGroovyClass$_closure1.class
 create mode 100644 testData/classes/pkg/TestGroovyClass$_closure2.class
 create mode 100644 testData/classes/pkg/TestGroovyClass.class
 create mode 100644 testData/results/TestGroovyClass.dec
 create mode 100644 testData/src/pkg/TestGroovyClass.groovy

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 20f4859..649520c 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -376,10 +376,8 @@ public class NestedClassProcessor {
         mergeListSignatures(entry.getValue(), interPairMask, false);
 
         List<VarVersionPair> mask = new ArrayList<>(entry.getValue().size());
-        boolean firstSignField = nestedNode.type != ClassNode.CLASS_ANONYMOUS;
         for (VarFieldPair pair : entry.getValue()) {
-          mask.add(pair == null || (!firstSignField && pair.fieldKey.isEmpty()) ? null : pair.varPair);
-          firstSignField = false;
+          mask.add(pair != null && !pair.fieldKey.isEmpty() ? pair.varPair : null);
         }
         nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entry.getKey()).synthParameters = mask;
       }
@@ -620,8 +618,7 @@ public class NestedClassProcessor {
             StructField fd = cl.getField(left.getName(), left.getDescriptor().descriptorString);
             if (fd != null &&
                 cl.qualifiedName.equals(left.getClassname()) &&
-                fd.hasModifier(CodeConstants.ACC_FINAL) &&
-                (fd.isSynthetic() || noSynthFlag && fd.hasModifier(CodeConstants.ACC_PRIVATE))) {
+                (fd.isSynthetic() || noSynthFlag && possiblySyntheticField(fd))) {
               // local (== not inherited) field
               field = InterpreterUtil.makeUniqueKey(left.getName(), left.getDescriptor().descriptorString);
               break;
@@ -634,6 +631,10 @@ public class NestedClassProcessor {
     return field;
   }
 
+  private static boolean possiblySyntheticField(StructField fd) {
+    return fd.getName().contains("$") && fd.hasModifier(CodeConstants.ACC_FINAL) && fd.hasModifier(CodeConstants.ACC_PRIVATE);
+  }
+
   private static void mergeListSignatures(List<VarFieldPair> first, List<VarFieldPair> second, boolean both) {
     int i = 1;
 
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 0c24ed8..8ab660f 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -111,6 +111,7 @@ public class SingleClassesTest {
   //@Test public void testInUse() { doTest("pkg/TestInUse"); }
   //@Test public void testInterfaceSuper() { doTest("pkg/TestInterfaceSuper"); }
 
+  @Test public void testGroovyClass() { doTest("pkg/TestGroovyClass"); }
   @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
 
   private void doTest(String testFile, String... companionFiles) {
diff --git a/testData/classes/pkg/TestGroovyClass$Inner.class b/testData/classes/pkg/TestGroovyClass$Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..51242d8e0a41df4ad7ba654797ece7311971ebfb
GIT binary patch
literal 3870
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
X5vbB%$fpWE{7P?$B2>}w{v*WyUFiUh

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestGroovyClass$Nested.class b/testData/classes/pkg/TestGroovyClass$Nested.class
new file mode 100644
index 0000000000000000000000000000000000000000..43d2e0e47161f590a8627a10a783a727660f80ef
GIT binary patch
literal 3807
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
B>%#y5

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestGroovyClass$_closure1.class b/testData/classes/pkg/TestGroovyClass$_closure1.class
new file mode 100644
index 0000000000000000000000000000000000000000..61d5314e56bcc1d9fec899cb02759448bbf2c349
GIT binary patch
literal 2236
zcmb7FZBrXn6n<`!vaoDR2nDT(1x-t`(5BGZswr)0YGWjTHi#l>TsAjhY1m~po6hhP
z{2_kF)}d%e$4_>~ALaC%-6ck{bf#bK-o5vn=e#}V+<*T4{Z9aMcq}ln_qdT;lP$04
zI?j{*Leprq(p9tRwA!wmQy>IJ8va$TY1oZiA-GWx7npV2M$U9<a@%OPa-o#lwmoZC
z=8DpmuHngAN8^mZ*a=Hl10{iEy5$+3W%~9@cHI%s%aQQ1-jt?iIX1aMzOrmyK&e&<
zVYwh6z7^=ZZP}K0M_@Wr-Z7pSf$OVVJEWQKJ;|;M45u5?D;UjY#q#8$>l*t4^O@{s
zv=d>BCds!*K6k8`*KiI)Dq=`#&~R2o0x5xnw{5iqE|y=LYzpIC)oFXuE!mU}+mr&S
zUT*~ktBe<fL&4S@HZO2FBG_!New<1V0j)H>J4wZ|jjg8a$GZYoBJ+J(s0!XAPdEdG
zw(CmU6S$WtcT=V4)8_Q7_qwKG5>tb?i1!6z79pO`L<FGW0^Z>qUnXvH*(yGDmZfL-
zln}T;YTcf6t|-OHlY~&93-ojKnNI}yKb!s`m30<ZRLtP2z})N7R54v^&%3|xN$!iq
znz2XaRB%n;EK{=Mh`>x_wW7V&FpujhHS7%y{TLXa*l!ACA{~k74+S4ly^kXdx@)1^
zd=O+dn(GmOl#fr4SMf1!2f&@UG~7X!FYXeV)69;pewyg2xGU?qic|L<$+{%=n375}
zmNs2UBjdQ6{5Gu4(M4vnOSR&;mfgs6*D8Co^_q4+J|(h5sSDhsdPZjIG-mr|^V}vh
z{JQ88*j4bkh5{Zi0n0Qa-W*!N%8AJo<UcY-9wT3<SjCqb7IB|TUlADpkHkHRRPdER
zoT{ziYg|&Xj&C#+@fkZzvvIV$@L_Xi*V)W>Ec?B{86y~f*WP^iRq^8h`D#!XMT|NH
zrocewaiO_bpeErV=MYoY4cFpXw8o3TP}#EON_%%py5WghaoVmaA6k5^m27%n{KUx?
zrYN=q4YfYRlPb3eko*ZM2I;GE-l&-LmhniYwN8Hvh?52|c!c2<eP;GKMt<Rnqe1H=
zU4qolW0bzU8^c?4$Gf*_7o$DRAX*u!NYX4nLQu=IsquL|HSrrhh~q#U&~eO%9HTEV
z+<_cM+K1ex(>?-9kgp7SDFoF?o;5TAE$iYC(*auGphi+12a^e8kPY>&hkDccA#$nM
z&*;~W@ZrHz+$zt!#1NkzVPT{E47X+uagQD36cM3AfDwv?!4*9<o_bi}q_6-HC={6T
zGYyQUN`GK!iQt!CV09xE)1TwfF&@2wq4<puFY^>@e`A=|Lu~v-3QI4MI>P4C3#@OD
e>JQJbrvHj9AAy3f$Zm{^wnJZ)uwtk|Lc9WjMNruQ

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestGroovyClass$_closure2.class b/testData/classes/pkg/TestGroovyClass$_closure2.class
new file mode 100644
index 0000000000000000000000000000000000000000..50c203eb3bdb7dae9f1d3bde25810e3b66b0ff33
GIT binary patch
literal 1969
zcmb7E?^6?36g@YIELm0w5oy(;)TWYb&;_*GHew5Dr6~bhgD7H~S(cZ$HtaIH8)x_v
z`iJy8)ebW4w9`*@rhinY_w6n*!nQMh*&pxSd)__go_GKL=hr^~%;0;%_|6Y)V^#RU
zqUXBLcB>uJ_X|y{<N94s%qk$l>2|nfbWEphRHGdQX~LB2wGGSN5>L#oZ^Thv*9q)x
zVJr$qcxE8BdKo7OV@FQ98YK~O1wSwY+X~OGIW3o<*AwAIt0Szyb{#H-Yn8DTg3@d<
z!g7^Bj|c;|Y{w366DEuGr{*&=D*f)}Q_id$Un#8-Mha~aRLxGOVFzN~^UPhsY_YVF
zTtv*#;&`9qjl;x>hEo_;kwQ*`hLb8X$P+Tb6Wb?TtpBgrOygA3?FPcDIjn|b2}1sO
zwS=Lj#Ea-K*)3NdPq>^wwv?2w)h4$mWbNi=M-1XTA!P@I(PBchhO;;)30-6(NR1j{
zpO!^nhWZoEa$3JbdRxpVcT{}^9}otm)UtUD`No;yB5U{|E~_YDk}#9#fmr^A<=H#I
z!fqg>3Fo)W9o9}kiEvW(zgGyMoG49l)f&o}QlaCDhCyVr%-tXq6AMW&qk<WNcE~WY
z@?8J%5y?`ru@V4Tk88NDViq4oz&&0XZsL;M_?VqjkPYoK?|5J5J<&26ZY#JaTEY`-
zEN;zc!SV#(&qM3Rp1;8jNu>H;mJjnPX`Ux|qu-6dvz@kr&-fm_J)na5Beyq_ZKID>
zbV8-HCa+pm#R9(2@F^;?V|NJWUwiKue+6F=(%d8sU*m#`8kRKN!kjevGT}^rzv8hG
z9dlR4enU86Mk8YS?FYm?G_qXlDw{uH94O#nl<f^*o*h;8wj2a5H+aqTY<X!{<%2L>
zw;i$4-QE;lyrMSTu4jomw%pcg4$t6FIN{@c=9b|e4IrIUrL%$Dk5DnhZ&m8X9US0&
z9$Wle=f63mIRh9vz{rYTo_dMXKZk98#Lo%d1gDSU48P^q7~bJT`SmV;rTCjiM-Phi
z=DjRKE$83cqdopfK?05O8&G;c3dTdA4PKS?WVj*;bs>h*IbLRH3{}@@9}^K8g=jLi
zS5_{=tS`lR*W$cMeILbq>L(292e`WT9MkpkD-6rk1Ke1zzrb{PAD_qqr7-M@7+^e<
z4;abc{vDq${f340d`f?bFAqa`^v9vsnXIg%_#BIWVT7OisQ<|cORtbWzzQeV);aat
d7g*GP!Tk_{>wC;ODc0gUeyfa-!UH@6{R{TM1YrOG

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestGroovyClass.class b/testData/classes/pkg/TestGroovyClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..de9df4bc23ea1520daa8aeedaf43867c3fcf33ba
GIT binary patch
literal 4911
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
OyNBy_u6<l@K>Z)fT~#vx

literal 0
HcmV?d00001

diff --git a/testData/results/TestGroovyClass.dec b/testData/results/TestGroovyClass.dec
new file mode 100644
index 0000000..02ede11
--- /dev/null
+++ b/testData/results/TestGroovyClass.dec
@@ -0,0 +1,230 @@
+package pkg;
+
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import java.util.concurrent.Callable;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+
+public class TestGroovyClass implements GroovyObject {
+   private final TestGroovyClass.Nested n;
+   private final TestGroovyClass.Inner i;
+   private final Runnable r;
+   private final Callable<String> c;
+
+   public TestGroovyClass() {
+      CallSite[] var1 = $getCallSiteArray();
+      Object var2 = var1[0].callConstructor(TestGroovyClass.Nested.class);// 9
+      this.n = (TestGroovyClass.Nested)ScriptBytecodeAdapter.castToType(var2, TestGroovyClass.Nested.class);
+      Object var3 = var1[1].callConstructor(TestGroovyClass.Inner.class, this);
+      this.i = (TestGroovyClass.Inner)ScriptBytecodeAdapter.castToType(var3, TestGroovyClass.Inner.class);
+      TestGroovyClass._closure1 var4 = new TestGroovyClass._closure1(this, this);// 10
+      this.r = var4;
+      TestGroovyClass._closure2 var5 = new TestGroovyClass._closure2(this, this);
+      this.c = var5;
+      MetaClass var6 = this.$getStaticMetaClass();
+      this.metaClass = var6;
+   }
+
+   public final TestGroovyClass.Nested getN() {
+      return this.n;
+   }
+
+   public final TestGroovyClass.Inner getI() {
+      return this.i;
+   }
+
+   public final Runnable getR() {
+      return this.r;
+   }
+
+   public final Callable<String> getC() {
+      return this.c;
+   }
+
+   public static class Nested implements GroovyObject {
+      public Nested() {
+         CallSite[] var1 = $getCallSiteArray();
+         MetaClass var2 = this.$getStaticMetaClass();
+         this.metaClass = var2;
+      }
+   }
+
+   public class Inner implements GroovyObject {
+      public Inner() {
+         CallSite[] var2 = $getCallSiteArray();
+         super();
+         MetaClass var4 = this.$getStaticMetaClass();
+         this.metaClass = var4;
+      }
+   }
+
+   public class _closure1 extends Closure implements GeneratedClosure {
+      public _closure1(Object _outerInstance, Object _thisObject) {
+         CallSite[] var3 = $getCallSiteArray();
+         super(_outerInstance, _thisObject);
+      }
+
+      public Object doCall(Object it) {
+         CallSite[] var2 = $getCallSiteArray();
+         return var2[0].callCurrent(this, "I'm runnable");// 11
+      }
+
+      public Object doCall() {
+         CallSite[] var1 = $getCallSiteArray();
+         return this.doCall((Object)null);
+      }
+   }
+
+   public class _closure2 extends Closure implements GeneratedClosure {
+      public _closure2(Object _outerInstance, Object _thisObject) {
+         CallSite[] var3 = $getCallSiteArray();
+         super(_outerInstance, _thisObject);
+      }
+
+      public Object doCall(Object it) {
+         CallSite[] var2 = $getCallSiteArray();
+         return "I'm callable";// 12
+      }
+
+      public Object doCall() {
+         CallSite[] var1 = $getCallSiteArray();
+         return this.doCall((Object)null);
+      }
+   }
+}
+
+class 'pkg/TestGroovyClass' {
+   method '<init> ()V' {
+      4      17
+      7      17
+      9      18
+      b      18
+      c      18
+      e      18
+      13      18
+      15      19
+      17      19
+      1a      19
+      1f      19
+      25      20
+      27      20
+      28      20
+      2b      20
+      30      20
+      32      21
+      34      21
+      37      21
+      3c      21
+      4a      22
+      50      23
+      5f      24
+      65      25
+      6c      26
+      6f      26
+      75      27
+      7b      28
+   }
+
+   method 'getN ()Lpkg/TestGroovyClass$Nested;' {
+      1      31
+      4      31
+   }
+
+   method 'getI ()Lpkg/TestGroovyClass$Inner;' {
+      1      35
+      4      35
+   }
+
+   method 'getR ()Ljava/lang/Runnable;' {
+      1      39
+      4      39
+   }
+
+   method 'getC ()Ljava/util/concurrent/Callable;' {
+      1      43
+      4      43
+   }
+}
+
+class 'pkg/TestGroovyClass$Nested' {
+   method '<init> ()V' {
+      4      48
+      7      48
+      9      49
+      c      49
+      10      50
+      15      51
+   }
+}
+
+class 'pkg/TestGroovyClass$Inner' {
+   method '<init> (Lpkg/TestGroovyClass;)V' {
+      0      56
+      3      56
+      f      57
+      13      58
+      16      58
+      1c      59
+      22      60
+   }
+}
+
+class 'pkg/TestGroovyClass$_closure1' {
+   method '<init> (Ljava/lang/Object;Ljava/lang/Object;)V' {
+      0      65
+      3      65
+      7      66
+      a      67
+   }
+
+   method 'doCall (Ljava/lang/Object;)Ljava/lang/Object;' {
+      0      70
+      3      70
+      5      71
+      7      71
+      9      71
+      b      71
+      10      71
+   }
+
+   method 'doCall ()Ljava/lang/Object;' {
+      0      75
+      3      75
+      5      76
+      6      76
+      9      76
+   }
+}
+
+class 'pkg/TestGroovyClass$_closure2' {
+   method '<init> (Ljava/lang/Object;Ljava/lang/Object;)V' {
+      0      82
+      3      82
+      7      83
+      a      84
+   }
+
+   method 'doCall (Ljava/lang/Object;)Ljava/lang/Object;' {
+      0      87
+      3      87
+      4      88
+      6      88
+   }
+
+   method 'doCall ()Ljava/lang/Object;' {
+      0      92
+      3      92
+      5      93
+      6      93
+      9      93
+   }
+}
+
+Lines mapping:
+9 <-> 19
+10 <-> 23
+11 <-> 72
+12 <-> 89
diff --git a/testData/src/pkg/TestGroovyClass.groovy b/testData/src/pkg/TestGroovyClass.groovy
new file mode 100644
index 0000000..899aab2
--- /dev/null
+++ b/testData/src/pkg/TestGroovyClass.groovy
@@ -0,0 +1,13 @@
+package pkg
+
+import java.util.concurrent.Callable
+
+class TestGroovyClass {
+  static class Nested { }
+  class Inner { }
+
+  final Nested n = new Nested()
+  final Inner i = new Inner()
+  final Runnable r = { println("I'm runnable") }
+  final Callable<String> c = { "I'm callable" }
+}
\ No newline at end of file

From 45486cd4d4b5e1d5388e19cf74f7cad657f3535c Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 7 Dec 2017 10:43:23 +0100
Subject: [PATCH 167/252] [java decompiler] adds an empty line before local
 classes

---
 .../java/decompiler/main/TextBuffer.java      |  1 +
 .../modules/decompiler/ExprProcessor.java     | 10 +++-
 testData/results/TestLocalClass.dec           | 49 ++++++++++---------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/TextBuffer.java b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
index 789d584..c11ef4a 100644
--- a/src/org/jetbrains/java/decompiler/main/TextBuffer.java
+++ b/src/org/jetbrains/java/decompiler/main/TextBuffer.java
@@ -10,6 +10,7 @@ import java.util.*;
  *
  * @author egor
  */
+@SuppressWarnings("UnusedReturnValue")
 public class TextBuffer {
   private final String myLineSeparator = DecompilerContext.getNewLineSeparator();
   private final String myIndent = (String)DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 00536fc..39efaff 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -731,8 +731,7 @@ public class ExprProcessor implements CodeConstants {
     return !(type == Exprent.EXPRENT_SWITCH ||
              type == Exprent.EXPRENT_MONITOR ||
              type == Exprent.EXPRENT_IF ||
-             (type == Exprent.EXPRENT_VAR && ((VarExprent)expr)
-               .isClassDef()));
+             (type == Exprent.EXPRENT_VAR && ((VarExprent)expr).isClassDef()));
   }
 
   private static void addDeletedGotoInstructionMapping(Statement stat, BytecodeMappingTracer tracer) {
@@ -803,7 +802,14 @@ public class ExprProcessor implements CodeConstants {
     TextBuffer buf = new TextBuffer();
 
     for (Exprent expr : lst) {
+      if (buf.length() > 0 && expr.type == Exprent.EXPRENT_VAR && ((VarExprent)expr).isClassDef()) {
+        // separates local class definition from previous statements
+        buf.appendLineSeparator();
+        tracer.incrementCurrentSourceLine();
+      }
+
       TextBuffer content = expr.toJava(indent, tracer);
+
       if (content.length() > 0) {
         if (expr.type != Exprent.EXPRENT_VAR || !((VarExprent)expr).isClassDef()) {
           buf.appendIndent(indent);
diff --git a/testData/results/TestLocalClass.dec b/testData/results/TestLocalClass.dec
index 27c2958..a14a51a 100644
--- a/testData/results/TestLocalClass.dec
+++ b/testData/results/TestLocalClass.dec
@@ -3,6 +3,7 @@ package pkg;
 public abstract class TestLocalClass {
    void foo() {
       boolean var1 = true;// 8
+
       class Local {
          void foo() {
             boolean var1 = true;// 11
@@ -25,11 +26,11 @@ public abstract class TestLocalClass {
 
 class 'pkg/TestLocalClass$1Local' {
    method 'foo ()V' {
-      0      7
-      1      7
-      2      8
-      3      8
-      4      9
+      0      8
+      1      8
+      2      9
+      3      9
+      4      10
    }
 }
 
@@ -37,33 +38,33 @@ class 'pkg/TestLocalClass' {
    method 'foo ()V' {
       0      4
       1      4
-      a      12
-      c      13
-      f      14
+      a      13
+      c      14
+      f      15
    }
 
    method 'boo ()V' {
-      0      17
-      1      17
-      2      18
+      0      18
+      1      18
+      2      19
    }
 
    method 'zoo ()V' {
-      0      21
-      1      21
-      2      22
+      0      22
+      1      22
+      2      23
    }
 }
 
 Lines mapping:
 8 <-> 5
-11 <-> 8
-12 <-> 9
-13 <-> 10
-15 <-> 13
-16 <-> 14
-17 <-> 15
-20 <-> 18
-21 <-> 19
-24 <-> 22
-25 <-> 23
+11 <-> 9
+12 <-> 10
+13 <-> 11
+15 <-> 14
+16 <-> 15
+17 <-> 16
+20 <-> 19
+21 <-> 20
+24 <-> 23
+25 <-> 24

From 5e3eace003cacee8d6814419097e74844fae521c Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 7 Dec 2017 11:34:24 +0100
Subject: [PATCH 168/252] [java decompiler] disabled "synthetic not set" option
 by default

The option may cause valid constructor parameters to be mislabeled "synthetic" and removed from resulting code.
---
 README.md                                                       | 2 +-
 .../java/decompiler/main/extern/IFernflowerPreferences.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index abc4871..fb41717 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ The rest of options can be left as they are: they are aimed at professional reve
 - lit (0): output numeric literals "as-is"
 - asc (0): encode non-ASCII characters in string and character literals as Unicode escapes
 - bto (1): interpret int 1 as boolean true (workaround to a compiler bug)
-- nns (1): allow for not set synthetic attribute (workaround to a compiler bug)
+- nns (0): allow for not set synthetic attribute (workaround to a compiler bug)
 - uto (1): consider nameless types as java.lang.Object (workaround to a compiler architecture flaw)
 - udv (1): reconstruct variable names from debug information, if present
 - rer (1): remove empty exception ranges
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index c8d927a..cda288b 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -64,7 +64,7 @@ public interface IFernflowerPreferences {
     defaults.put(LITERALS_AS_IS, "0");
     defaults.put(BOOLEAN_TRUE_ONE, "1");
     defaults.put(ASCII_STRING_CHARACTERS, "0");
-    defaults.put(SYNTHETIC_NOT_SET, "1");
+    defaults.put(SYNTHETIC_NOT_SET, "0");
     defaults.put(UNDEFINED_PARAM_TYPE_OBJECT, "1");
     defaults.put(USE_DEBUG_VAR_NAMES, "1");
     defaults.put(REMOVE_EMPTY_RANGES, "1");

From 741f9945a84dfc34e91da0940477f666322d231f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 7 Dec 2017 11:35:34 +0100
Subject: [PATCH 169/252] Cleanup (README formatting)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fb41717..302aad0 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@ The rest of options can be left as they are: they are aimed at professional reve
 - fdi (1): de-inline finally structures
 - mpm (0): maximum allowed processing time per decompiled method, in seconds. 0 means no upper limit
 - ren (0): rename ambiguous (resp. obfuscated) classes and class elements
-- urc: full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
-         should be renamed and provides new identifier names (see "Renaming identifiers")
+- urc (-): full name of a user-supplied class implementing IIdentifierRenamer interface. It is used to determine which class identifiers
+           should be renamed and provides new identifier names (see "Renaming identifiers")
 - inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
 - lac (0): decompile lambda expressions to anonymous classes
 - nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent

From e449aeb6fa350f67a8482766992023a1c6f87d8e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 7 Dec 2017 13:33:13 +0100
Subject: [PATCH 170/252] Cleanup (duplicates; final fields; typos)

---
 .../java/decompiler/main/ClassWriter.java     | 60 ++++++++-----------
 .../gen/generics/GenericFieldDescriptor.java  |  7 ++-
 .../struct/gen/generics/GenericMain.java      | 33 +++++-----
 .../gen/generics/GenericMethodDescriptor.java | 31 ++++++----
 4 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index dc3b829..50bd994 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -654,7 +654,7 @@ public class ClassWriter {
             else if (isEnum && init) {
               actualParams -= 2;
             }
-            if (actualParams != descriptor.params.size()) {
+            if (actualParams != descriptor.parameterTypes.size()) {
               String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
               DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
               descriptor = null;
@@ -669,14 +669,14 @@ public class ClassWriter {
       if (!clinit && !dinit) {
         boolean thisVar = !mt.hasModifier(CodeConstants.ACC_STATIC);
 
-        if (descriptor != null && !descriptor.fparameters.isEmpty()) {
-          appendTypeParameters(buffer, descriptor.fparameters, descriptor.fbounds);
+        if (descriptor != null && !descriptor.typeParameters.isEmpty()) {
+          appendTypeParameters(buffer, descriptor.typeParameters, descriptor.typeParameterBounds);
           buffer.append(' ');
         }
 
         if (!init) {
           if (descriptor != null) {
-            buffer.append(GenericMain.getGenericCastTypeName(descriptor.ret));
+            buffer.append(GenericMain.getGenericCastTypeName(descriptor.returnType));
           }
           else {
             buffer.append(ExprProcessor.getCastTypeName(md.ret));
@@ -700,7 +700,7 @@ public class ClassWriter {
         int index = isEnum && init ? 3 : thisVar ? 1 : 0;
         boolean hasDescriptor = descriptor != null;
         int start = isEnum && init && !hasDescriptor ? 2 : 0;
-        int params = hasDescriptor ? descriptor.params.size() : md.params.length;
+        int params = hasDescriptor ? descriptor.parameterTypes.size() : md.params.length;
         for (int i = start; i < params; i++) {
           if (hasDescriptor || mask == null || mask.get(i) == null) {
             if (!firstParameter) {
@@ -713,45 +713,33 @@ public class ClassWriter {
               buffer.append("final ");
             }
 
-            if (descriptor != null) {
-              GenericType parameterType = descriptor.params.get(i);
+            String typeName;
+            boolean isVarArg = i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS);
 
-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+            if (descriptor != null) {
+              GenericType parameterType = descriptor.parameterTypes.get(i);
+              isVarArg &= parameterType.arrayDim > 0;
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
-
-              String typeName = GenericMain.getGenericCastTypeName(parameterType);
-              if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
-                  DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
-                typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
-              }
-
-              buffer.append(typeName);
-
-              if (isVarArg) {
-                buffer.append("...");
-              }
+              typeName = GenericMain.getGenericCastTypeName(parameterType);
             }
             else {
               VarType parameterType = md.params[i];
-
-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+              isVarArg &= parameterType.arrayDim > 0;
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
+              typeName = ExprProcessor.getCastTypeName(parameterType);
+            }
 
-              String typeName = ExprProcessor.getCastTypeName(parameterType);
-              if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
-                  DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
-                typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
-              }
-
-              buffer.append(typeName);
-
-              if (isVarArg) {
-                buffer.append("...");
-              }
+            if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
+                DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
+              typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
+            }
+            buffer.append(typeName);
+            if (isVarArg) {
+              buffer.append("...");
             }
 
             buffer.append(' ');
@@ -768,7 +756,7 @@ public class ClassWriter {
         buffer.append(')');
 
         StructExceptionsAttribute attr = (StructExceptionsAttribute)mt.getAttribute("Exceptions");
-        if ((descriptor != null && !descriptor.exceptions.isEmpty()) || attr != null) {
+        if ((descriptor != null && !descriptor.exceptionTypes.isEmpty()) || attr != null) {
           throwsExceptions = true;
           buffer.append(" throws ");
 
@@ -776,8 +764,8 @@ public class ClassWriter {
             if (i > 0) {
               buffer.append(", ");
             }
-            if (descriptor != null && !descriptor.exceptions.isEmpty()) {
-              GenericType type = descriptor.exceptions.get(i);
+            if (descriptor != null && !descriptor.exceptionTypes.isEmpty()) {
+              GenericType type = descriptor.exceptionTypes.get(i);
               buffer.append(GenericMain.getGenericCastTypeName(type));
             }
             else {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
index 9b85579..a651817 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
@@ -2,6 +2,9 @@
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 public class GenericFieldDescriptor {
+  public final GenericType type;
 
-  public GenericType type;
-}
+  public GenericFieldDescriptor(GenericType type) {
+    this.type = type;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index d531fe4..45ca557 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -49,9 +49,7 @@ public class GenericMain {
 
   public static GenericFieldDescriptor parseFieldSignature(String signature) {
     try {
-      GenericFieldDescriptor descriptor = new GenericFieldDescriptor();
-      descriptor.type = new GenericType(signature);
-      return descriptor;
+      return new GenericFieldDescriptor(new GenericType(signature));
     }
     catch (RuntimeException e) {
       DecompilerContext.getLogger().writeMessage("Invalid signature: " + signature, IFernflowerLogger.Severity.WARN);
@@ -62,33 +60,34 @@ public class GenericMain {
   public static GenericMethodDescriptor parseMethodSignature(String signature) {
     String original = signature;
     try {
-      GenericMethodDescriptor descriptor = new GenericMethodDescriptor();
-
-      signature = parseFormalParameters(signature, descriptor.fparameters, descriptor.fbounds);
+      List<String> typeParameters = new ArrayList<>();
+      List<List<GenericType>> typeParameterBounds = new ArrayList<>();
+      signature = parseFormalParameters(signature, typeParameters, typeParameterBounds);
 
       int to = signature.indexOf(")");
-      String pars = signature.substring(1, to);
+      String parameters = signature.substring(1, to);
       signature = signature.substring(to + 1);
 
-      while (pars.length() > 0) {
-        String par = GenericType.getNextType(pars);
-        descriptor.params.add(new GenericType(par));
-        pars = pars.substring(par.length());
+      List<GenericType> parameterTypes = new ArrayList<>();
+      while (parameters.length() > 0) {
+        String par = GenericType.getNextType(parameters);
+        parameterTypes.add(new GenericType(par));
+        parameters = parameters.substring(par.length());
       }
 
-      String par = GenericType.getNextType(signature);
-      descriptor.ret = new GenericType(par);
-      signature = signature.substring(par.length());
+      String ret = GenericType.getNextType(signature);
+      GenericType returnType = new GenericType(ret);
+      signature = signature.substring(ret.length());
 
+      List<GenericType> exceptionTypes = new ArrayList<>();
       if (signature.length() > 0) {
         String[] exceptions = signature.split("\\^");
-
         for (int i = 1; i < exceptions.length; i++) {
-          descriptor.exceptions.add(new GenericType(exceptions[i]));
+          exceptionTypes.add(new GenericType(exceptions[i]));
         }
       }
 
-      return descriptor;
+      return new GenericMethodDescriptor(typeParameters, typeParameterBounds, parameterTypes, returnType, exceptionTypes);
     }
     catch (RuntimeException e) {
       DecompilerContext.getLogger().writeMessage("Invalid signature: " + original, IFernflowerLogger.Severity.WARN);
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
index 7fce57a..eb80491 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
@@ -1,18 +1,29 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class GenericMethodDescriptor {
+  public final List<String> typeParameters;
+  public final List<List<GenericType>> typeParameterBounds;
+  public final List<GenericType> parameterTypes;
+  public final GenericType returnType;
+  public final List<GenericType> exceptionTypes;
 
-  public final List<String> fparameters = new ArrayList<>();
+  public GenericMethodDescriptor(List<String> typeParameters,
+                                 List<List<GenericType>> typeParameterBounds,
+                                 List<GenericType> parameterTypes,
+                                 GenericType returnType,
+                                 List<GenericType> exceptionTypes) {
+    this.typeParameters = substitute(typeParameters);
+    this.typeParameterBounds = substitute(typeParameterBounds);
+    this.parameterTypes = substitute(parameterTypes);
+    this.returnType = returnType;
+    this.exceptionTypes = substitute(exceptionTypes);
+  }
 
-  public final List<List<GenericType>> fbounds = new ArrayList<>();
-
-  public final List<GenericType> params = new ArrayList<>();
-
-  public GenericType ret;
-
-  public final List<GenericType> exceptions = new ArrayList<>();
-}
+  private static <T> List<T> substitute(List<T> list) {
+    return list.isEmpty() ? Collections.emptyList() : list;
+  }
+}
\ No newline at end of file

From af2d8b4d1c4fd32e7d4cec2d63d6ab445a8f7296 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 7 Dec 2017 15:13:06 +0100
Subject: [PATCH 171/252] [java decompiler] fixes constructor parameters naming

---
 .../java/decompiler/main/ClassWriter.java     |  14 +-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/PrivateClasses$1$1.class | Bin 0 -> 832 bytes
 .../PrivateClasses$1$1CapturingLocalR1.class  | Bin 0 -> 959 bytes
 ...rivateClasses$1$1NonCapturingLocalR1.class | Bin 0 -> 721 bytes
 testData/classes/pkg/PrivateClasses$1$2.class | Bin 0 -> 905 bytes
 testData/classes/pkg/PrivateClasses$1.class   | Bin 0 -> 1441 bytes
 .../PrivateClasses$1CapturingLocalM1.class    | Bin 0 -> 879 bytes
 .../PrivateClasses$1CapturingLocalM2.class    | Bin 0 -> 964 bytes
 .../PrivateClasses$1NonCapturingLocalM1.class | Bin 0 -> 617 bytes
 .../PrivateClasses$1NonCapturingLocalM2.class | Bin 0 -> 726 bytes
 testData/classes/pkg/PrivateClasses$2$1.class | Bin 0 -> 832 bytes
 .../PrivateClasses$2$1CapturingLocalR1.class  | Bin 0 -> 959 bytes
 ...rivateClasses$2$1NonCapturingLocalR2.class | Bin 0 -> 721 bytes
 testData/classes/pkg/PrivateClasses$2$2.class | Bin 0 -> 905 bytes
 testData/classes/pkg/PrivateClasses$2.class   | Bin 0 -> 1532 bytes
 testData/classes/pkg/PrivateClasses$3.class   | Bin 0 -> 722 bytes
 testData/classes/pkg/PrivateClasses$4.class   | Bin 0 -> 777 bytes
 testData/classes/pkg/PrivateClasses$5.class   | Bin 0 -> 813 bytes
 testData/classes/pkg/PrivateClasses$6.class   | Bin 0 -> 886 bytes
 .../classes/pkg/PrivateClasses$Callable.class | Bin 0 -> 305 bytes
 testData/classes/pkg/PrivateClasses.class     | Bin 0 -> 2058 bytes
 testData/classes/pkg/PrivateClasses.java      | 205 ++++++++
 testData/results/PrivateClasses.dec           | 473 ++++++++++++++++++
 testData/results/TestInnerSignature.dec       |   2 +-
 25 files changed, 685 insertions(+), 10 deletions(-)
 create mode 100644 testData/classes/pkg/PrivateClasses$1$1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1$1CapturingLocalR1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1$1NonCapturingLocalR1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1$2.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1CapturingLocalM1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1CapturingLocalM2.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1NonCapturingLocalM1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$1NonCapturingLocalM2.class
 create mode 100644 testData/classes/pkg/PrivateClasses$2$1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$2$1CapturingLocalR1.class
 create mode 100644 testData/classes/pkg/PrivateClasses$2$1NonCapturingLocalR2.class
 create mode 100644 testData/classes/pkg/PrivateClasses$2$2.class
 create mode 100644 testData/classes/pkg/PrivateClasses$2.class
 create mode 100644 testData/classes/pkg/PrivateClasses$3.class
 create mode 100644 testData/classes/pkg/PrivateClasses$4.class
 create mode 100644 testData/classes/pkg/PrivateClasses$5.class
 create mode 100644 testData/classes/pkg/PrivateClasses$6.class
 create mode 100644 testData/classes/pkg/PrivateClasses$Callable.class
 create mode 100644 testData/classes/pkg/PrivateClasses.class
 create mode 100644 testData/classes/pkg/PrivateClasses.java
 create mode 100644 testData/results/PrivateClasses.dec

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 50bd994..105506a 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -696,14 +696,11 @@ public class ClassWriter {
           }
         }
 
-        boolean firstParameter = true;
         int index = isEnum && init ? 3 : thisVar ? 1 : 0;
-        boolean hasDescriptor = descriptor != null;
-        int start = isEnum && init && !hasDescriptor ? 2 : 0;
-        int params = hasDescriptor ? descriptor.parameterTypes.size() : md.params.length;
-        for (int i = start; i < params; i++) {
-          if (hasDescriptor || mask == null || mask.get(i) == null) {
-            if (!firstParameter) {
+        int start = isEnum && init ? 2 : 0;
+        for (int i = start; i < md.params.length; i++) {
+          if (mask == null || mask.get(i) == null) {
+            if (paramCount > 0) {
               buffer.append(", ");
             }
 
@@ -717,7 +714,7 @@ public class ClassWriter {
             boolean isVarArg = i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS);
 
             if (descriptor != null) {
-              GenericType parameterType = descriptor.parameterTypes.get(i);
+              GenericType parameterType = descriptor.parameterTypes.get(paramCount);
               isVarArg &= parameterType.arrayDim > 0;
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
@@ -746,7 +743,6 @@ public class ClassWriter {
             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
 
-            firstParameter = false;
             paramCount++;
           }
 
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 8ab660f..9c971c3 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -113,6 +113,7 @@ public class SingleClassesTest {
 
   @Test public void testGroovyClass() { doTest("pkg/TestGroovyClass"); }
   @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
+  @Test public void testPrivateClasses() { doTest("pkg/PrivateClasses"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/PrivateClasses$1$1.class b/testData/classes/pkg/PrivateClasses$1$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..d411e5b0cc6fc871710f25a32fc52d8193401c4e
GIT binary patch
literal 832
zcmZuvU2oGs5S&Y#I&lp(X&d?hv_OC~Ktm<oT17$;NJs%HrRw`7J*8L78QD&M7d${E
z9{2(LsERq;Ra3Am@9wR4W@q>O=knKY0I%_^0SEUy)NtQp^uWcIi)|N=1Qya$owQ%M
zcr4(*H%7&SP$r2=1X{zdpQpXUSf9&O71{RQJ~0Q{=(I1e-YGBHITmmR(TNgR8fv3H
z&c2LQd?d#qGtFT%k>Rn7wLKR}$I1{`E9J|YIs}CRE1jL;nLL-hP?~9Pl*ZajDd}eV
z)A&qHQl=XtJvB0&#q3)jkRX>Zn4>6a%Nkz+4(7^>j(w7Qqi7aS)H`jbTE4lbU8|AP
zzcrIEN~rOJN>8H`A8kDG;llH=Xrm^Ux#+SzxAz2s>q&E&E}jZ(mXu#f<t9qLlBycd
z3~k3=P4oW}Z1caUfp-fL1Xdt_oGRZ%_{`p7)JKI6;B}w>faqSJ@|~v&ZqpJ)+r<)X
zE3ZO;J3O&IV-u|4um#r(dW)!tZ`RInyv#UkPn*v;f;U926v$qItaX2)`Y$*akb`T5
k00*lX)m^M*ejOY14(ixMgV6@ZtkZ+m$-EusAzBOGU%&aQu>b%7

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1$1CapturingLocalR1.class b/testData/classes/pkg/PrivateClasses$1$1CapturingLocalR1.class
new file mode 100644
index 0000000000000000000000000000000000000000..1a6052135c1d8418178c111f43caa5ebb21035b5
GIT binary patch
literal 959
zcmZuvYi|-!5Iq-`XV(@fwmuNiV!LchDO&xY#t#xrN$?RdP4wFZZs@J+F4<l9U783@
zY~l~_M;T|f7-JWbow+l6=AJW${q_6DPXLE_oWlz4bJ)(q#15aV4C;BLu*1R5VwdwC
zheihb88iiirl%v2no6e@2o$@gaw?mSbVtoz=xcZMR3IIm=%99x!GVC;ab4xN9T^0Q
z@EhIn=TY;WuctCpi*BvOGtacE!{-8f)^bQE&Qw1ZFxuWw39NOstKLk$^p*cX_8saJ
zyWT)L$I{naFPa7`6DYLhIGnKB2=u-su$;Blx{M^Lxt<=mlIDrUusW<F8+sSp3zV#S
zT&Y05=S}>9dZk(0`u_&(vxl_9OLyRS0jYYe!V_<3qJ;-0uA*dO4Fwa|xV(Z@fz8XV
zznExesC*L-aY+Br6FxjLaR*g_?PZq7HzQmA-TJnFss<r#vusu%=}%mW7Vn;x<FRsw
z0u3v^c-)JHQu47(-o+;VzDAWkNRvL*B#OK<P$;kqQ6@|1O#*@}*`T~h)hEgZ<&wQS
zgRmPjB<wRJ?eYx9w+MZm;ws$-+@@T?I@xoBs%q3L;U>yd(G6@l-OVRvP7t2iD%2xG
zDKg&?br@4QN9yAl()M>G=ExMY6zFWsk((p`HJW7RbcEiD7|n~x1!EF-Bh)=?Q8sAb
R8fgRN1U>xAk{7@&;18ez&cFZw

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1$1NonCapturingLocalR1.class b/testData/classes/pkg/PrivateClasses$1$1NonCapturingLocalR1.class
new file mode 100644
index 0000000000000000000000000000000000000000..fda112fc06e9db73abb4a488fa1bdfc263516240
GIT binary patch
literal 721
zcmZuu+fKqj5IsYy2v(^D@vdli05l?rZyH~SCMI}^7v2}xK(%g7Tl_9fG$uay0e+Nm
zwvZTOUv_5Bo|$uY=j;396Tm*UGBB~6#ROJ#wwlIT8tViK2~O)yJc+s|RKI>51+MBJ
z5GJF68<zLd*dSP^O39$<i7=GRFSZ`<`}NDfeG-uzqveL~Idqj99TB!G$&~*>)i%Lw
z`aMa=wOl37hYuYY+=!0Hh|}`B!fT7b)%6%OwJ}2e+*eKU7!9@Gn0M7+;Y8hXBZ16*
zry_s!UP7T#{cnztz4nJeSDv`qPX6zcclEEa?PJyT{E%Io$!OsBER?WmVG7e0ES*gv
zO{gY)S)wn3{kx8f&YkQ=Y%i&uU<5<OXQkR^QInSoq~K^pz_zuA7~u_K283CzZkb_l
z%+<EvK(%+IYCCT*USeX7&)N9eMh0`7JFpomjanGVbH&Z^Xo@o}mg3<B%#S7N9QEBq
s?G?r|Cn;_KyV77W9%zjS<ADaFnzevMjwVYlA<LP=ScW55&WvmP0Dl;m2><{9

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1$2.class b/testData/classes/pkg/PrivateClasses$1$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..fce570397bad637f30874ca16810a05753fd5686
GIT binary patch
literal 905
zcmZuv+iuf96r6ROxN%Km(h_>%QoumsAVR9XQB|rekdVSf3hMhNwNe*jBiqS$QK<!q
z2R?w0Ld-g@NE^%Yp53!EbI#80pTEC;1K3Bmjw&9iVb??rk4(-U8+c;CG4M>FI+LN3
z3N#02awdDBj3&KdmITq{wLmR94N~Wof#(9&yD0J#FO+HO6W<zq`!eZ$N`jfp{37f0
z73Uy`g6vSB+b)MJ7wQ}f=w5u{3p55n<bRlc9r?*;ISQF+4&t#4k7W|5b&=FnV*;C{
z6`Vb`p_3E}Y_vPe^=_s=j?VmXMpAtkOd^?06V_evC@^oqTaYNQWreQ@2Mh4R%0r5q
z!+4sE{kMTS)%tbkUMll>`Zv)yj8mHb-p@|s6ANv0ESR`uVFh&yYifB1E&5+(zq2P`
z|G&q1uLfL!of7y}zqF%dw=YmhrV+=sx}WAU1iO4oH3%5cY+E%5FtS^|ybAv{G`MSX
z=0VFd4Yzv<;l8+p=Ke(GoLd@hb5t@wA5D%e=0NH?HW<}RNeX^Ec_G-#*Fe?1fcBlB
zMVb9v#v+7(xr}{8^4%r!59l|^^B%5|p<^>Iv5lQP-ot%H9jkZ%i?eMWZj})<p_)g~
Kl&9FLng0NL7rsdV

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1.class b/testData/classes/pkg/PrivateClasses$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..91b07523db22c6319034da864572d70db7805917
GIT binary patch
literal 1441
zcmaJ>TT|0O6#lj;NlAm$f*>Mz<I;vpNkIicR4Qn-R0kZekD<+!U`#q`%8WnDmonNJ
z$7kRDJC0|Qg4zT#vuF2QzO&!%IoTh-zJ3F+g0hTj$R)5OL6adM&&9HY6&WJ#b3w`j
z8U1)DVO2&Fc?oMW29Qf)8jmEbb7g~zWf>_vmar+|iG-&NO3}6rw_xebrqN_b74(MJ
za!tEla;mzur!fqb9Xo6lH%!~~HW`FW_JAQ?aB2p_V9B(Na_i%f;l9(4EV88iJO{dK
za=mMed&eeiHd1PQsOR3g=Be%(T?$j$I^}d*HUp!Obm>Gt)pM3^*K_+G=SA*VRg>_H
zAyLpRE7)ctD%H8$hvfNw{7e^IJ~htyX#YcRgeh!NMtR?9xm9Dw<fk0^_YjMmG~LFw
zUA3Ghk=`}DW2YuzOTi6{Gk_r*b@nMO;<7oWpx`;S8D^qUz4hUc9XfDyH21!^%uDw)
z+I#0)Ez_zQu7Z~+Qjhey6}-Z01tsh<3`cGG59ZC$iBa{aw13j<wQM`6<9G!8yo>}1
zdl}|3QPtDd!)4=*n(&;UkBDj}8;)U^za(EV9Ly7rT@vp971VB4??%D-se?ql(J<^9
z!$Kw^b;#5$0tZ@#UH6Xtf3Juo4Ac8S<)p_VMuQrRw41cb(M-LDKJ^Ujv+tfDDf-3)
zCTXn%0l0<Rq%qvN0RKcE;$*9&W2Fv+iaK|OcpH6(9f%b*#Z{?|1gZTM$}jJBko1F;
zat8yIGhCVff<cDwNVRcw;jeWY={ANAIUxa@&?F?1Nz!KNb;=MKm86C|R`DKdK2bFw
z(<Lh40C#bZ2=llp!o?_hmb6*QlBH}TWC?ugg-<1)fI0HUFpmYA<5(m)N+VC#GE6g&
YASS`r-<?I8uhS4{jM11T)Ql+q1{zaV7ytkO

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1CapturingLocalM1.class b/testData/classes/pkg/PrivateClasses$1CapturingLocalM1.class
new file mode 100644
index 0000000000000000000000000000000000000000..d5d27c6755cdfd7ccce9d9a0428161d85c3e766c
GIT binary patch
literal 879
zcma)4U2hUW6g|UkS=g=xX-n1C`cbS4w#BMXYJ8ArBvLiOH1TnO37xv#CCkFQ`rzNu
z#L`3)e}F&AcxFptESmT*_nx^QbM8HvA3wi-2XGH}^Kfz9#XL3)syMje!p4R%n>pMx
z-Z!S|pyuF~fY3Zmfw{2^Dno%%>rjqmJ&<9)-cDj2_8$mjAL>vij|9qob2eYy7qA;q
zPYD!SI#e%4M;#TvmYsl+QY-4pU|+`C+^0c1Ind-PHsl}~8IH7QZ&$!;hM|fZfgBDM
zD>hq$xBdF7SdV3*rqRmo*)~p?Z|i<2`4}l}ziCFwCDG{u0!w~%c5DH+9gX6ydaBK!
zi+{507#X<Gldu~^Lyowol7pz{V9Uccc04Sg;Gu}R2M^~2R?f=yc%*}#iap#0_Y(IF
zxZ`0JYXX)3*^2u7e)DDLP<0c^Iom0aIU>WdKf9ul!SapG%E3T|J%R1NmCbZcho`V>
z6!V{HT;(U5=g-TaWMlw}MI%fa;ruwCW`O7P7NdpQ)-gow1ex0EF|5yN;Ueuqntq2o
z-V=Yo5@TgHu?5SxKyQ$t5V%O3!6hP!Nn7Im86$#z{Tu8zCzz{!ftVm$a%hOH333zU
mKc$_9FPm0>OnJQ1&MA+D%W2g*uF%_D@fuc$TvoaCW#AVQSiqwI

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1CapturingLocalM2.class b/testData/classes/pkg/PrivateClasses$1CapturingLocalM2.class
new file mode 100644
index 0000000000000000000000000000000000000000..cdd4c714ff84459e512d48b74e3b22dfa3b49446
GIT binary patch
literal 964
zcmZ`%+iuf95IyTS*P1q@DdiGMfzUcGY1(p=0P#RXMWhsvf-1q=CRwFhTsyLzd{>J|
zDuKiY@KJ~vHxi-_51unSJC`$O{p<Jlp8y`?Ssn{`z-FTW3!CiOS=0(hW0Q@O!xrO1
zHuWsFvuFqiO<zkOJ(g}Y6ezWi<ybac=?xm4DA3;Eg+L}c(qVN+pxhpQ88kiwdMqQ=
zbY&Q-kndk=Pe-o=9D80uE7`MlC}1}Iz7kk!Yfrr!ope?3QFdL5l-hnzx`#5*e4YhO
z<{(gP%3(BOUUAaFo`BWzJQd8?2yD!uP~E*;My&H4J@6zoqmicFVoJHlzgU`9wQEV*
z0)>u03VLc^GtuRLmDpzKXrVV=&-Fv1c%Y&qzn{g9g<b4fxQdd6B@`_z<B^3cSQJ>j
ztoQ4YcKa%@=uMx{+dOCIsf9J%5vV5RPp(EH{q6a_d#rj9X_~AQFiuFm6+5{nYmu_q
zX5?_FyuLtvURt7ZMxNBIkfQ&+#yb6-7X7y=lvoC!SY%;hB$epK0O^Y|;R>BT6Pko&
zXKMoC)F&{UbEKTg1m;<seU0oQ^#e``&#3k*R_U}J$I7^lTXdoh{0h{YJ)Uf!LcW39
z6eEqv^1Qbc;heP}NPjv<#`y+gifk!IhJ161{1k=LxRNJl;_PWW(YmOdO-vC3?td5e
S2u<8a6*tK%P}TzB4d4%oH`T=e

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM1.class b/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM1.class
new file mode 100644
index 0000000000000000000000000000000000000000..3e723c1caaa618f5e0525f41e5ce34f59b40b413
GIT binary patch
literal 617
zcma)3O-lk%6g_Vo9i1k%%)W~jL2A$tv@6<3L0}(XxPRJ1$HtkMdAjIV6%;{>en3Ae
zI-^2_E!w>M@y@yT+<QO2-ah~wVcUj@l^jx7wXkMkT|mSFi;cb<N!OP_*KO*^3%bVw
znG-MY^r=9(GW%U^37GZpP6-qmUZAdqgSLupW!q<Fu@QEp-;$A+#M7jydmdYruEL-$
zAM`NkGR9pV3OE-*prX1j<5&??Z9Lp}-J8f8Nv)>Y-NQeal$q7xM6$qAr8=urz;1@a
zsH4ukL|f^1)q`Yk&TtlV{4l1ZOQn0^orMhto5(t_u;n0)jKJPMH3<}dwt3y|tB&SM
zX2}A^fTO1>)fRSm5tA1pFlk25pl>0|H^=Clu|aFs-XLoGuP~m+7@KdNTtJgQBzA;3
zM#~d4926LlH?GQKqlkrRO_x^iFI{_q@kGZU3~ZhxAID{!31C_#MR5tLge6)NWwy!F
Kvx!P1%md$u(1RBM

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM2.class b/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM2.class
new file mode 100644
index 0000000000000000000000000000000000000000..9d4041f6bafdd8606748e556675e57c6ab8c27e4
GIT binary patch
literal 726
zcmZvZ+e*Vg5QhIv(xcJF*7NxUwpFZ(cZxSfL1<M_d%ta$HZ>+CN&7<Tg?9>y;Drz1
zLy5C%K_m@qW_EVw-*0BWzCS(z9AG^K19NG_FfYA@1QrumVqgJ7w$kB!UUInGDqV%X
z?Y0gX;$hnkHg*{%D&5;w>C(6RJQQVz2Z0FW`H}6~;W0xYKP(|CS*S4>Wv?k1G8Nku
z=e@hS@UMB@p-8skHMmpbzAg8Ipdk?$a_62~=H0L-$y8o-pTRtHUEvRSh++uD#@>)h
zLQjU?Z=2Lyz7Qp4NMCt9zadU-$(H-y`;HtI^>E@g94{cGstDU&Gl69jD_Av=M9M@O
zYbN4IFl<K0Hx!J)`g?|pdPg)unoG2pLA#^=C-YHoIbuCus1b)jFAZqON(jKRB$kR$
zcNhT;kajnep_9!Nx8A^t@6d|dZ_r;<;wb&c)bTx)K9K)N3nZ>ekRfsTWt22ip1e#W
z@f;=wSCq)gvsm#J`ZGBiq;OmXpOm2an=la6F{!eqFiqCL3}!J-UYfEDvKH_Ihx?xu

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$2$1.class b/testData/classes/pkg/PrivateClasses$2$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..8caf4acd08a076f2f71ccfb8b2b60cab9ca853f3
GIT binary patch
literal 832
zcmZuv+iuf95IvhXb>bT8rX}>krGSAnAfi;fQAI)#NJ!x#1@#eWldjTj%^KNGzY87!
zi3dJ_k3yWaU6F!qd1iM!=ggVe{q_6DPXJHxumuM<JT!3A<LZ`++b;H8+!a{KPIMX$
zT-+1zUm2s4Q6$q;r2?Jtr?YwgU82urrpjn|@Qj#4ZFDvi*zQ)R>>mj@qxe_}tc|r%
zZx$b?DtRxb5hLw!Jd@FpOtjsXLC4Av*sA0U2Q2Ck6bWp0_s6I5T=pYr=KV>QXfx;E
z%i*`vQ#H#NZcX&u$ZV0YZgWI}Lc(Z?qRg!-d;vIIN-rx8N$ySJMKV(_we4!-@|>Pn
zjqLt~nMH9*jjvU95+C~rao>jv&&R4=wXwlLSIs#b2n2sSEo8cQAh27Jej$~UsQ7yz
zP)`<ywrh{3{eKGfcrO~@*+K+?708QI=eG)<(JNdHQR54Ey+>amdf!p|!d(qlX^Eo!
zfHm4qk%a*3+%Z3A6U<<<CD&tmi>Qgu)-G|#oWs_%@th-gPUL2Z?3c(!?;Gm>f(ro!
nxKRpla4o00j;-8pV~5^B6T4_}wZk@>^!9NI$9C?Zv*P^$Bs;82

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$2$1CapturingLocalR1.class b/testData/classes/pkg/PrivateClasses$2$1CapturingLocalR1.class
new file mode 100644
index 0000000000000000000000000000000000000000..c347c665da31bc7e588f883232001b2cfbde376c
GIT binary patch
literal 959
zcmZuvYi|-!5IuKUo?Tm{*!sYVitVy3MQZhf8b3%hlHjYD8vS;G8+z-yOO}P-rHRl)
z6Muj|$~d!Nj9oU_IWu!-?wmQhzkYxJ3E&V9vRJ_#HrqK^*kR93qnbk!J8YZ`b{Y5B
z)Y8~bqb?vcy)A*{M7oucK%spqC$jEJZ&2@qf%XQE1XAIN9#tA?+!e4|o~MGQD@P+m
z^&9Qsr$PNqpeHg^i)`h9dmd{~hff6d?Byk`_@wHwfZ6o>N?@(6J@sn*xvPSAvg=Z&
z(Dr-MJ(hvyc#$-jnLxfNhvAsnMny*rf#p*xjq{a6HQUhxPf|ZkG3^$!$b|lUdx4@|
zjWZR<b^LMAQ_nSXTmN5xeb$h6c;@w7e?+Was_?|`TWH|G!bKD<tRZjV5{DPCDzJH8
z^`~R)_Eliv9uDaXJ!I#;g&QafY%h~Mz8T5#@7CAdQ`HM;n`ONMiD2xJwR!iH91fM&
z7pU3s#p7Bmn39eq(k|BV_ZVgRAuak<6DaV`Kt9hZL`ag*i2*^9Y!Gfz^pVgcEIPYW
z2&XoM;hZ7il%_DhM%9<euF`$LTf!r(qk}6Hm7`n{S5cyfZeYpjZuWSxf$QWO*rFT>
zN|xunpbXb+{Xp`=8B)$S7&D{`88YOXGh}DTeTh1Gaw@8RA5FC8or{SH+>EMj;WnX3
R`&Nh>2n~AY&kDgc;14P(&yD~9

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$2$1NonCapturingLocalR2.class b/testData/classes/pkg/PrivateClasses$2$1NonCapturingLocalR2.class
new file mode 100644
index 0000000000000000000000000000000000000000..f14b68136e42a3cc0386a61649f919f6e5a89015
GIT binary patch
literal 721
zcmZuu+fKqj5IsYy2v)(Oc)x}RE=D5pP2&q<qQOhN@V?*%t95JI!gpyRG4a6<@S}{g
zg~S-!q&u@`&&)Zy^Y#7l31AOfDVSJFV+_kWTS;Oyi8TTR1iSel`l9Lz)vaEKzN5PP
zgz@m+2@1POtP`vgrKDeXMG#2l=bO)u-Rh<9^hGE~XrZQS4jko#hlENop7LL))FPO5
z?@kgjO-IS|-cwupH=^w_VmG~xa9hH6^nL`I+87~s?y0(X4tv^f#Jj4oaI9`&H-^l9
zCqi#{U&3s$^xqsIeeL!9jy!g>o!s9m@90-!+YQxmy?|Yu$?)F0v#^0p3lo^MVCife
zNkS>^$zpvGvcKcFXg|nK$oAsO35MTOycSC>7BzXeKmxW_1hQG}Awqb9m;zy%cel(i
zIA+R~0jT_rM0tAv<252?c%6=pkB~xx^J8Qg+ZdK$207kwanzckOp7JB`7Gu}5><}+
uY^?kS<Asw17l2)9@HA>@4GE)$2J#VW9t#{zmR>}fGn*?@9Q9}NZv#K|x0u=h

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$2$2.class b/testData/classes/pkg/PrivateClasses$2$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..2c594e0579ef154c06cc00e1452c25cdacd994a2
GIT binary patch
literal 905
zcmZuv+iuf95IyTSapRiCO-m>(mjVV72N6;6MpX$}AR&c|l&bGex=P#{8`)023nU5>
z4}1V0g*a=wB5iETJF~NA&YYR`pTEC;19*vk6Ls8I%f5*Q9+>nV8hB*DG4Mp7zVJgQ
z6=)C7{DnUV{b)KEWl0cCUkNm_S&%v}3_KOE-bIm2ywFcmNqlGc<$OB$lmrVulV#L7
zP&tP|6l6yN{cbg6wNURwK=<NPDbN}Qk^C_KJeJ9^KMomb595g+p7=?i_GM64!UT3I
zE95eCCWQjq-QH@w>*0^%Gdanqy*Ub|k)O>I)?M>RP)P8WC`xQq;md@>C3rc?Ba)k=
zc%Dq;+dy@-b#-#j)$rN<n`jcoDTn`FX0!OzLKi&?CT>_*L({^B+TKKm^RF7eb0A><
zzsEwW0aswJ0)DBN<ES_#RV|rET)XOi+N%)k^IvK}z<_4kN+3W>wfysH{5H_ysZGy=
zmPcA{{{q5&b^*=(iP|?FY1rhdXaI>e*A8P~>K3+Xm8U2LUv^#+4)Q%vcfUjXO3*UR
zET^#uA)uhKUo-jEO7air*OLnkSCXM)Coi#!z1-fxU0NOMxCe{gE}L7YRZqPz9Li(d
HZkYc7;E=xK

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$2.class b/testData/classes/pkg/PrivateClasses$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..b4dd294217c6c8812adae6288bba9a94b8581ec1
GIT binary patch
literal 1532
zcmaJ>ZBNrs6n^eD)=?^q0YgN59k>@@tfHXIp-j-}7zhSjG$v(hMzOR@*OB<M{NRW#
zF@E;Df5&)kJ5;t}lY4s4J#Wu>x%bDfuipSHVz(b-xGN%x#SrcZxGy4rB~F$FJP;w^
zAt%JFh!Bw#@JNJ&B>_1RgIF9u0;>WZbLI&r%OZxcCLk~1sep9`sbCnYmDiO<Lv1jG
z^Ge-rTAEQSniWOg$uNwROrz^mW(eAcS|hf=Fj}mCsHL|p?L@KFj-M5hXEj5!a}48g
zFNMS&Lm+QfRfeIWW~im+@quc+Rt|JJi8!(M6iefL=P<wnGDJPR#bgTTx0(jgIQPs*
zF;YBIPL#B+7`61S%`+k;UnL`8gCUexblnX$<>l~9?3hrt(esEt*3VF7{%4)-g^(kU
z;;z}WD(Z&Da~(Nfxp@wnYO-!rbhAOAH&y%4tO|H0VG>s*OktV<42j;V$K+VXqgUMK
zxr72<FwA&cb+tFcO<q#g-r8JRyhuvL8t*RrT2s@jswH6)B^t4Av4kybOL&DHnkKK1
z=WMnPj?{`x{r&4^r)d~&GbcUF&w5EFy;6ph*L>1M_4bZWR>(HpVIrvUM6V9R>;?V`
zy~^C-#0Bck1)&?LcL#Fwr!fjD^}1?Q8Rp_1u6vF;P2h&QYSipQ=du)VgI<^@4b(VT
zILv2^9v&a9DO{t|>$J-e&rif;>N8mK6uwW6&JChL(gCu#Ni^ze;TCQaNBWL8x{Zio
zy5s97`sncj$`OCDjX*h>Iz?X#!TmObax%=>Pz(LUie-v4u-S&>C|xSGF<3su(Cin4
z8NOq<g~;4L`xZu87~SX4{FD?3zCd)9xVH%79i{Rfaj1}?;|-1-$VnGW2eKb~n86)_
z8b^j!iV~8EpQW82bL5Su=*s5*$mU7rN1CKQERY?@r%d!REtv{5Mt}ZE?vKjiejMEd
PEnbc*v=XG942r)2J*jP`

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$3.class b/testData/classes/pkg/PrivateClasses$3.class
new file mode 100644
index 0000000000000000000000000000000000000000..0058420556d70579d4499465bf3398ffa5144e20
GIT binary patch
literal 722
zcmZuu%TB^T6g^W4m0A^f`F<rXz!=f!PGVw+CMNhuFzg4I)WOo4w)hz){)uihap4E}
zQN}y81XLC?ckY>U?mc(r>-*yqz!A1g=vXq5z_NiA1FHts7*bW~%J76CQ7ShX^qSWZ
z40CnqimQIFCH!07atO)Ry*786+?OhkK|Q>a0fTkny27tHJO~7(#rng&UAgh)BM(K4
zZXX^~ajM`j<V)pxmp}4~!(F@52z}|=bo(2=ZgoXFBskrWw#&o5PbQ{nR3P$G8!HiW
zC$$|4s$=xH;|Ucv8(!aUi*u<)%>A~!r##YAoVjhs3&`W82=Ba(fprTT*tC#>VPO_?
zWPQ@W44KiCkwu1;3Cy8KdgTAN3|jAip-}oiK)H#1`b`}SN&4XgEwV(}6rCy*8O7wz
zJJ>57G^7Uv1wO%~-HHg9#tdaljY7K;?^0AejlHOSO!+*f)FNf(l$4oRIcoa`?XP%J
hTOIR*7CGbxv4A2)9Sc|_gFu$rtI0sdl7wbc<`1IcmA3!@

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$4.class b/testData/classes/pkg/PrivateClasses$4.class
new file mode 100644
index 0000000000000000000000000000000000000000..f70861c9ddfdc655accad2a61b596cef12be94d5
GIT binary patch
literal 777
zcmZuv+fLg+6r6SJIB^Y_aBIu8B}hpskyhdjgj7YXR4FY;L3!VVRakIr<T&{gq<%&#
z(N^Mt59miB#)(l~k_Yd(_{^C(XZP>J-93N<>=j{R!-0iOhu)TrZ5ul_-UwJD>6Zrr
zrRJp^$+|CtUcD7ZI_Mn=<d1Zq<70u9%JlDQTfl6D=SpCqsRQ+G*zc(5Om=)`O3kn<
z{kDvB5~oQszR;v{zXXAb8onG16vNf#^;NHa8tIXYRhlgyklkblUtqaXohE;tKIvSl
zZcI?IrF(&lhY>{-8f-Ap)5x?)YiH3u0gf`|={Anp+-ZfwsH;BfWW=TaCGRKu<0?J{
zT|XRfe_vI65uV$4>tYv<3mXL&MU-7EqD1|(rWWx2UBg7D!1|2JC!yT*^j`s^|3M&E
zskZT+_ice!3E_E(20n-!zakuFUyPrJ0fW}5z54}G`vc=ABLgl^qIlk5j;A~J9n8aH
zB$6r84t3h3&Z^x){GgKsf6sue3E2Bc@X{3cH*(LxS>_bXd6vf%t5_S`mv}{M;x*Q>
RK(9o4lNOvc&+JOxc?4Vyp>6;G

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$5.class b/testData/classes/pkg/PrivateClasses$5.class
new file mode 100644
index 0000000000000000000000000000000000000000..70e8e636c93f2b3d9d1849a3e4c849016e49d35f
GIT binary patch
literal 813
zcmZuvT~FIU5S(+Im>9R10HH1Ype3LrRHUlPQ&FTUYNbl)hm<Psmv9OP#zwZo@1hSa
zQl%oE`=hGP#YTiCw!C|{yE8kt=RbdcT>*H5oic1Zc2UF=m#e1^o;lcb@LZsj9_gg^
zN?^5nb~0*xjrF-qRVR>1qLR1FALvl0ZGrXryn;qw!0tqcN?@t0L-l!lI#BU9IS3f3
zbfcjR`ZCsLp9gKzP{8{bhAPhc2vp~g*Y?@pCPP4V^+xwtp37Ds!%?f3#yT7^dpG=L
zaIA(Y!{weHg)$w-6tU1DL8hlOMUmIeYkLDYm@3aZwn^^xqH#P_AGA5*%H4tO8I2sp
z`*0XU2{nFF=}~m(;Dv`R)I2y?@KDCKhh<c#e|F}zeF6XWsF_ZIjX9M!LOJQ#tbld;
zT41d{dkS-Dg?gipP5ul;@RA{X-)Q6CQs7sH%jhCkZCHE(x4HWRqIn7HJ9id5TB2xw
z;~s4_tHOQw+_8SbCRo99=3Fo74Z;!^#!hiuPdL0Rn{oK>h+N5$tsGfw{zTz_a3&xF
k7jpqNRwpg0SfBU@ct~&K5jL>IRfX+sdh?VRT`Rf&0DK&(%K!iX

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$6.class b/testData/classes/pkg/PrivateClasses$6.class
new file mode 100644
index 0000000000000000000000000000000000000000..cfe976478dd97b73a0cc05960e486dd9920b480a
GIT binary patch
literal 886
zcmZuvZEMp|6n<`+HfxMFc3XX!FH@r?QLKpUi(?=`L8v;Y^!sfWy38z*B<=4~a0-6#
zlOXt`#OJ0Nc1v@~J?Ea6=RD`!`{(bEp8%f2Z=;FZYTGu^!X1;^T?6+FI0o(uH0LsQ
za)IvPNX}(HmdUg~EV3w>z7S{?hf(f471$Vj`Z(?HXVF|1VGzqa4|C<;jgqL?6Y$(s
z0d+`kB%lZBK`77}L`nE=c03NV4{{vS(jBA|8INQZsdHu26$Jt7O_GFJRav07qMWls
zMmiB<@^!s>@$=^Q<D+m=FsVI^rim<O8A+@K1X%D1mLRIwRb@{Tc9+7d3GNZx9Hz5u
z626X9i|c1c_(aW|qj;4};xy;X--g9udSKvzg@<r0n7CkJ4Q&e+JPRAxWE1tPaCQXj
z|M#~bE3ma9@{}#dUH1xT$Ik>d-FhqP<{GXy!ZsgJ3jzi-+g98FN)qLBYw)*lk={$x
z0%)bB<3Boq@E@N*^S`6<g)R*p?g|F@1)F=1Hqd$*>y%1Ukb;X%SAhNU3^e_(&^|M0
z8RmBhV=;sQ3mE$)lY6z~Z_v*tFF2e@hK?&`iEFrC$}QZW)NvEH(52R8`6i|M3|g<Y
F%zx}(y;}eP

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses$Callable.class b/testData/classes/pkg/PrivateClasses$Callable.class
new file mode 100644
index 0000000000000000000000000000000000000000..2851cf420b40fad9b1a1b1bbbf4f87c1ebce9b62
GIT binary patch
literal 305
zcmZWkI|{;35S)$qX#54Wv$cqgX{=Oi0)ikYm<v3^BSarjl9<C;cmNM2t{)IhwKKCj
zyR*0Z<qBX7$3opgi=c->DMHU3uJ)o3o)Ssqt#^AF=2Jp#8%K%A&#5FB?l1^gb7#S%
zJUcH-1bcftr=eWLiv8V98W$p$z7km`v(fXMg*KsoIz--YbKr9-v3uI8U)WeCiA+C!
qg7Y7k&?&Dn0fNR)bJYnI=*$gf8cb$yWTE;}YG`t`d4j{EVcHMMK}!(;

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses.class b/testData/classes/pkg/PrivateClasses.class
new file mode 100644
index 0000000000000000000000000000000000000000..e1e93a09c29e13af551874d8a4731b3fb4c1de1d
GIT binary patch
literal 2058
zcma)7ZBrXn6n<_3*|1rJ2AT?`6@l82lw#<c3Px>gZ8XppD46=Xgf(5<ZZaY1jK4w0
zZ+_Ds;W!OrGj{r+pVaXuIX-81L11^ZJ9A&ox#yhwJm;Q!_xHb_JOywWJ33}i((t~H
z7;X$;8aFk3praqRq$_LqP)8CUNk^fgBPHg`ItFn|!-|d}lu|f{+ZyhOa96srjx<&^
ztm(*LT{`;S(=mn(=_qXKn7|DUAL}@abq!S=lPJml_ceT?;ZqHtDI`m#<Ct5HrC^j@
z*J_m<b9dL;RTwUr&330{yY)(=W;)9Y3L`5GH>^EwSco*FHnz%cw6bG9GUpxBt<SG^
zTvzs9lr_drEZMHzE-J*cvl|M1rN%aK4OMK{TIoF8vRdmt(zJ(Y!))0i2g<(o1Dmi%
zE6uO#^LJYIBeQJ<WF-DW?tL<QX!EtUa9fm(6#dfSC3@B9btWR>%zoM=bdAt6M<IRF
z+=o^8FYl%BrbQ1dBPN$>PLK|Lt<h=KtedtR)5uY77bTqr=J7hYhpEpj$lB)yE@DpM
ze1t(Ee5eKSxn|%Ce5o)K<#VhGJO?uxz@=#QWrb7!R)T*R*E_beZM6(+p~eC{zHDF{
zmVvKOe_<vb`v)&Z!n3ub(O!vGUyW8X9Tz0s>2T_f(7L^~W7XOUr^9v!1;#XGBTC4t
z+hn`pCyp?(v*B7|S!T;&wRg98rJdt$J{}fe!fZAzcUxgD>c)g32InS@j^)<dOgL|F
zSz$I3ddS}+lZ&*CgwKa;nvW{@ppHwXIZI1{bL?Z|U4TM?vv(*fjwf<^P`MsrRZilM
z(f2czF)Xl`R~d-Ya0!<<Gkga=+*c?K;3}>K!Jg43PTgt`{Sqh9g|^v4vO1ijG|+`k
zDOKHrQR!h&EM8jfVTg+1{I58n@C@lLMlKwhcQM+<$xT5M_t1<Z!TGmD@g1psk170s
zJbuJo{N$mV^bz0<yh*z$5`7Dc#Fxi;;$I|}x2ex?^w)|9Yeni56SB|dFaCQZSsOiM
zs=53gPId7z35->9!y=A%ahl?U@Hj&rXFa1=Rsu$cS<L-EqbK~CF&KX1f9yFA=nve(
zpB|%}k0Qu7@p#-6?Ft^Z7_EJ7@dIxDnlSR$ip)w9?;afcG*{$H^)SiwzxoTNB*n^0
zae^ag9>aSaW4O-nz<vI8&#|grOUUoi|0aTQjANE9!#2w{$R-g|!I<QjW9w(jv-z8Y
IRVrWdA6I?bt^fc4

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/PrivateClasses.java b/testData/classes/pkg/PrivateClasses.java
new file mode 100644
index 0000000..6b181ab
--- /dev/null
+++ b/testData/classes/pkg/PrivateClasses.java
@@ -0,0 +1,205 @@
+package pkg;
+
+class PrivateClasses {
+  private interface Callable<T> {
+    T call();
+  }
+
+  private static final Runnable R1 = new Runnable() {
+    @Override
+    public void run() {
+      String s = "";
+
+      class NonCapturingLocalR1 {
+        private final String s;
+
+        public NonCapturingLocalR1(String s) {
+          this.s = s;
+        }
+
+        @Override
+        public String toString() {
+          return this.s;
+        }
+      }
+
+      class CapturingLocalR1 {
+        private final int i;
+
+        public CapturingLocalR1(int i) {
+          this.i = i;
+        }
+
+        @Override
+        public String toString() {
+          return s + ":" + i;
+        }
+      }
+
+      new NonCapturingLocalR1(s).toString();
+      new CapturingLocalR1(42).toString();
+
+      Callable<String> c1 = new Callable<String>() {
+        @Override
+        public String call() {
+          return null;
+        }
+      };
+
+      Callable<String> c2 = new Callable<String>() {
+        @Override
+        public String call() {
+          return s;
+        }
+      };
+
+      (c1.call() + c2.call()).length();
+    }
+  };
+
+  private final Runnable R2 = new Runnable() {
+    @Override
+    public void run() {
+      String s = "";
+
+      class NonCapturingLocalR2 {
+        private final String s;
+
+        public NonCapturingLocalR2(String s) {
+          this.s = s;
+        }
+
+        @Override
+        public String toString() {
+          return this.s;
+        }
+      }
+
+      class CapturingLocalR1 {
+        private final int i;
+
+        public CapturingLocalR1(int i) {
+          this.i = i;
+        }
+
+        @Override
+        public String toString() {
+          return s + ":" + i;
+        }
+      }
+
+      new NonCapturingLocalR2(s).toString();
+      new CapturingLocalR1(42).toString();
+
+      Callable<String> c1 = new Callable<String>() {
+        @Override
+        public String call() {
+          return null;
+        }
+      };
+
+      Callable<String> c2 = new Callable<String>() {
+        @Override
+        public String call() {
+          return s;
+        }
+      };
+
+      (c1.call() + c2.call()).length();
+    }
+  };
+
+  public static void m1(String s) {
+    class NonCapturingLocalM1 {
+      private final String s;
+
+      public NonCapturingLocalM1(String s) {
+        this.s = s;
+      }
+
+      @Override
+      public String toString() {
+        return this.s;
+      }
+    }
+
+    class CapturingLocalM1 {
+      private final int i;
+
+      public CapturingLocalM1(int i) {
+        this.i = i;
+      }
+
+      @Override
+      public String toString() {
+        return s + ":" + i;
+      }
+    }
+
+    new NonCapturingLocalM1(s).toString();
+    new CapturingLocalM1(42).toString();
+
+    Callable<String> c1 = new Callable<String>() {
+      @Override
+      public String call() {
+        return null;
+      }
+    };
+
+    Callable<String> c2 = new Callable<String>() {
+      @Override
+      public String call() {
+        return s;
+      }
+    };
+
+    (c1.call() + c2.call()).length();
+  }
+
+  public void m2(String s) {
+    class NonCapturingLocalM2 {
+      private final String s;
+
+      public NonCapturingLocalM2(String s) {
+        this.s = s;
+      }
+
+      @Override
+      public String toString() {
+        return this.s;
+      }
+    }
+
+    class CapturingLocalM2 {
+      private final int i;
+
+      public CapturingLocalM2(int i) {
+        this.i = i;
+      }
+
+      @Override
+      public String toString() {
+        return s + ":" + i;
+      }
+    }
+
+    new NonCapturingLocalM2(s).toString();
+    new CapturingLocalM2(42).toString();
+
+    Callable<String> c1 = new Callable<String>() {
+      @Override
+      public String call() {
+        return null;
+      }
+    };
+
+    Callable<String> c2 = new Callable<String>() {
+      @Override
+      public String call() {
+        return s;
+      }
+    };
+
+    (c1.call() + c2.call()).length();
+  }
+}
\ No newline at end of file
diff --git a/testData/results/PrivateClasses.dec b/testData/results/PrivateClasses.dec
new file mode 100644
index 0000000..aa812da
--- /dev/null
+++ b/testData/results/PrivateClasses.dec
@@ -0,0 +1,473 @@
+package pkg;
+
+class PrivateClasses {
+   private static final Runnable R1 = new Runnable() {
+      public void run() {
+         final String s = "";// 11
+
+         class NonCapturingLocalR1 {
+            private final String s;
+
+            public NonCapturingLocalR1(String s) {
+               this.s = s;// 17
+            }// 18
+
+            public String toString() {
+               return this.s;// 22
+            }
+         }
+
+         (new NonCapturingLocalR1(s)).toString();// 39
+
+         class CapturingLocalR1 {
+            private final int i;
+
+            public CapturingLocalR1(int i) {
+               this.i = i;// 30
+            }// 31
+
+            public String toString() {
+               return s + ":" + this.i;// 35
+            }
+         }
+
+         (new CapturingLocalR1(42)).toString();// 40
+         PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return null;// 45
+            }
+         };// 42
+         PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return s;// 52
+            }
+         };// 49
+         ((String)c1.call() + (String)c2.call()).length();// 56
+      }// 57
+   };
+   private final Runnable R2 = new Runnable() {
+      public void run() {
+         final String s = "";// 63
+
+         class NonCapturingLocalR2 {
+            private final String s;
+
+            public NonCapturingLocalR2(String s) {
+               this.s = s;// 69
+            }// 70
+
+            public String toString() {
+               return this.s;// 74
+            }
+         }
+
+         (new NonCapturingLocalR2(s)).toString();// 91
+
+         class CapturingLocalR1 {
+            private final int i;
+
+            public CapturingLocalR1(int i) {
+               this.i = i;// 82
+            }// 83
+
+            public String toString() {
+               return s + ":" + this.i;// 87
+            }
+         }
+
+         (new CapturingLocalR1(42)).toString();// 92
+         PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return null;// 97
+            }
+         };// 94
+         PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return s;// 104
+            }
+         };// 101
+         ((String)c1.call() + (String)c2.call()).length();// 108
+      }// 109
+   };
+
+   public static void m1(final String s) {
+      class NonCapturingLocalM1 {
+         private final String s;
+
+         public NonCapturingLocalM1(String s) {
+            this.s = s;// 117
+         }// 118
+
+         public String toString() {
+            return this.s;// 122
+         }
+      }
+
+      (new NonCapturingLocalM1(s)).toString();// 139
+
+      class CapturingLocalM1 {
+         private final int i;
+
+         public CapturingLocalM1(int i) {
+            this.i = i;// 130
+         }// 131
+
+         public String toString() {
+            return s + ":" + this.i;// 135
+         }
+      }
+
+      (new CapturingLocalM1(42)).toString();// 140
+      PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return null;// 145
+         }
+      };// 142
+      PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return s;// 152
+         }
+      };// 149
+      ((String)c1.call() + (String)c2.call()).length();// 156
+   }// 157
+
+   public void m2(final String s) {
+      class NonCapturingLocalM2 {
+         private final String s;
+
+         public NonCapturingLocalM2(String s) {
+            this.s = s;// 164
+         }// 165
+
+         public String toString() {
+            return this.s;// 169
+         }
+      }
+
+      (new NonCapturingLocalM2(s)).toString();// 186
+
+      class CapturingLocalM2 {
+         private final int i;
+
+         public CapturingLocalM2(int i) {
+            this.i = i;// 177
+         }// 178
+
+         public String toString() {
+            return s + ":" + this.i;// 182
+         }
+      }
+
+      (new CapturingLocalM2(42)).toString();// 187
+      PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return null;// 192
+         }
+      };// 189
+      PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return s;// 199
+         }
+      };// 196
+      ((String)c1.call() + (String)c2.call()).length();// 203
+   }// 204
+
+   private interface Callable<T> {
+      T call();
+   }
+}
+
+class 'pkg/PrivateClasses$1$1NonCapturingLocalR1' {
+   method '<init> (Lpkg/PrivateClasses$1;Ljava/lang/String;)V' {
+      b      11
+      e      12
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      15
+      4      15
+   }
+}
+
+class 'pkg/PrivateClasses$1$1CapturingLocalR1' {
+   method '<init> (Lpkg/PrivateClasses$1;ILjava/lang/String;)V' {
+      10      25
+      13      26
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      29
+      14      29
+      1a      29
+      1d      29
+   }
+}
+
+class 'pkg/PrivateClasses$1$1' {
+   method 'call ()Ljava/lang/String;' {
+      0      36
+      1      36
+   }
+}
+
+class 'pkg/PrivateClasses$1$2' {
+   method 'call ()Ljava/lang/String;' {
+      4      41
+   }
+}
+
+class 'pkg/PrivateClasses$1' {
+   method 'run ()V' {
+      0      5
+      2      5
+      c      19
+      15      33
+      1b      33
+      27      38
+      31      43
+      3a      44
+      3f      44
+      46      44
+      4b      44
+      51      44
+      54      44
+      58      45
+   }
+}
+
+class 'pkg/PrivateClasses$2$1NonCapturingLocalR2' {
+   method '<init> (Lpkg/PrivateClasses$2;Ljava/lang/String;)V' {
+      b      55
+      e      56
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      59
+      4      59
+   }
+}
+
+class 'pkg/PrivateClasses$2$1CapturingLocalR1' {
+   method '<init> (Lpkg/PrivateClasses$2;ILjava/lang/String;)V' {
+      10      69
+      13      70
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      73
+      14      73
+      1a      73
+      1d      73
+   }
+}
+
+class 'pkg/PrivateClasses$2$1' {
+   method 'call ()Ljava/lang/String;' {
+      0      80
+      1      80
+   }
+}
+
+class 'pkg/PrivateClasses$2$2' {
+   method 'call ()Ljava/lang/String;' {
+      4      85
+   }
+}
+
+class 'pkg/PrivateClasses$2' {
+   method 'run ()V' {
+      0      49
+      2      49
+      c      63
+      15      77
+      1b      77
+      27      82
+      31      87
+      3a      88
+      3f      88
+      46      88
+      4b      88
+      51      88
+      54      88
+      58      89
+   }
+}
+
+class 'pkg/PrivateClasses$1NonCapturingLocalM1' {
+   method '<init> (Ljava/lang/String;)V' {
+      6      97
+      9      98
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      101
+      4      101
+   }
+}
+
+class 'pkg/PrivateClasses$1CapturingLocalM1' {
+   method '<init> (ILjava/lang/String;)V' {
+      b      111
+      e      112
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      115
+      14      115
+      1a      115
+      1d      115
+   }
+}
+
+class 'pkg/PrivateClasses$3' {
+   method 'call ()Ljava/lang/String;' {
+      0      122
+      1      122
+   }
+}
+
+class 'pkg/PrivateClasses$4' {
+   method 'call ()Ljava/lang/String;' {
+      4      127
+   }
+}
+
+class 'pkg/PrivateClasses' {
+   method 'm1 (Ljava/lang/String;)V' {
+      8      105
+      10      119
+      16      119
+      21      124
+      2a      129
+      33      130
+      38      130
+      3f      130
+      44      130
+      4a      130
+      4d      130
+      51      131
+   }
+
+   method 'm2 (Ljava/lang/String;)V' {
+      9      146
+      12      160
+      18      160
+      24      165
+      2e      170
+      37      171
+      3c      171
+      43      171
+      48      171
+      4e      171
+      51      171
+      55      172
+   }
+}
+
+class 'pkg/PrivateClasses$1NonCapturingLocalM2' {
+   method '<init> (Lpkg/PrivateClasses;Ljava/lang/String;)V' {
+      b      138
+      e      139
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      142
+      4      142
+   }
+}
+
+class 'pkg/PrivateClasses$1CapturingLocalM2' {
+   method '<init> (Lpkg/PrivateClasses;ILjava/lang/String;)V' {
+      10      152
+      13      153
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      156
+      14      156
+      1a      156
+      1d      156
+   }
+}
+
+class 'pkg/PrivateClasses$5' {
+   method 'call ()Ljava/lang/String;' {
+      0      163
+      1      163
+   }
+}
+
+class 'pkg/PrivateClasses$6' {
+   method 'call ()Ljava/lang/String;' {
+      4      168
+   }
+}
+
+Lines mapping:
+11 <-> 6
+17 <-> 12
+18 <-> 13
+22 <-> 16
+30 <-> 26
+31 <-> 27
+35 <-> 30
+39 <-> 20
+40 <-> 34
+42 <-> 39
+45 <-> 37
+49 <-> 44
+52 <-> 42
+56 <-> 45
+57 <-> 46
+63 <-> 50
+69 <-> 56
+70 <-> 57
+74 <-> 60
+82 <-> 70
+83 <-> 71
+87 <-> 74
+91 <-> 64
+92 <-> 78
+94 <-> 83
+97 <-> 81
+101 <-> 88
+104 <-> 86
+108 <-> 89
+109 <-> 90
+117 <-> 98
+118 <-> 99
+122 <-> 102
+130 <-> 112
+131 <-> 113
+135 <-> 116
+139 <-> 106
+140 <-> 120
+142 <-> 125
+145 <-> 123
+149 <-> 130
+152 <-> 128
+156 <-> 131
+157 <-> 132
+164 <-> 139
+165 <-> 140
+169 <-> 143
+177 <-> 153
+178 <-> 154
+182 <-> 157
+186 <-> 147
+187 <-> 161
+189 <-> 166
+192 <-> 164
+196 <-> 171
+199 <-> 169
+203 <-> 172
+204 <-> 173
+Not mapped:
+16
+29
+68
+81
+116
+129
+163
+176
diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
index 3087a40..bb18d0d 100644
--- a/testData/results/TestInnerSignature.dec
+++ b/testData/results/TestInnerSignature.dec
@@ -26,7 +26,7 @@ public class TestInnerSignature<A, B, C> {
       B b;
       C c;
 
-      public Inner(A var1, B var2, C var3) {
+      public Inner(A var2, B var3, C var4) {
          this.a = var2;// 34
          this.b = var3;// 35
          this.c = var4;// 36

From 4fd89eeb424f464c57af6e29009afad7a75e36fd Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 8 Dec 2017 18:04:39 +0100
Subject: [PATCH 172/252] [java decompiler] moves TextBuffer into "util"
 package

---
 src/org/jetbrains/java/decompiler/main/ClassWriter.java    | 1 +
 .../jetbrains/java/decompiler/main/ClassesProcessor.java   | 5 ++++-
 src/org/jetbrains/java/decompiler/main/Fernflower.java     | 5 ++++-
 .../decompiler/main/collectors/BytecodeSourceMapper.java   | 6 ++++--
 .../java/decompiler/main/collectors/ImportCollector.java   | 2 +-
 .../java/decompiler/modules/decompiler/ExprProcessor.java  | 2 +-
 .../modules/decompiler/exps/AnnotationExprent.java         | 6 ++++--
 .../decompiler/modules/decompiler/exps/ArrayExprent.java   | 6 ++++--
 .../decompiler/modules/decompiler/exps/AssertExprent.java  | 6 ++++--
 .../modules/decompiler/exps/AssignmentExprent.java         | 6 ++++--
 .../decompiler/modules/decompiler/exps/ConstExprent.java   | 6 ++++--
 .../decompiler/modules/decompiler/exps/ExitExprent.java    | 6 ++++--
 .../java/decompiler/modules/decompiler/exps/Exprent.java   | 6 ++++--
 .../decompiler/modules/decompiler/exps/FieldExprent.java   | 6 ++++--
 .../modules/decompiler/exps/FunctionExprent.java           | 6 ++++--
 .../java/decompiler/modules/decompiler/exps/IfExprent.java | 6 ++++--
 .../modules/decompiler/exps/InvocationExprent.java         | 6 ++++--
 .../decompiler/modules/decompiler/exps/MonitorExprent.java | 6 ++++--
 .../decompiler/modules/decompiler/exps/NewExprent.java     | 6 ++++--
 .../decompiler/modules/decompiler/exps/SwitchExprent.java  | 6 ++++--
 .../decompiler/modules/decompiler/exps/VarExprent.java     | 6 ++++--
 .../modules/decompiler/stats/BasicBlockStatement.java      | 6 ++++--
 .../modules/decompiler/stats/CatchAllStatement.java        | 6 ++++--
 .../modules/decompiler/stats/CatchStatement.java           | 6 ++++--
 .../decompiler/modules/decompiler/stats/DoStatement.java   | 6 ++++--
 .../modules/decompiler/stats/GeneralStatement.java         | 6 ++++--
 .../decompiler/modules/decompiler/stats/IfStatement.java   | 6 ++++--
 .../decompiler/modules/decompiler/stats/RootStatement.java | 6 ++++--
 .../modules/decompiler/stats/SequenceStatement.java        | 6 ++++--
 .../decompiler/modules/decompiler/stats/Statement.java     | 6 ++++--
 .../modules/decompiler/stats/SwitchStatement.java          | 6 ++++--
 .../modules/decompiler/stats/SynchronizedStatement.java    | 6 ++++--
 .../java/decompiler/{main => util}/TextBuffer.java         | 7 +++++--
 src/org/jetbrains/java/decompiler/util/TextUtil.java       | 5 +++--
 34 files changed, 127 insertions(+), 62 deletions(-)
 rename src/org/jetbrains/java/decompiler/{main => util}/TextBuffer.java (97%)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 105506a..210529f 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.gen.generics.*;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index bda88c6..86b7194 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -19,6 +21,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.io.IOException;
 import java.util.*;
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 0572806..1ad0080 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
@@ -10,6 +12,7 @@ import org.jetbrains.java.decompiler.struct.IDecompiledData;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.Map;
 
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
index 8ce2eec..d5166b8 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
@@ -1,8 +1,10 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 import java.util.Map.Entry;
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index cdc48e9..5e2d064 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -5,7 +5,7 @@ package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.StructField;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 39efaff..c52ac08 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -8,7 +8,7 @@ import org.jetbrains.java.decompiler.code.Instruction;
 import org.jetbrains.java.decompiler.code.InstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
index cb0b9c2..b6c828b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
@@ -1,8 +1,10 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
index 6309ace..d329ac2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
index 14c0425..0ae9fee 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 
 import java.util.List;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
index 73ae35a..2e09e5b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
@@ -1,10 +1,12 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 1405fac..1b3d7af 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -1,9 +1,11 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index 27412b9..67cf69b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -1,10 +1,12 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index a4eb39d..bb303e8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -1,8 +1,10 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 6dbd2db..02425fc 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -1,10 +1,12 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index da19f41..487d939 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -1,8 +1,10 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
index ebecc14..6f10a69 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index ecbb55c..5175743 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -1,10 +1,12 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
index ceff5ce..795ac06 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 541e91d..96d31fa 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -1,11 +1,13 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassWriter;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
index cd5b472..1b1025e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index a839fb1..710bd1b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -1,11 +1,13 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassWriter;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
index 290038d..377d212 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -6,7 +8,7 @@ import org.jetbrains.java.decompiler.code.Instruction;
 import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 4b31d07..8d50513 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -1,9 +1,11 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index 1f0f854..87b9bd9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -1,10 +1,12 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
index 63b7de5..06a3a80 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
index 84b835a..fffd34d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 
 import java.util.Collection;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index 083b6f0..7962bb1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
index fb99325..5133036 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
index 8eca0bd..8122b5c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
@@ -1,7 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index 974d1cf..e57e9ef 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -1,10 +1,12 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.InstructionSequence;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
index ada82b5..ae41af7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
@@ -1,10 +1,12 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.SwitchInstruction;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
index 699a853..90408d7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
@@ -1,9 +1,11 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.SequenceHelper;
diff --git a/src/org/jetbrains/java/decompiler/main/TextBuffer.java b/src/org/jetbrains/java/decompiler/util/TextBuffer.java
similarity index 97%
rename from src/org/jetbrains/java/decompiler/main/TextBuffer.java
rename to src/org/jetbrains/java/decompiler/util/TextBuffer.java
index c11ef4a..2d09c2d 100644
--- a/src/org/jetbrains/java/decompiler/main/TextBuffer.java
+++ b/src/org/jetbrains/java/decompiler/util/TextBuffer.java
@@ -1,6 +1,9 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.java.decompiler.main;
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+package org.jetbrains.java.decompiler.util;
 
+import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 
 import java.util.*;
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 4198992..30bc999 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -1,10 +1,11 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.util;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 

From 023bb2462a0bd0c28a3f057764d07b7d0ac2aece Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 10 Jan 2018 13:26:12 +0700
Subject: [PATCH 173/252] Unnecessary null check before instanceof removed

---
 .../java/decompiler/main/rels/NestedClassProcessor.java   | 2 +-
 .../modules/decompiler/exps/AnnotationExprent.java        | 4 ++--
 .../decompiler/modules/decompiler/exps/ArrayExprent.java  | 4 ++--
 .../modules/decompiler/exps/AssignmentExprent.java        | 4 ++--
 .../decompiler/modules/decompiler/exps/ConstExprent.java  | 4 ++--
 .../decompiler/modules/decompiler/exps/ExitExprent.java   | 4 ++--
 .../decompiler/modules/decompiler/exps/FieldExprent.java  | 4 ++--
 .../modules/decompiler/exps/FunctionExprent.java          | 4 ++--
 .../decompiler/modules/decompiler/exps/IfExprent.java     | 8 +++++---
 .../modules/decompiler/exps/InvocationExprent.java        | 4 ++--
 .../modules/decompiler/exps/MonitorExprent.java           | 4 ++--
 .../decompiler/modules/decompiler/exps/NewExprent.java    | 4 ++--
 .../decompiler/modules/decompiler/exps/SwitchExprent.java | 4 ++--
 .../decompiler/modules/decompiler/exps/VarExprent.java    | 4 ++--
 .../decompiler/sforms/FlattenStatementsHelper.java        | 2 +-
 .../modules/decompiler/vars/VarVersionEdge.java           | 2 +-
 .../modules/decompiler/vars/VarVersionPair.java           | 2 +-
 .../java/decompiler/struct/consts/LinkConstant.java       | 2 +-
 .../java/decompiler/struct/consts/PrimitiveConstant.java  | 2 +-
 .../java/decompiler/struct/gen/FieldDescriptor.java       | 2 +-
 .../java/decompiler/struct/gen/MethodDescriptor.java      | 2 +-
 src/org/jetbrains/java/decompiler/struct/gen/VarType.java | 2 +-
 .../java/decompiler/util/FastFixedSetFactory.java         | 7 +++++--
 .../java/decompiler/util/FastSparseSetFactory.java        | 2 +-
 24 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 649520c..f865167 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -910,7 +910,7 @@ public class NestedClassProcessor {
     @Override
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof VarFieldPair)) return false;
+      if (!(o instanceof VarFieldPair)) return false;
 
       VarFieldPair pair = (VarFieldPair)o;
       return fieldKey.equals(pair.fieldKey) && varPair.equals(pair.varPair);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
index b6c828b..13491fc 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
@@ -4,10 +4,10 @@
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.List;
 
@@ -88,7 +88,7 @@ public class AnnotationExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof AnnotationExprent)) return false;
+    if (!(o instanceof AnnotationExprent)) return false;
 
     AnnotationExprent ann = (AnnotationExprent)o;
     return className.equals(ann.className) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
index d329ac2..bc482a2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
@@ -3,12 +3,12 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -94,7 +94,7 @@ public class ArrayExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof ArrayExprent)) return false;
+    if (!(o instanceof ArrayExprent)) return false;
 
     ArrayExprent arr = (ArrayExprent)o;
     return InterpreterUtil.equalObjects(array, arr.getArray()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
index 2e09e5b..c590ac5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
@@ -6,13 +6,13 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -162,7 +162,7 @@ public class AssignmentExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof AssignmentExprent)) return false;
+    if (!(o instanceof AssignmentExprent)) return false;
 
     AssignmentExprent as = (AssignmentExprent)o;
     return InterpreterUtil.equalObjects(left, as.getLeft()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 1b3d7af..402b9e7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -5,7 +5,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -15,6 +14,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.*;
@@ -285,7 +285,7 @@ public class ConstExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof ConstExprent)) return false;
+    if (!(o instanceof ConstExprent)) return false;
 
     ConstExprent cn = (ConstExprent)o;
     return InterpreterUtil.equalObjects(constType, cn.getConstType()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index 67cf69b..25506fa 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -6,7 +6,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -16,6 +15,7 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -123,7 +123,7 @@ public class ExitExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof ExitExprent)) return false;
+    if (!(o instanceof ExitExprent)) return false;
 
     ExitExprent et = (ExitExprent)o;
     return exitType == et.getExitType() &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 02425fc..264347e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -6,7 +6,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -19,6 +18,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
@@ -155,7 +155,7 @@ public class FieldExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof FieldExprent)) return false;
+    if (!(o instanceof FieldExprent)) return false;
 
     FieldExprent ft = (FieldExprent)o;
     return InterpreterUtil.equalObjects(name, ft.getName()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index 487d939..2c5a2ac 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -4,7 +4,6 @@
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
@@ -13,6 +12,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 
@@ -413,7 +413,7 @@ public class FunctionExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof FunctionExprent)) return false;
+    if (!(o instanceof FunctionExprent)) return false;
 
     FunctionExprent fe = (FunctionExprent)o;
     return funcType == fe.getFuncType() &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
index 6f10a69..32dd0ba 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
@@ -3,13 +3,15 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 public class IfExprent extends Exprent {
 
@@ -115,7 +117,7 @@ public class IfExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof IfExprent)) return false;
+    if (!(o instanceof IfExprent)) return false;
 
     IfExprent ie = (IfExprent)o;
     return InterpreterUtil.equalObjects(condition, ie.getCondition());
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 5175743..12d4600 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -6,7 +6,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
@@ -26,6 +25,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.lang.reflect.Method;
@@ -539,7 +539,7 @@ public class InvocationExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof InvocationExprent)) return false;
+    if (!(o instanceof InvocationExprent)) return false;
 
     InvocationExprent it = (InvocationExprent)o;
     return InterpreterUtil.equalObjects(name, it.getName()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
index 795ac06..4172874 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
@@ -3,9 +3,9 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,7 +61,7 @@ public class MonitorExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof MonitorExprent)) return false;
+    if (!(o instanceof MonitorExprent)) return false;
 
     MonitorExprent me = (MonitorExprent)o;
     return monType == me.getMonType() &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 96d31fa..84ac1ac 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -7,7 +7,6 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassWriter;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
@@ -20,6 +19,7 @@ import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -423,7 +423,7 @@ public class NewExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof NewExprent)) return false;
+    if (!(o instanceof NewExprent)) return false;
 
     NewExprent ne = (NewExprent)o;
     return InterpreterUtil.equalObjects(newType, ne.getNewType()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
index 1b1025e..3a97175 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
@@ -3,11 +3,11 @@
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -92,7 +92,7 @@ public class SwitchExprent extends Exprent {
       return true;
     }
 
-    if (o == null || !(o instanceof SwitchExprent)) {
+    if (!(o instanceof SwitchExprent)) {
       return false;
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index 710bd1b..8c2a553 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -7,7 +7,6 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassWriter;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
@@ -26,6 +25,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
@@ -176,7 +176,7 @@ public class VarExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof VarExprent)) return false;
+    if (!(o instanceof VarExprent)) return false;
 
     VarExprent ve = (VarExprent)o;
     return index == ve.getIndex() &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
index f1dbf9f..b465126 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
@@ -486,7 +486,7 @@ public class FlattenStatementsHelper {
     @Override
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof FinallyPathWrapper)) return false;
+      if (!(o instanceof FinallyPathWrapper)) return false;
 
       FinallyPathWrapper fpw = (FinallyPathWrapper)o;
       return (source + ":" + destination + ":" + entry).equals(fpw.source + ":" + fpw.destination + ":" + fpw.entry);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
index 347a6b6..2e67a88 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
@@ -24,7 +24,7 @@ public class VarVersionEdge { // FIXME: can be removed?
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof VarVersionEdge)) return false;
+    if (!(o instanceof VarVersionEdge)) return false;
 
     VarVersionEdge edge = (VarVersionEdge)o;
     return type == edge.type && source == edge.source && dest == edge.dest;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
index 59e29c2..8554988 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
@@ -28,7 +28,7 @@ public class VarVersionPair {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof VarVersionPair)) return false;
+    if (!(o instanceof VarVersionPair)) return false;
 
     VarVersionPair paar = (VarVersionPair)o;
     return var == paar.var && version == paar.version;
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
index 4a24686..d8a92ca 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
@@ -63,7 +63,7 @@ public class LinkConstant extends PooledConstant {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof LinkConstant)) return false;
+    if (!(o instanceof LinkConstant)) return false;
 
     LinkConstant cn = (LinkConstant)o;
     return this.type == cn.type &&
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
index 3d8bfb0..626a91b 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
@@ -40,7 +40,7 @@ public class PrimitiveConstant extends PooledConstant {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof PrimitiveConstant)) return false;
+    if (!(o instanceof PrimitiveConstant)) return false;
 
     PrimitiveConstant cn = (PrimitiveConstant)o;
     return this.type == cn.type &&
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
index 765820c..94add14 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
@@ -36,7 +36,7 @@ public class FieldDescriptor {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof FieldDescriptor)) return false;
+    if (!(o instanceof FieldDescriptor)) return false;
 
     FieldDescriptor fd = (FieldDescriptor)o;
     return type.equals(fd.type);
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
index 89c0cc8..102393c 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
@@ -114,7 +114,7 @@ public class MethodDescriptor {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof MethodDescriptor)) return false;
+    if (!(o instanceof MethodDescriptor)) return false;
 
     MethodDescriptor md = (MethodDescriptor)o;
     return ret.equals(md.ret) && Arrays.equals(params, md.params);
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
index 5bb88b5..384d31b 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
@@ -265,7 +265,7 @@ public class VarType {  // TODO: optimize switch
       return true;
     }
 
-    if (o == null || !(o instanceof VarType)) {
+    if (!(o instanceof VarType)) {
       return false;
     }
 
diff --git a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
index c852838..80ac7d6 100644
--- a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
@@ -1,7 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 public class FastFixedSetFactory<E> {
 
@@ -145,7 +148,7 @@ public class FastFixedSetFactory<E> {
 
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof FastFixedSet)) return false;
+      if (!(o instanceof FastFixedSet)) return false;
 
       int[] extdata = ((FastFixedSet)o).getData();
       int[] intdata = data;
diff --git a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
index f94360d..91cdabc 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
@@ -263,7 +263,7 @@ public class FastSparseSetFactory<E> {
 
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof FastSparseSet)) return false;
+      if (!(o instanceof FastSparseSet)) return false;
 
       int[] longdata = ((FastSparseSet)o).getData();
       int[] shortdata = data;

From 8b9687ed20e40fbf46dea055f0a423b49f1bf693 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Wed, 10 Jan 2018 16:28:43 +0300
Subject: [PATCH 174/252] IDEA-184560 Java decompiler doesn't use stored
 parameter names

---
 .../java/decompiler/code/CodeConstants.java   |   5 +-
 .../java/decompiler/main/ClassWriter.java     |  25 +++-
 .../main/extern/IFernflowerPreferences.java   |   6 +-
 .../struct/attr/StructGeneralAttribute.java   |   8 +-
 .../attr/StructMethodParametersAttribute.java |  56 ++++++++
 .../java/decompiler/SingleClassesTest.java    |   5 +-
 .../pkg/TestMethodParametersAttr$1Local.class | Bin 0 -> 729 bytes
 .../pkg/TestMethodParametersAttr$C1.class     | Bin 0 -> 677 bytes
 .../pkg/TestMethodParametersAttr$C2.class     | Bin 0 -> 627 bytes
 .../pkg/TestMethodParametersAttr$C3.class     | Bin 0 -> 624 bytes
 .../pkg/TestMethodParametersAttr$C4.class     | Bin 0 -> 488 bytes
 .../pkg/TestMethodParametersAttr$I1.class     | Bin 0 -> 306 bytes
 .../pkg/TestMethodParametersAttr.class        | Bin 0 -> 981 bytes
 testData/results/TestMethodParametersAttr.dec | 125 ++++++++++++++++++
 .../src/pkg/TestMethodParametersAttr.java     |  56 ++++++++
 15 files changed, 279 insertions(+), 7 deletions(-)
 create mode 100644 src/org/jetbrains/java/decompiler/struct/attr/StructMethodParametersAttribute.java
 create mode 100644 testData/classes/pkg/TestMethodParametersAttr$1Local.class
 create mode 100644 testData/classes/pkg/TestMethodParametersAttr$C1.class
 create mode 100644 testData/classes/pkg/TestMethodParametersAttr$C2.class
 create mode 100644 testData/classes/pkg/TestMethodParametersAttr$C3.class
 create mode 100644 testData/classes/pkg/TestMethodParametersAttr$C4.class
 create mode 100644 testData/classes/pkg/TestMethodParametersAttr$I1.class
 create mode 100644 testData/classes/pkg/TestMethodParametersAttr.class
 create mode 100644 testData/results/TestMethodParametersAttr.dec
 create mode 100644 testData/src/pkg/TestMethodParametersAttr.java

diff --git a/src/org/jetbrains/java/decompiler/code/CodeConstants.java b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
index 4ff5daa..a8f9f36 100644
--- a/src/org/jetbrains/java/decompiler/code/CodeConstants.java
+++ b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.code;
 
 @SuppressWarnings({"unused", "SpellCheckingInspection"})
@@ -70,6 +72,7 @@ public interface CodeConstants {
   int ACC_SYNTHETIC = 0x1000;
   int ACC_ANNOTATION = 0x2000;
   int ACC_ENUM = 0x4000;
+  int ACC_MANDATED = 0x8000;
 
   // ----------------------------------------------------------------------
   // CLASS FLAGS
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 210529f..8d862c8 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.main;
 
@@ -697,6 +697,15 @@ public class ClassWriter {
           }
         }
 
+        List<StructMethodParametersAttribute.Entry> methodParameters = null;
+        if (DecompilerContext.getOption(IFernflowerPreferences.USE_METHOD_PARAMETERS)) {
+          StructMethodParametersAttribute attr =
+            (StructMethodParametersAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_METHOD_PARAMETERS);
+          if (attr != null) {
+            methodParameters = attr.getEntries();
+          }
+        }
+
         int index = isEnum && init ? 3 : thisVar ? 1 : 0;
         int start = isEnum && init ? 2 : 0;
         for (int i = start; i < md.params.length; i++) {
@@ -707,7 +716,10 @@ public class ClassWriter {
 
             appendParameterAnnotations(buffer, mt, paramCount);
 
-            if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
+            if (methodParameters != null && paramCount < methodParameters.size()) {
+              appendModifiers(buffer, methodParameters.get(paramCount).myAccessFlags, CodeConstants.ACC_FINAL, isInterface, 0);
+            }
+            else if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
               buffer.append("final ");
             }
 
@@ -741,7 +753,14 @@ public class ClassWriter {
             }
 
             buffer.append(' ');
-            String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+
+            String parameterName;
+            if (methodParameters != null && paramCount < methodParameters.size()) {
+              parameterName = methodParameters.get(paramCount).myName;
+            }
+            else {
+              parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+            }
             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
 
             paramCount++;
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index cda288b..3c0fac5 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.main.extern;
 
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -25,6 +27,7 @@ public interface IFernflowerPreferences {
   String SYNTHETIC_NOT_SET = "nns";
   String UNDEFINED_PARAM_TYPE_OBJECT = "uto";
   String USE_DEBUG_VAR_NAMES = "udv";
+  String USE_METHOD_PARAMETERS = "ump";
   String REMOVE_EMPTY_RANGES = "rer";
   String FINALLY_DEINLINE = "fdi";
   String IDEA_NOT_NULL_ANNOTATION = "inn";
@@ -67,6 +70,7 @@ public interface IFernflowerPreferences {
     defaults.put(SYNTHETIC_NOT_SET, "0");
     defaults.put(UNDEFINED_PARAM_TYPE_OBJECT, "1");
     defaults.put(USE_DEBUG_VAR_NAMES, "1");
+    defaults.put(USE_METHOD_PARAMETERS, "1");
     defaults.put(REMOVE_EMPTY_RANGES, "1");
     defaults.put(FINALLY_DEINLINE, "1");
     defaults.put(IDEA_NOT_NULL_ANNOTATION, "1");
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index 8cc8bdb..eb69af4 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -33,6 +35,7 @@ public class StructGeneralAttribute {
   public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
   public static final String ATTRIBUTE_DEPRECATED = "Deprecated";
   public static final String ATTRIBUTE_LINE_NUMBER_TABLE = "LineNumberTable";
+  public static final String ATTRIBUTE_METHOD_PARAMETERS = "MethodParameters";
 
   private String name;
 
@@ -81,6 +84,9 @@ public class StructGeneralAttribute {
     else if (ATTRIBUTE_LINE_NUMBER_TABLE.equals(name)) {
       attr = new StructLineNumberTableAttribute();
     }
+    else if (ATTRIBUTE_METHOD_PARAMETERS.equals(name)) {
+      attr = new StructMethodParametersAttribute();
+    }
     else {
       // unsupported attribute
       return null;
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructMethodParametersAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructMethodParametersAttribute.java
new file mode 100644
index 0000000..08133a9
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructMethodParametersAttribute.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+package org.jetbrains.java.decompiler.struct.attr;
+
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/*
+  u1 parameters_count;
+  {   u2 name_index;
+      u2 access_flags;
+  } parameters[parameters_count];
+*/
+public class StructMethodParametersAttribute extends StructGeneralAttribute {
+  private List<Entry> myEntries;
+
+  @Override
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    int len = data.readUnsignedByte();
+    List<Entry> entries;
+    if (len > 0) {
+      entries = new ArrayList<>(len);
+
+      for (int i = 0; i < len; i++) {
+        int nameIndex = data.readUnsignedShort();
+        String name = nameIndex != 0 ? pool.getPrimitiveConstant(nameIndex).getString() : null;
+        int access_flags = data.readUnsignedShort();
+        entries.add(new Entry(name, access_flags));
+      }
+    }
+    else {
+      entries = Collections.emptyList();
+    }
+    myEntries = Collections.unmodifiableList(entries);
+  }
+
+  public List<Entry> getEntries() {
+    return myEntries;
+  }
+
+  public static class Entry {
+    public final String myName;
+    public final int myAccessFlags;
+
+    public Entry(String name, int accessFlags) {
+      myName = name;
+      myAccessFlags = accessFlags;
+    }
+  }
+}
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 9c971c3..15da93c 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,4 +1,6 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -45,6 +47,7 @@ public class SingleClassesTest {
   @Test public void testDeprecations() { doTest("pkg/TestDeprecations"); }
   @Test public void testExtendsList() { doTest("pkg/TestExtendsList"); }
   @Test public void testMethodParameters() { doTest("pkg/TestMethodParameters"); }
+  @Test public void testMethodParametersAttr() { doTest("pkg/TestMethodParametersAttr"); }
   @Test public void testCodeConstructs() { doTest("pkg/TestCodeConstructs"); }
   @Test public void testConstants() { doTest("pkg/TestConstants"); }
   @Test public void testEnum() { doTest("pkg/TestEnum"); }
diff --git a/testData/classes/pkg/TestMethodParametersAttr$1Local.class b/testData/classes/pkg/TestMethodParametersAttr$1Local.class
new file mode 100644
index 0000000000000000000000000000000000000000..8cfb527cfc5cfa743544180a9df5f46c2a5446c5
GIT binary patch
literal 729
zcma)4T}#_w6n;+AG;0=Z=G5ut$GTN$yJ6=xuQr5HCKl=ktn~hE`l69EktFWgzvRUj
zc(EU_A2s&8v3OAs8p!!R&w0*C{{FlB1K=~>RAJ$ji!wGGY&zHyRPu{3YkUyw^v60#
zCRbsk)6PI=`LWI~lJS{J)kNny&A#P%`h^W&!#K<j1g+*=9lh32Q0^vUEvWUwSf5-^
zMmim+QN+knKM7PcRB34ZX|QZK3G5;#@Op8q({7})Of&p`p0SO+qM3ZHt516Z=?VPV
zjToMgTeG0Zx{m_)M{=D8`jA%;Y(92|-AnaTah>mR5G7d{pWh=p*!J)mbq_Ww9vsvK
z?K!SGB};||w-c%OymLCb)IlzIJ4ZiH6`3<~*=B1<1{S|CAii&i&?@nD@PxWb>xkN-
zcH8fMLE67jx-Dv4$_j+Cfv1!PhgI-Uqc)a7GkF(2o)Kk<cC`fi#%I7h&#^omvQN*9
sm09ea0(<p7`G750AtL_=w%Eo2hp!eGFR(^k#yVbNk(SFcLu>)~4_GCg?*IS*

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodParametersAttr$C1.class b/testData/classes/pkg/TestMethodParametersAttr$C1.class
new file mode 100644
index 0000000000000000000000000000000000000000..9acce02b6cbbe46715b9fa66ec99400bc8e36e8a
GIT binary patch
literal 677
zcma)3$x6de6g{_7Y^*lcd8i5wv<lXWt`tEEVxbP8bpP5uG$l<+5?%XCE<|wQ2l!Fq
zd9}C@ga&fwd+xdKetx}w064^27D+7FNMX^!vV|2vCVp_E&3(aEqodnFukU&~tla4+
zzSQwU(792e>giaA(ODda$80!peK$T8luILZ)XPmlsupy#Am4C(ef8LD>F`dqJVpwQ
zpsl>73SHw5gDJyFkf>D!xw`M`u;!^K(u|EXbF)?@(PY2MeyIzbzpF6ZBdOAW8|w}P
z_HFPOw)HvJ7Zm^7f3K^aR1Rrma<EXeuqxOd;oZoHG)!~FQ~rJBy4BU~m>f&ybv8yo
zz&cNt;uXbl%zRo2{uailv$QU#lhpRk?ki;H4T+aQjZK+>P%dDc(%`TPIpnF0WzbCC
zhJz`h6liA?NIyFam~R?0!y!lX%vkx0y*R+0`$_&{3ucMPE3+kS9Me5Fkn@<NwwX*~
H2@}9Kmurwn

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodParametersAttr$C2.class b/testData/classes/pkg/TestMethodParametersAttr$C2.class
new file mode 100644
index 0000000000000000000000000000000000000000..6ecf7d00add3f7b8825455d5fc0e4b7604a232cd
GIT binary patch
literal 627
zcma)&TT22#6vzLwuCCdZx3a4h6k!EPRu54Gu@DG$fyDQ59dczaGCTIYdJ1~z1N5Py
zGg=~Dz<D^=|M|_CdH;BQ18{=%3=$|=Shldjkh<_fPhB#YmHJ+boD+2fL$=|C;&u?U
zg>3S+PnAL=a=G8)($o1@(NtY8W-y!@gIy0pAswH`v7lO|(GhMG^gUn5YE#7OMyPJo
zx#yAxLJ1jPDJ6HD+Brj_Upr!8b%xwe5wQd6k%De80x}dHGh`m3fpo<+(HYAB;SYQK
ziQ6!-YGI9Gce;&e4Lw)&dH7hpYxjh!=-P_@o$V<I*n&YntdF)Pl9Z<?Is-j{d~*K<
z?3n@s7TFY)filu$OCtehU{gj?%weATSsgP<^vR8hr<7^pFWSZgjg4sx`AJ%yCetX4
kX$PA07j1J$vqw!7iGlBpiWC}H7}`b5lFyLLz!LfNCs?C!bN~PV

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodParametersAttr$C3.class b/testData/classes/pkg/TestMethodParametersAttr$C3.class
new file mode 100644
index 0000000000000000000000000000000000000000..698cd065bcfbad54ba05c842242c5f55f9362a30
GIT binary patch
literal 624
zcma)3%SyvQ6g`usjg8U9`hHXetHcVeT3smx2?&My0897NcCaaVlu7E^UveRW3qQb*
z67SS5L=du=JNKTs_nb2`pI`4E0M4+JM+R#qbgUcLG_b{xO9ozCK4#c&^+hiVMxHNZ
ztu5l@MkIr%f6pZkL?UE-l_c_l1}?qOOBxK0lWO9y!=SrSUoaF}UMOzIL08B&@A`xk
zTTzeu9WFgpPeEN-V$j?=gVhW}Azh!xu^=p!WZA8gPy4TbVhm2mi_=t=GNW@UwBU4-
zQZyf;vFwR!x<5ndzXzxe`4hL0Mb3hOl7Vf8gA@-(p2(6KuK7HCtlf2oqL+}iqs;83
zV9<Bz?{xY`X4^`ivJ5Q)GtiKytU<d*yIDDU1*^P4d!b5$NihdTv5HxWD?eSZP@szX
rCv4=7@+?F4*(Q|*6lr7%EkX$|{f3t5Od~2Ku!{K!4c!JCnA7nM9?Fk4

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodParametersAttr$C4.class b/testData/classes/pkg/TestMethodParametersAttr$C4.class
new file mode 100644
index 0000000000000000000000000000000000000000..6259a0ef0607080b5147bec4c6507c0f658d464b
GIT binary patch
literal 488
zcma)&O-sW-5Qg7P)27B~wSEhNph)y!P~%AvBp?*x2UvRFq=QY#N7-!sU!DXH{s4cJ
zIEfxa5W0t%cb}biX4sF<w|4+Owrw=9W?{p^ra<d5$rF7g&~Oh20%lMQNuU!ZIo(aO
zh*V!jDU)tk#4;U7l~ng1XzEc?3K)Se;PmpGRFKNDBxY_nq`1f?NlMD=Q>kxBkBZ@g
zR5Bw?s=U@(?Faq^+p`lM?DnepOMlCFvB^2V8`)_sIoglKRK;||tp#@e>wP?y&(eX3
zriCqmgW1;M4Jx0P%KXW@kH!>hfxQ{L<}M8W*XmS}$AUkXmB(3dZXUftys$7}actG_
r3~koVcLC;Du@eheWYVcjyibjmf1@r#11oi}Rm^j?x!%A!Y_t6ZG@)!=

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodParametersAttr$I1.class b/testData/classes/pkg/TestMethodParametersAttr$I1.class
new file mode 100644
index 0000000000000000000000000000000000000000..6b52d993d8f8425e551472af52992d4941f5b215
GIT binary patch
literal 306
zcma)%%WA?<5QhJWiAiIs=>xd3NV_q#<OM_!vM34__s3*VLvEa$_Tjqd1Nczlq$?4G
zZsz*UKQpKE&o6)&Pc8x%BZ5`F5$u=bbxR08*c|F?t+XoHux<&xCYHWczW;?{{m=SK
zr@TBCOc-ytHMc`^WArRn-^xWum}Z>TWh1zb?$OUlx1%#bQdO)Mg=$-t?O`Vq6{^}t
xt6k2iAx!?E*9SyT{sb&r4u>tdBbh^xo|N3{l7~>}hmMAip?F_-!T^tb?*gdJM$!NP

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMethodParametersAttr.class b/testData/classes/pkg/TestMethodParametersAttr.class
new file mode 100644
index 0000000000000000000000000000000000000000..3549300662c2ede40f25f7914888ea060453140b
GIT binary patch
literal 981
zcma)4+fLg+5IvJPaT?MBX`n3y8g3yM)Q~_Qsv@K+QYB02MIz#TldQnVv61cYUp!Un
z10T?jLYz(72xyVK($1OLJ##!W>)*G(ZU7u&FOM{~Y;4=uu~8AEI){RS<NG@7cq)o?
zWMkJHAK0i8otBN7iQ6{n1{pU5nQkypo*;YV`fhwIu&Pe&l+X!=S}@;ref@1b>g%wl
z`W{b;lY~<hx+eZ}XvODlB-rT=^&l8sx}FZ3Jsrhgb$lKSf2dH6bgaYZa~y}C1nJBD
zmOvcA!ea(28}W{ewsC3b9<WYtT4%ays>`1Q<8YwA@I!*Nr@r+5LS3l>7Eu;#C8&($
zn2e^U{Illw{)HaIf=YtKZ8Q61M7ENM=x_*$h#ih78Ig+hB+axYFN_VO_=}lkaWA6C
z_$9rM;KL9z^`DSyIw_QBvpfa~OSH>V0`V0iQt=vZc)wzNVPMwVnc@dVM)4oD(mgeq
zsR>r^tF1CKhqakn!zlevZE2!bm|kL?8u(k$I$hu$%Dgl^KB=+$Kx5ipilZ_OY;p!b
ho7Q5Kv2w79IZp2xF`vz0j#yx^&xtR{o#$Qv?f~PG#$Esb

literal 0
HcmV?d00001

diff --git a/testData/results/TestMethodParametersAttr.dec b/testData/results/TestMethodParametersAttr.dec
new file mode 100644
index 0000000..ba00341
--- /dev/null
+++ b/testData/results/TestMethodParametersAttr.dec
@@ -0,0 +1,125 @@
+package decompiler;
+
+public class TestMethodParametersAttr {
+   TestMethodParametersAttr(int p01) {
+   }// 19
+
+   void m1(int p02) {
+   }// 20
+
+   static void m2(int p03) {
+   }// 21
+
+   void local() {
+      class Local {
+         Local(final int this$0) {
+         }// 36
+
+         void m(int p32) {
+         }// 37
+      }
+
+   }// 39
+
+   abstract static class C4 {
+      abstract void m1(int p51);
+
+      abstract void m2(final int p52);
+   }
+
+   abstract class C3 {
+      abstract void m1(int p51);
+
+      abstract void m2(final int p52);
+   }
+
+   interface I1 {
+      void m1(int p41);
+
+      void m2(final int p42);
+   }
+
+   static class C2 {
+      C2(int p21) {
+      }// 29
+
+      void m1(int p22) {
+      }// 30
+
+      static void m2(int p23) {
+      }// 31
+   }
+
+   class C1 {
+      C1(final int this$0) {
+      }// 24
+
+      void m(int p12) {
+      }// 25
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr' {
+   method '<init> (I)V' {
+      4      4
+   }
+
+   method 'm1 (I)V' {
+      0      7
+   }
+
+   method 'm2 (I)V' {
+      0      10
+   }
+
+   method 'local ()V' {
+      0      21
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr$1Local' {
+   method '<init> (Ldecompiler/TestMethodParametersAttr;I)V' {
+      9      15
+   }
+
+   method 'm (I)V' {
+      0      18
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr$C2' {
+   method '<init> (I)V' {
+      4      43
+   }
+
+   method 'm1 (I)V' {
+      0      46
+   }
+
+   method 'm2 (I)V' {
+      0      49
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr$C1' {
+   method '<init> (Ldecompiler/TestMethodParametersAttr;I)V' {
+      9      54
+   }
+
+   method 'm (I)V' {
+      0      57
+   }
+}
+
+Lines mapping:
+19 <-> 5
+20 <-> 8
+21 <-> 11
+24 <-> 55
+25 <-> 58
+29 <-> 44
+30 <-> 47
+31 <-> 50
+36 <-> 16
+37 <-> 19
+39 <-> 22
diff --git a/testData/src/pkg/TestMethodParametersAttr.java b/testData/src/pkg/TestMethodParametersAttr.java
new file mode 100644
index 0000000..b98fc0b
--- /dev/null
+++ b/testData/src/pkg/TestMethodParametersAttr.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package decompiler;
+
+// compile with java 8: javap -parameters TestMethodParametersAttr.java
+public class TestMethodParametersAttr {
+  TestMethodParametersAttr(int p01) { }
+  void m1(int p02) { }
+  static void m2(int p03) { }
+
+  class C1 {
+    C1(int p11) { }
+    void m(int p12) { }
+  }
+
+  static class C2 {
+    C2(int p21) { }
+    void m1(int p22) { }
+    static void m2(int p23) { }
+  }
+
+  void local() {
+    class Local {
+      Local(int p31) { }
+      void m(int p32) { }
+    }
+  }
+
+  interface I1 {
+      void m1(int p41);
+      void m2(final int p42);
+  }
+
+  abstract class C3 {
+    abstract void m1(int p51);
+    abstract void m2(final int p52);
+  }
+
+  static abstract class C4 {
+    abstract void m1(int p51);
+    abstract void m2(final int p52);
+  }
+}
\ No newline at end of file

From 6715ecf53d04286f9e2b198d4ccbb5ea925ed4d3 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Wed, 10 Jan 2018 16:44:01 +0300
Subject: [PATCH 175/252] IDEA-184560 Java decompiler doesn't use stored
 parameter names - fixed param idx

---
 src/org/jetbrains/java/decompiler/main/ClassWriter.java | 8 ++++----
 testData/results/TestMethodParametersAttr.dec           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 8d862c8..5d90668 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -716,8 +716,8 @@ public class ClassWriter {
 
             appendParameterAnnotations(buffer, mt, paramCount);
 
-            if (methodParameters != null && paramCount < methodParameters.size()) {
-              appendModifiers(buffer, methodParameters.get(paramCount).myAccessFlags, CodeConstants.ACC_FINAL, isInterface, 0);
+            if (methodParameters != null && i < methodParameters.size()) {
+              appendModifiers(buffer, methodParameters.get(i).myAccessFlags, CodeConstants.ACC_FINAL, isInterface, 0);
             }
             else if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
               buffer.append("final ");
@@ -755,8 +755,8 @@ public class ClassWriter {
             buffer.append(' ');
 
             String parameterName;
-            if (methodParameters != null && paramCount < methodParameters.size()) {
-              parameterName = methodParameters.get(paramCount).myName;
+            if (methodParameters != null && i < methodParameters.size()) {
+              parameterName = methodParameters.get(i).myName;
             }
             else {
               parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
diff --git a/testData/results/TestMethodParametersAttr.dec b/testData/results/TestMethodParametersAttr.dec
index ba00341..a48380b 100644
--- a/testData/results/TestMethodParametersAttr.dec
+++ b/testData/results/TestMethodParametersAttr.dec
@@ -12,7 +12,7 @@ public class TestMethodParametersAttr {
 
    void local() {
       class Local {
-         Local(final int this$0) {
+         Local(int p31) {
          }// 36
 
          void m(int p32) {
@@ -51,7 +51,7 @@ public class TestMethodParametersAttr {
    }
 
    class C1 {
-      C1(final int this$0) {
+      C1(int p11) {
       }// 24
 
       void m(int p12) {

From 0bb1f6801c3b8e72eef8859b27e672f3c40dbca9 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Thu, 11 Jan 2018 11:23:40 +0300
Subject: [PATCH 176/252] fixed synthetic params

---
 .../modules/decompiler/exps/ExprUtil.java      |   5 ++++-
 .../java/decompiler/SingleClassesTest.java     |   1 +
 .../classes/pkg/TestSuperInner$Inner.class     | Bin 0 -> 425 bytes
 testData/classes/pkg/TestSuperInner.class      | Bin 0 -> 332 bytes
 .../classes/pkg/TestSuperInner2$Inner2.class   | Bin 0 -> 487 bytes
 testData/classes/pkg/TestSuperInner2.class     | Bin 0 -> 336 bytes
 testData/results/TestSuperInner2.dec           |  17 +++++++++++++++++
 testData/src/pkg/TestSuperInner.java           |   6 ++++++
 testData/src/pkg/TestSuperInner2.java          |   4 ++++
 9 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 testData/classes/pkg/TestSuperInner$Inner.class
 create mode 100644 testData/classes/pkg/TestSuperInner.class
 create mode 100644 testData/classes/pkg/TestSuperInner2$Inner2.class
 create mode 100644 testData/classes/pkg/TestSuperInner2.class
 create mode 100644 testData/results/TestSuperInner2.dec
 create mode 100644 testData/src/pkg/TestSuperInner.java
 create mode 100644 testData/src/pkg/TestSuperInner2.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
index 712845f..90c6d90 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -1,3 +1,6 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -24,7 +27,7 @@ public class ExprUtil {
       // own class
       mask = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor).synthParameters;
     }
-    else if (parameters > 0 && node.type == ClassNode.CLASS_MEMBER && node.classStruct.hasModifier(CodeConstants.ACC_STATIC)) {
+    else if (parameters > 0 && node.type == ClassNode.CLASS_MEMBER && (node.access & CodeConstants.ACC_STATIC) == 0) {
       // non-static member class
       mask = new ArrayList<>(Collections.nCopies(parameters, null));
       mask.set(0, new VarVersionPair(-1, 0));
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 15da93c..83db194 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -105,6 +105,7 @@ public class SingleClassesTest {
   @Test public void testPop2OneLongPop2() { doTest("pkg/TestPop2OneLongPop2"); }
   @Test public void testPop2TwoIntPop2() { doTest("pkg/TestPop2TwoIntPop2"); }
   @Test public void testPop2TwoIntTwoPop() { doTest("pkg/TestPop2TwoIntTwoPop"); }
+  @Test public void testSuperInner2() { doTest("pkg/TestSuperInner2", "pkg/TestSuperInner"); }
 
   // TODO: fix all below
   //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
diff --git a/testData/classes/pkg/TestSuperInner$Inner.class b/testData/classes/pkg/TestSuperInner$Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..1148567a037fcfdc2eef748a2cc629cc23740621
GIT binary patch
literal 425
zcmZ8d%SyvQ6g@YYHa5mKHZ|%}=%QAzF5D?DEC@o-MN9XSIOvp^NFM%|3lUuS0e+Nt
zC)GvEEbg2K=RUrFKED8*<FEr8eHQ|OgFOc!p<O-ca(G7Yqq!=pS^c7l+bmPX1#6c&
z)72Fr7;TEj3xb&D4~o!>bf)g==U5eU8K=zjqdbx6LKfQKKT?=RgjN$y@R~YJWmzhw
z!;J>R{~6p_UKfeF(Iz-pAMtc4U!{i@+8!M2J2)T=)-9_X-p*JjsmvZH_wiCC6~P{v
zCA#Z=al{uAd@S;P6KsBr9c*#!FuI1t4{*mP@1XGqtT#p$T*Ebr%|3x`#^K5d4?RXk
VH;Kfo&&a|qx(&;-V1OMVegPH#S%Clm

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSuperInner.class b/testData/classes/pkg/TestSuperInner.class
new file mode 100644
index 0000000000000000000000000000000000000000..52fd2e2dbe20e435a5be391d9e0b48c4796397a7
GIT binary patch
literal 332
zcmY*VK~BRk5S(q320~~{+Ycad01o8B4b)2|q)JgawCddnD{vJY<Rtx9Pe>ei0FSD=
zwz$NWX1z1BW7&VlpI-ovn8oO09N{X$B*K&sE{$PJNPJzCs;;>v44$>o&79D`z1tFk
zMfJvnQKk*A+RvQrM&+e2ldLLKxm8xX{+|q*4=owvY{PZ4Zok<2@FzmNu3B60i*~cq
zuKci5dzB!<8DZF!B+H3usmy!&n(w%12(zx|#@~T!^yGzZk!%SQJeMx@JrLf1gAPLU
e5DN~3cGe5Q#GgZ{mtG%w9Ek_wl~0hFFbGcdsYU_-

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSuperInner2$Inner2.class b/testData/classes/pkg/TestSuperInner2$Inner2.class
new file mode 100644
index 0000000000000000000000000000000000000000..ef383b8301fddb6a9e52f4d7f076bc881779f7bb
GIT binary patch
literal 487
zcmZWl%Syvg5IvLLCN_;tn#Nim8=(trK}6hDbWsq5;HIVfv|cb0lah!3<w67(et;h(
z&P|G7%7wXe&di*7eE)oY0l30(3k|p?1bPPc4D1v1{3*<a7lf`qmsvh5)-t`1W0_t~
zICve#VSYpKPPd|G3xb#?kCI^fVJshtm!(YS!7^gT^^;W)ErK*uctZ-+ibX4Vf>k=x
zD9AF&{Gi@q_&0|+ONw+Q??R>R)#f~Z4qgKbP3RU392htx^lLdADFa7a^;L+_EV~hU
z^;IWoQ@bWe==^7J!lxB{WpW%fi}Dy7*x|p$=oT73pgkJDgGS>IXm1QPm~3@UQhu9l
hze<Azn-Le3a>T5|NJAGL{$2JO@UY8G1lJ6N_yuT{Yn=c9

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSuperInner2.class b/testData/classes/pkg/TestSuperInner2.class
new file mode 100644
index 0000000000000000000000000000000000000000..340b4de1bca97c26dd9a591d1d3f5a503a9cd5ec
GIT binary patch
literal 336
zcmZ9I&1%9x6ot>#XxcPtwc@%97qyED(w(K7K%o%2QQVI@;FL6xN#c9C61wOE_)yZ5
z#ElNzd(V9LkD24?_Yc4;`X1`IchPmxbMYW(e#Wu36M<ifAW~_nQ}Q<xo9tase;O?W
zPLQm%pc9%{f8{?*ZRctkk@Ui3rJ{whrnsM>lWh!Vbi=t$vsu2?w%Rfkc(Ww8EB#@L
z=KfXw<y-BP4;MFFb(IseFNt7q2`0m83m#G9D~lsEPGh{K8Z#E8@qB>nDQfWOn<W(7
XQTtT^W2?-!OW$D)Sj&H4PXo?BIR8f8

literal 0
HcmV?d00001

diff --git a/testData/results/TestSuperInner2.dec b/testData/results/TestSuperInner2.dec
new file mode 100644
index 0000000..81fbd8e
--- /dev/null
+++ b/testData/results/TestSuperInner2.dec
@@ -0,0 +1,17 @@
+class TestSuperInner2 extends TestSuperInner {
+   protected class Inner2 extends TestSuperInner.Inner {
+      protected Inner2() {
+         super();// 2
+      }
+   }
+}
+
+class 'TestSuperInner2$Inner2' {
+   method '<init> (LTestSuperInner2;)V' {
+      7      3
+      a      4
+   }
+}
+
+Lines mapping:
+2 <-> 4
diff --git a/testData/src/pkg/TestSuperInner.java b/testData/src/pkg/TestSuperInner.java
new file mode 100644
index 0000000..fed5da8
--- /dev/null
+++ b/testData/src/pkg/TestSuperInner.java
@@ -0,0 +1,6 @@
+public class TestSuperInner {
+  protected abstract class Inner {
+    protected Inner() {
+    }
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSuperInner2.java b/testData/src/pkg/TestSuperInner2.java
new file mode 100644
index 0000000..a16ba8e
--- /dev/null
+++ b/testData/src/pkg/TestSuperInner2.java
@@ -0,0 +1,4 @@
+class TestSuperInner2 extends TestSuperInner {
+  protected class Inner2 extends Inner {
+  }
+}
\ No newline at end of file

From 730bf5dfcd8f5c02cbe84866be11db87145ce095 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 11 Jan 2018 15:38:49 +0100
Subject: [PATCH 177/252] [java decompiler] corrects test data

---
 .../java/decompiler/SingleClassesTest.java    |   2 +-
 .../classes/pkg/TestSuperInner$Inner.class    | Bin 425 -> 0 bytes
 .../classes/pkg/TestSuperInner$Inner2.class   | Bin 0 -> 439 bytes
 testData/classes/pkg/TestSuperInner.class     | Bin 332 -> 283 bytes
 .../classes/pkg/TestSuperInner2$Inner2.class  | Bin 487 -> 0 bytes
 testData/classes/pkg/TestSuperInner2.class    | Bin 336 -> 0 bytes
 .../pkg/TestSuperInnerBase$Inner.class        | Bin 0 -> 376 bytes
 testData/classes/pkg/TestSuperInnerBase.class | Bin 0 -> 287 bytes
 testData/results/TestSuperInner.dec           |  19 ++++++++++++++++++
 testData/results/TestSuperInner2.dec          |  17 ----------------
 testData/src/pkg/TestSuperInner.java          |   9 ++++-----
 testData/src/pkg/TestSuperInner2.java         |   4 ----
 testData/src/pkg/TestSuperInnerBase.java      |   7 +++++++
 13 files changed, 31 insertions(+), 27 deletions(-)
 delete mode 100644 testData/classes/pkg/TestSuperInner$Inner.class
 create mode 100644 testData/classes/pkg/TestSuperInner$Inner2.class
 delete mode 100644 testData/classes/pkg/TestSuperInner2$Inner2.class
 delete mode 100644 testData/classes/pkg/TestSuperInner2.class
 create mode 100644 testData/classes/pkg/TestSuperInnerBase$Inner.class
 create mode 100644 testData/classes/pkg/TestSuperInnerBase.class
 create mode 100644 testData/results/TestSuperInner.dec
 delete mode 100644 testData/results/TestSuperInner2.dec
 delete mode 100644 testData/src/pkg/TestSuperInner2.java
 create mode 100644 testData/src/pkg/TestSuperInnerBase.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 83db194..1808d14 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -105,7 +105,7 @@ public class SingleClassesTest {
   @Test public void testPop2OneLongPop2() { doTest("pkg/TestPop2OneLongPop2"); }
   @Test public void testPop2TwoIntPop2() { doTest("pkg/TestPop2TwoIntPop2"); }
   @Test public void testPop2TwoIntTwoPop() { doTest("pkg/TestPop2TwoIntTwoPop"); }
-  @Test public void testSuperInner2() { doTest("pkg/TestSuperInner2", "pkg/TestSuperInner"); }
+  @Test public void testSuperInner() { doTest("pkg/TestSuperInner", "pkg/TestSuperInnerBase"); }
 
   // TODO: fix all below
   //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
diff --git a/testData/classes/pkg/TestSuperInner$Inner.class b/testData/classes/pkg/TestSuperInner$Inner.class
deleted file mode 100644
index 1148567a037fcfdc2eef748a2cc629cc23740621..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 425
zcmZ8d%SyvQ6g@YYHa5mKHZ|%}=%QAzF5D?DEC@o-MN9XSIOvp^NFM%|3lUuS0e+Nt
zC)GvEEbg2K=RUrFKED8*<FEr8eHQ|OgFOc!p<O-ca(G7Yqq!=pS^c7l+bmPX1#6c&
z)72Fr7;TEj3xb&D4~o!>bf)g==U5eU8K=zjqdbx6LKfQKKT?=RgjN$y@R~YJWmzhw
z!;J>R{~6p_UKfeF(Iz-pAMtc4U!{i@+8!M2J2)T=)-9_X-p*JjsmvZH_wiCC6~P{v
zCA#Z=al{uAd@S;P6KsBr9c*#!FuI1t4{*mP@1XGqtT#p$T*Ebr%|3x`#^K5d4?RXk
VH;Kfo&&a|qx(&;-V1OMVegPH#S%Clm

diff --git a/testData/classes/pkg/TestSuperInner$Inner2.class b/testData/classes/pkg/TestSuperInner$Inner2.class
new file mode 100644
index 0000000000000000000000000000000000000000..b7b9df55128f63e061ebaf58e748d8b4c69a3036
GIT binary patch
literal 439
zcmZut!AiqG5Pg$wvo?)3O>1k>i`av<phfUh@nAs^ikBAeTU|8TrX`#BUmis8;0O3o
z;%vl&q%7>bH}l>wGhg2yp8(F#si1^S4+2{ffkczwrjL>74hYTh>iOYhs!ck{Ryw(k
zW1S4Sejde9dO>I(t`i*H62xeEuL-qr6ziL8G1JLZ&E}l(Cd(|j(^rutjsLBWpVW);
zQHJY7q9xHLbcz#n^Epm=jz8e%U^G|8Xd|&h*elvDmC?UeLOC}OcGoRng+seUSZqRQ
z6_eH=_W6v0FG@jRH?WAg#0JL-vjaH%fNHP*2I}?S;k@P|kAIg%V7Y@TM+ZJajv=EG
NYN!jrwFb6@_yK6EXBhwh

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSuperInner.class b/testData/classes/pkg/TestSuperInner.class
index 52fd2e2dbe20e435a5be391d9e0b48c4796397a7..0629d9c950afe0870b7bbe9624e42aaa53a86156 100644
GIT binary patch
delta 199
zcmX@ZG@D8B)W2Q(7#J8#83ef)m>GE48Ti;4_}Li*7#Y|+^YT)Qj3z2rPVCUA7b?h3
z*AGc8E(tCzNG$?OF*1l@3OXegr!q1~VoIn$jAKw>U;<hM0*pY+&cFerIe{!$APo{>
o)!NR$xDhPP1ti(Pg3MAtUEDw}69W%Wh=G9%D9i%nv9hoL08Ahz761SM

literal 332
zcmY*VK~BRk5S(q320~~{+Ycad01o8B4b)2|q)JgawCddnD{vJY<Rtx9Pe>ei0FSD=
zwz$NWX1z1BW7&VlpI-ovn8oO09N{X$B*K&sE{$PJNPJzCs;;>v44$>o&79D`z1tFk
zMfJvnQKk*A+RvQrM&+e2ldLLKxm8xX{+|q*4=owvY{PZ4Zok<2@FzmNu3B60i*~cq
zuKci5dzB!<8DZF!B+H3usmy!&n(w%12(zx|#@~T!^yGzZk!%SQJeMx@JrLf1gAPLU
e5DN~3cGe5Q#GgZ{mtG%w9Ek_wl~0hFFbGcdsYU_-

diff --git a/testData/classes/pkg/TestSuperInner2$Inner2.class b/testData/classes/pkg/TestSuperInner2$Inner2.class
deleted file mode 100644
index ef383b8301fddb6a9e52f4d7f076bc881779f7bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmZWl%Syvg5IvLLCN_;tn#Nim8=(trK}6hDbWsq5;HIVfv|cb0lah!3<w67(et;h(
z&P|G7%7wXe&di*7eE)oY0l30(3k|p?1bPPc4D1v1{3*<a7lf`qmsvh5)-t`1W0_t~
zICve#VSYpKPPd|G3xb#?kCI^fVJshtm!(YS!7^gT^^;W)ErK*uctZ-+ibX4Vf>k=x
zD9AF&{Gi@q_&0|+ONw+Q??R>R)#f~Z4qgKbP3RU392htx^lLdADFa7a^;L+_EV~hU
z^;IWoQ@bWe==^7J!lxB{WpW%fi}Dy7*x|p$=oT73pgkJDgGS>IXm1QPm~3@UQhu9l
hze<Azn-Le3a>T5|NJAGL{$2JO@UY8G1lJ6N_yuT{Yn=c9

diff --git a/testData/classes/pkg/TestSuperInner2.class b/testData/classes/pkg/TestSuperInner2.class
deleted file mode 100644
index 340b4de1bca97c26dd9a591d1d3f5a503a9cd5ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 336
zcmZ9I&1%9x6ot>#XxcPtwc@%97qyED(w(K7K%o%2QQVI@;FL6xN#c9C61wOE_)yZ5
z#ElNzd(V9LkD24?_Yc4;`X1`IchPmxbMYW(e#Wu36M<ifAW~_nQ}Q<xo9tase;O?W
zPLQm%pc9%{f8{?*ZRctkk@Ui3rJ{whrnsM>lWh!Vbi=t$vsu2?w%Rfkc(Ww8EB#@L
z=KfXw<y-BP4;MFFb(IseFNt7q2`0m83m#G9D~lsEPGh{K8Z#E8@qB>nDQfWOn<W(7
XQTtT^W2?-!OW$D)Sj&H4PXo?BIR8f8

diff --git a/testData/classes/pkg/TestSuperInnerBase$Inner.class b/testData/classes/pkg/TestSuperInnerBase$Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..bb6539f36df72a2babd922c9283d617bca5888a9
GIT binary patch
literal 376
zcmZ{gPfNo<5XIjl+r+NX#(!1Ni_$||!Fchcc(5P{MGr0BH+897<F;fIzn2FQJoo|p
zP~s$bv$C+ieZ$+C$9#Q%d;&N_y9pm_5(4WX;t*Sepm;Q{b4u77E}o{zSi53WE_8ll
zt<JBM)938DFxC{8g#GS+rrte44CW7-&>9-6Z_DRY=VO&-T#=)BnNRe!sl@Kz5hpYC
zq9Qa9L<q4RVux_BJWZ$0MQHposyWD%bJ`K&s#B6FJ5BD=nVu8`zguN%FK;Ifc_D&#
yLvdWquU@P}tT3Cbj^ObDWdHaL)PINfT6-kl0eir|JghQ3MA&3XuKH+ULx>+M7gX*5

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSuperInnerBase.class b/testData/classes/pkg/TestSuperInnerBase.class
new file mode 100644
index 0000000000000000000000000000000000000000..2295e71ad667a939fe0d82af6089b46b0886f29c
GIT binary patch
literal 287
zcmZvXF>k^!6ol`Qgp?2pUD~Bc3=C}tGO-~BA|WB6b^vvE;0XnSL2<(W>Qsq=AJ89#
zc=1Xt+2{M-`6T~c&ldngJOyyj^6}`S?W05RW?FMj2(8AMGKLMIK1y|3j0w)$`!~Uj
z4{Ij0=c(q;a-VR%R7oZzSRBfH#nZGhFH1JXqC9eL%O=Y3V5?3lgpUWp^KrL{?jwXw
z6^b&YH_=zJ<yAp={Xg5c#pt0X->4SJmU7XC+`6I_@jiY*KXx3*S+~%UM@?}xghGHo
Js4LEM-5Ui%J^%m!

literal 0
HcmV?d00001

diff --git a/testData/results/TestSuperInner.dec b/testData/results/TestSuperInner.dec
new file mode 100644
index 0000000..840aa69
--- /dev/null
+++ b/testData/results/TestSuperInner.dec
@@ -0,0 +1,19 @@
+package pkg;
+
+class TestSuperInner extends TestSuperInnerBase {
+   protected abstract class Inner2 extends TestSuperInnerBase.Inner {
+      protected Inner2() {
+         super();// 4
+      }
+   }
+}
+
+class 'pkg/TestSuperInner$Inner2' {
+   method '<init> (Lpkg/TestSuperInner;)V' {
+      7      5
+      a      6
+   }
+}
+
+Lines mapping:
+4 <-> 6
diff --git a/testData/results/TestSuperInner2.dec b/testData/results/TestSuperInner2.dec
deleted file mode 100644
index 81fbd8e..0000000
--- a/testData/results/TestSuperInner2.dec
+++ /dev/null
@@ -1,17 +0,0 @@
-class TestSuperInner2 extends TestSuperInner {
-   protected class Inner2 extends TestSuperInner.Inner {
-      protected Inner2() {
-         super();// 2
-      }
-   }
-}
-
-class 'TestSuperInner2$Inner2' {
-   method '<init> (LTestSuperInner2;)V' {
-      7      3
-      a      4
-   }
-}
-
-Lines mapping:
-2 <-> 4
diff --git a/testData/src/pkg/TestSuperInner.java b/testData/src/pkg/TestSuperInner.java
index fed5da8..b5251ba 100644
--- a/testData/src/pkg/TestSuperInner.java
+++ b/testData/src/pkg/TestSuperInner.java
@@ -1,6 +1,5 @@
-public class TestSuperInner {
-  protected abstract class Inner {
-    protected Inner() {
-    }
-  }
+package pkg;
+
+class TestSuperInner extends TestSuperInnerBase {
+  protected abstract class Inner2 extends Inner { }
 }
\ No newline at end of file
diff --git a/testData/src/pkg/TestSuperInner2.java b/testData/src/pkg/TestSuperInner2.java
deleted file mode 100644
index a16ba8e..0000000
--- a/testData/src/pkg/TestSuperInner2.java
+++ /dev/null
@@ -1,4 +0,0 @@
-class TestSuperInner2 extends TestSuperInner {
-  protected class Inner2 extends Inner {
-  }
-}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSuperInnerBase.java b/testData/src/pkg/TestSuperInnerBase.java
new file mode 100644
index 0000000..e53ec09
--- /dev/null
+++ b/testData/src/pkg/TestSuperInnerBase.java
@@ -0,0 +1,7 @@
+package pkg;
+
+class TestSuperInnerBase {
+  protected abstract class Inner {
+    protected Inner() { }
+  }
+}
\ No newline at end of file

From 3b6cb5a9318557a808cea7c1740d826bd5c6ceef Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 18 Jan 2018 14:34:14 +0300
Subject: [PATCH 178/252] removed redundant method overriders after "Method is
 identical to its supermethod" inspection run

---
 .../java/decompiler/code/SimpleInstructionSequence.java       | 4 ----
 .../java/decompiler/modules/decompiler/ExprentStack.java      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
index 8f2f541..4a8399a 100644
--- a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
@@ -18,8 +18,4 @@ public class SimpleInstructionSequence extends InstructionSequence {
 
     return newseq;
   }
-
-  public void removeInstruction(int index) {
-    collinstr.remove(index);
-  }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
index e168569..f1db32f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
@@ -14,10 +14,6 @@ public class ExprentStack extends ListStack<Exprent> {
     pointer = list.getPointer();
   }
 
-  public void push(Exprent item) {
-    super.push(item);
-  }
-
   public Exprent pop() {
 
     return this.remove(--pointer);

From f720793431580006fbd719e6c9aa08cc5e195af7 Mon Sep 17 00:00:00 2001
From: Maxim Degtyarev <mdegtyarev@gmail.com>
Date: Tue, 23 Jan 2018 23:09:09 +0300
Subject: [PATCH 179/252] Treat identifiers containing `ignorable` characters
 as invalid; Add unit tests for `ConverterHelper` class.

---
 .../modules/renamer/ConverterHelper.java      |  38 ++++++-
 .../java/decompiler/ConverterHelperTest.java  | 106 ++++++++++++++++++
 2 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 test/org/jetbrains/java/decompiler/ConverterHelperTest.java

diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 606da45..93b3de7 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
+import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
 
 import java.util.Arrays;
@@ -29,13 +30,48 @@ public class ConverterHelper implements IIdentifierRenamer {
     String value = elementType == Type.ELEMENT_CLASS ? className : element;
     return value == null ||
            value.length() <= 2 ||
-           Character.isDigit(value.charAt(0)) ||
+           !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
              RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
              value.length() > 255 - ".class".length());
   }
 
+  /**
+   * Return {@code true} if, and only if identifier passed is compliant to JLS9 section 3.8 AND DOES NOT CONTAINS so-called "ignorable" characters.
+   * Ignorable characters are removed by javac silently during compilation and thus may appear only in specially crafted obfuscated classes.
+   * For more information about "ignorable" characters see <a href="https://bugs.openjdk.java.net/browse/JDK-7144981">JDK-7144981</a>.
+   *
+   * @param identifier Identifier to be checked
+   * @return {@code true} in case {@code identifier} passed can be used as an identifier; {@code false} otherwise.
+   */
+  private static boolean isValidIdentifier(boolean isMethod, String identifier) {
+
+    assert identifier != null : "Null identifier passed to the isValidIdentifier() method.";
+    assert !identifier.isEmpty() : "Empty identifier passed to the isValidIdentifier() method.";
+
+    if (isMethod && (identifier.equals(CodeConstants.INIT_NAME) || identifier.equals(CodeConstants.CLINIT_NAME))) {
+      return true;
+    }
+
+    if (!Character.isJavaIdentifierStart(identifier.charAt(0))) {
+      return false;
+    }
+
+    char[] chars = identifier.toCharArray();
+
+    for(int i = 1; i < chars.length; i++) {
+      char ch = chars[i];
+
+      if ((!Character.isJavaIdentifierPart(ch)) || Character.isIdentifierIgnorable(ch)) {
+        return false;
+      }
+    }
+
+    return true;
+
+  }
+
   // TODO: consider possible conflicts with not renamed classes, fields and methods!
   // We should get all relevant information here.
   @Override
diff --git a/test/org/jetbrains/java/decompiler/ConverterHelperTest.java b/test/org/jetbrains/java/decompiler/ConverterHelperTest.java
new file mode 100644
index 0000000..11e1e2f
--- /dev/null
+++ b/test/org/jetbrains/java/decompiler/ConverterHelperTest.java
@@ -0,0 +1,106 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler;
+
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer.Type;
+import org.jetbrains.java.decompiler.modules.renamer.ConverterHelper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ConverterHelperTest {
+
+  private static final String VALID_CLASS_NAME = "ValidClassName";
+  private static final String VALID_FIELD_NAME = "validFieldName";
+  private static final String VALID_METHOD_NAME = "validMethodName";
+
+  private static final String VALID_FIELD_DESCRIPTOR = "I";
+  private static final String VALID_METHOD_DESCRIPTOR = "()V";
+
+  private ConverterHelper converterHelper;
+
+  @Before
+  public void setUp() {
+    this.converterHelper = new ConverterHelper();
+  }
+
+  @After
+  public void tearDown() {
+    this.converterHelper = null;
+  }
+
+  @Test public void testValidClassName() { doTestClassName(VALID_CLASS_NAME, false); }
+  @Test public void testValidFieldName() { doTestFieldName(VALID_FIELD_NAME, VALID_FIELD_DESCRIPTOR, false); }
+  @Test public void testValidMethodName() { doTestMethodName(VALID_METHOD_NAME, VALID_METHOD_DESCRIPTOR, false); }
+
+  @Test public void testNullClassName() { doTestClassName(null, true); }
+  @Test public void testNullFieldName() { doTestFieldName(null, VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testNullMethodName() { doTestMethodName(null, VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testEmptyClassName() { doTestClassName("", true); }
+  @Test public void testEmptyFieldName() { doTestFieldName("", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testEmptyMethodName() { doTestMethodName("", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testShortClassName() { doTestClassName("C", true); }
+  @Test public void testShortFieldName() { doTestFieldName("f", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testShortMethodName() { doTestMethodName("m", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testUnderscoreClassName() { doTestClassName("_", true); }
+  @Test public void testUnderscoreFieldName() { doTestFieldName("_", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testUnderscoreMethodName() { doTestMethodName("_", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testKeywordClassName() { doTestClassName("public", true); }
+  @Test public void testKeywordFieldName() { doTestFieldName("public", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testKeywordMethodName() { doTestMethodName("public", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testReservedWindowsNamespaceClassName() { doTestClassName("nul", true); }
+  @Test public void testReservedWindowsNamespaceFieldName() { doTestFieldName("nul", VALID_FIELD_DESCRIPTOR, false); }
+  @Test public void testReservedWindowsNamespaceName() { doTestMethodName("nul", VALID_METHOD_DESCRIPTOR, false); }
+
+  @Test public void testLeadingDigitClassName() { doTestClassName("4identifier", true); }
+  @Test public void testLeadingDigitFieldName() { doTestFieldName("4identifier", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testLeadingDigitMethodName() { doTestMethodName("4identifier", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testInvalidLeadingCharClassName() { doTestClassName("\uFEFFClassName", true); }
+  @Test public void testInvalidLeadingCharFieldName() { doTestFieldName("\uFEFFfieldName", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testInvalidLeadingCharMethodName() { doTestMethodName("\uFEFFmethodName", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testInvalidMiddleCharClassName() { doTestClassName("Class\uFEFFName", true); }
+  @Test public void testInvalidMiddleCharFieldName() { doTestFieldName("field\uFEFFName", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testInvalidMiddleCharMethodName() { doTestMethodName("method\uFEFFName", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testInvalidTrailingCharClassName() { doTestClassName("ClassName\uFEFF", true); }
+  @Test public void testInvalidTrailingCharFieldName() { doTestFieldName("fieldName\uFEFF", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testInvalidTrailingCharMethodName() { doTestMethodName("methodName\uFEFF", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testLtInitGtClassName() { doTestClassName(CodeConstants.INIT_NAME, true); }
+  @Test public void testLtInitGtFieldName() { doTestFieldName(CodeConstants.INIT_NAME, VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testLtInitGtMethodName() { doTestMethodName(CodeConstants.INIT_NAME, VALID_METHOD_DESCRIPTOR, false); }
+
+  @Test public void testLtClinitGtClassName() { doTestClassName(CodeConstants.CLINIT_NAME, true); }
+  @Test public void testLtClinitGtFieldName() { doTestFieldName(CodeConstants.CLINIT_NAME, VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testLtClinitGtMethodName() { doTestMethodName(CodeConstants.CLINIT_NAME, VALID_METHOD_DESCRIPTOR, false); }
+
+
+
+  private void doTestClassName(String className, boolean shallBeRenamed) {
+    doTest(Type.ELEMENT_CLASS, className, null, null, shallBeRenamed);
+  }
+
+  private void doTestFieldName(String element, String descriptor, boolean shallBeRenamed) {
+    doTest(Type.ELEMENT_FIELD, VALID_CLASS_NAME, element, descriptor, shallBeRenamed);
+  }
+
+  private void doTestMethodName(String element, String descriptor, boolean shallBeRenamed) {
+    doTest(Type.ELEMENT_METHOD, VALID_CLASS_NAME, element, descriptor, shallBeRenamed);
+  }
+
+  private void doTest(Type elementType, String className, String element, String descriptor, boolean shallBeRenamed) {
+    boolean result = converterHelper.toBeRenamed(elementType, className, element, descriptor);
+    String assertionMessage = shallBeRenamed ? "Identifier { %s, %s, %s, %s } shall be renamed" : "Identifier { %s, %s, %s, %s } shall not be renamed";
+
+    Assert.assertTrue(String.format(assertionMessage, elementType.toString(), className, element, descriptor), result == shallBeRenamed);
+  }
+
+}

From 3d34c78ff6cc083cf65da789584f288e37b38a12 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 23 Jan 2018 18:24:24 +0300
Subject: [PATCH 180/252] IDEA project configuration: the great module rename

Rename all modules in IntelliJ IDEA sources to ensure that they follow a consistent naming scheme.

Rename iml files.
---
 java-decompiler-engine.iml => intellij.java.decompiler.engine.iml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename java-decompiler-engine.iml => intellij.java.decompiler.engine.iml (100%)

diff --git a/java-decompiler-engine.iml b/intellij.java.decompiler.engine.iml
similarity index 100%
rename from java-decompiler-engine.iml
rename to intellij.java.decompiler.engine.iml

From 60a161f0e3d789bf2ab52a3c3da445253b054274 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 31 Jan 2018 12:18:37 +0300
Subject: [PATCH 181/252] Cleanup (simplifies test setup; formatting)

---
 .../java/decompiler/ConverterHelperTest.java  | 36 +++++--------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/test/org/jetbrains/java/decompiler/ConverterHelperTest.java b/test/org/jetbrains/java/decompiler/ConverterHelperTest.java
index 11e1e2f..d05a848 100644
--- a/test/org/jetbrains/java/decompiler/ConverterHelperTest.java
+++ b/test/org/jetbrains/java/decompiler/ConverterHelperTest.java
@@ -4,32 +4,17 @@ package org.jetbrains.java.decompiler;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer.Type;
 import org.jetbrains.java.decompiler.modules.renamer.ConverterHelper;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
-public class ConverterHelperTest {
+import static org.junit.Assert.assertTrue;
 
+public class ConverterHelperTest {
   private static final String VALID_CLASS_NAME = "ValidClassName";
   private static final String VALID_FIELD_NAME = "validFieldName";
   private static final String VALID_METHOD_NAME = "validMethodName";
-
   private static final String VALID_FIELD_DESCRIPTOR = "I";
   private static final String VALID_METHOD_DESCRIPTOR = "()V";
 
-  private ConverterHelper converterHelper;
-
-  @Before
-  public void setUp() {
-    this.converterHelper = new ConverterHelper();
-  }
-
-  @After
-  public void tearDown() {
-    this.converterHelper = null;
-  }
-
   @Test public void testValidClassName() { doTestClassName(VALID_CLASS_NAME, false); }
   @Test public void testValidFieldName() { doTestFieldName(VALID_FIELD_NAME, VALID_FIELD_DESCRIPTOR, false); }
   @Test public void testValidMethodName() { doTestMethodName(VALID_METHOD_NAME, VALID_METHOD_DESCRIPTOR, false); }
@@ -82,25 +67,22 @@ public class ConverterHelperTest {
   @Test public void testLtClinitGtFieldName() { doTestFieldName(CodeConstants.CLINIT_NAME, VALID_FIELD_DESCRIPTOR, true); }
   @Test public void testLtClinitGtMethodName() { doTestMethodName(CodeConstants.CLINIT_NAME, VALID_METHOD_DESCRIPTOR, false); }
 
-
-
-  private void doTestClassName(String className, boolean shallBeRenamed) {
+  private static void doTestClassName(String className, boolean shallBeRenamed) {
     doTest(Type.ELEMENT_CLASS, className, null, null, shallBeRenamed);
   }
 
-  private void doTestFieldName(String element, String descriptor, boolean shallBeRenamed) {
+  private static void doTestFieldName(String element, String descriptor, boolean shallBeRenamed) {
     doTest(Type.ELEMENT_FIELD, VALID_CLASS_NAME, element, descriptor, shallBeRenamed);
   }
 
-  private void doTestMethodName(String element, String descriptor, boolean shallBeRenamed) {
+  private static void doTestMethodName(String element, String descriptor, boolean shallBeRenamed) {
     doTest(Type.ELEMENT_METHOD, VALID_CLASS_NAME, element, descriptor, shallBeRenamed);
   }
 
-  private void doTest(Type elementType, String className, String element, String descriptor, boolean shallBeRenamed) {
-    boolean result = converterHelper.toBeRenamed(elementType, className, element, descriptor);
+  private static void doTest(Type elementType, String className, String element, String descriptor, boolean shallBeRenamed) {
+    boolean result = new ConverterHelper().toBeRenamed(elementType, className, element, descriptor);
     String assertionMessage = shallBeRenamed ? "Identifier { %s, %s, %s, %s } shall be renamed" : "Identifier { %s, %s, %s, %s } shall not be renamed";
 
-    Assert.assertTrue(String.format(assertionMessage, elementType.toString(), className, element, descriptor), result == shallBeRenamed);
+    assertTrue(String.format(assertionMessage, elementType.toString(), className, element, descriptor), result == shallBeRenamed);
   }
-
-}
+}
\ No newline at end of file

From 4a790b1c7c4d649234ed9faeedbfc009eeeb9d61 Mon Sep 17 00:00:00 2001
From: Roman Ivanov <Roman.Ivanov@jetbrains.com>
Date: Thu, 1 Feb 2018 15:49:24 +0700
Subject: [PATCH 182/252] Apply common if parts inspection

---
 .../modules/decompiler/InlineSingleBlockHelper.java        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
index dd431f1..f6ee600 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
@@ -118,17 +118,14 @@ public class InlineSingleBlockHelper {
       StatEdge edge = lst.get(0);
 
       if (sameCatchRanges(edge)) {
-        if (edge.explicit) {
-          return true;
-        }
-        else {
+        if (!edge.explicit) {
           for (int i = index; i < seq.getStats().size(); i++) {
             if (!noExitLabels(seq.getStats().get(i), seq)) {
               return false;
             }
           }
-          return true;
         }
+        return true;
       }
       // FIXME: count labels properly
     }

From 7310e9e989eb6b0e8828e5cfd4da525713dd5fd8 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Fri, 16 Feb 2018 20:00:30 +0300
Subject: [PATCH 183/252] fixed line numbers when replacing nested access

---
 .../main/rels/NestedMemberAccess.java         | 11 +++++++++-
 testData/results/TestAccessReplace.dec        | 18 +++++++--------
 testData/results/TestClassFields.dec          | 10 ++++-----
 testData/results/TestSyntheticAccess.dec      | 22 +++++++++----------
 4 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index bbd027c..692a8b9 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -394,6 +394,11 @@ public class NestedMemberAccess {
           ret.replaceExprent(ret.getRight(), invexpr.getLstParameters().get(1));
           fexpr.replaceExprent(fexpr.getInstance(), invexpr.getLstParameters().get(0));
         }
+
+        // do not use copied bytecodes
+        ret.getLeft().bytecode = null;
+        ret.getRight().bytecode = null;
+
         retexprent = ret;
         break;
       case FUNCTION:
@@ -421,6 +426,10 @@ public class NestedMemberAccess {
 
 
     if (retexprent != null) {
+      // preserve original bytecodes
+      retexprent.bytecode = null;
+      retexprent.addBytecodeOffsets(invexpr.bytecode);
+
       // hide synthetic access method
       boolean hide = true;
 
diff --git a/testData/results/TestAccessReplace.dec b/testData/results/TestAccessReplace.dec
index 1177aa2..f365126 100644
--- a/testData/results/TestAccessReplace.dec
+++ b/testData/results/TestAccessReplace.dec
@@ -15,8 +15,8 @@ public class TestAccessReplace {
 
    public class Inner {
       public Inner(String b) {
-         TestAccessReplace.fooS();// 25
-         TestAccessReplace.this.foo();
+         TestAccessReplace.fooS();// 26
+         TestAccessReplace.this.foo();// 27
          TestAccessReplace.fooSParams(1L, 2L);// 28
          TestAccessReplace.this.fooParams(1L, 2L);// 29
       }// 30
@@ -43,14 +43,14 @@ class 'pkg/TestAccessReplace' {
 
 class 'pkg/TestAccessReplace$Inner' {
    method '<init> (Lpkg/TestAccessReplace;Ljava/lang/String;)V' {
-      0      17
-      1      18
-      2      19
-      3      20
+      9      17
+      d      18
       10      19
       11      19
+      14      19
       18      20
       19      20
+      1c      20
       1f      21
    }
 }
@@ -60,10 +60,10 @@ Lines mapping:
 20 <-> 8
 21 <-> 11
 22 <-> 14
-25 <-> 18
+26 <-> 18
+27 <-> 19
 28 <-> 20
 29 <-> 21
 30 <-> 22
 Not mapped:
-26
-27
+25
diff --git a/testData/results/TestClassFields.dec b/testData/results/TestClassFields.dec
index 6917171..ea272ea 100644
--- a/testData/results/TestClassFields.dec
+++ b/testData/results/TestClassFields.dec
@@ -8,7 +8,7 @@ public class TestClassFields {
    static {
       sizes = new int[names.length];// 15
       TestClassFields.Inner.staticMutable = 3;// 17
-      SIZE = TestClassFields.Inner.staticMutable;// 14 18
+      SIZE = TestClassFields.Inner.staticMutable;// 18
    }// 19
 
    private static class Inner {
@@ -18,20 +18,20 @@ public class TestClassFields {
 
 class 'pkg/TestClassFields' {
    method '<clinit> ()V' {
-      0      10
-      2      9
       11      8
       14      8
       17      8
-      1a      9
+      1b      9
+      1f      10
       22      10
       25      11
    }
 }
 
 Lines mapping:
-14 <-> 11
 15 <-> 9
 17 <-> 10
 18 <-> 11
 19 <-> 12
+Not mapped:
+14
diff --git a/testData/results/TestSyntheticAccess.dec b/testData/results/TestSyntheticAccess.dec
index 9f1c0ee..d5016a2 100644
--- a/testData/results/TestSyntheticAccess.dec
+++ b/testData/results/TestSyntheticAccess.dec
@@ -28,8 +28,8 @@ class TestSyntheticAccess {
       }// 19
 
       void incrementS() {
-         ++TestSyntheticAccess.s;// 22 23
-      }
+         ++TestSyntheticAccess.s;// 22
+      }// 23
 
       void decrementS() {
          TestSyntheticAccess.s--;// 26
@@ -39,46 +39,44 @@ class TestSyntheticAccess {
 
 class 'pkg/TestSyntheticAccess$Assigner' {
    method 'assignI (I)V' {
-      3      8
+      5      8
       9      9
    }
 
    method 'assignS (I)V' {
-      2      12
+      1      12
       5      13
    }
 }
 
 class 'pkg/TestSyntheticAccess$Incrementer' {
    method 'orI ()V' {
-      1      18
-      3      18
+      8      18
       b      18
-      c      18
+      d      18
       11      19
    }
 
    method 'incrementI ()V' {
       2      22
-      7      22
+      4      22
       8      23
    }
 
    method 'decrementI ()V' {
       2      26
-      6      26
+      4      26
       8      27
    }
 
    method 'incrementS ()V' {
       0      30
-      4      30
+      4      31
    }
 
    method 'decrementS ()V' {
       0      34
       4      35
-      5      34
    }
 }
 
@@ -90,7 +88,7 @@ Lines mapping:
 18 <-> 27
 19 <-> 28
 22 <-> 31
-23 <-> 31
+23 <-> 32
 26 <-> 35
 27 <-> 36
 32 <-> 9

From 8415f8e6f5cca6eb4938f6ccafaf9798baa27cbc Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Fri, 16 Feb 2018 21:02:19 +0300
Subject: [PATCH 184/252] cleanup: use putIfAbsent

---
 .../main/collectors/BytecodeMappingTracer.java         | 10 +++-------
 .../main/collectors/BytecodeSourceMapper.java          |  8 ++------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
index 449c5df..c6a23b3 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.struct.attr.StructLineNumberTableAttribute;
@@ -28,9 +28,7 @@ public class BytecodeMappingTracer {
   }
 
   public void addMapping(int bytecode_offset) {
-    if (!mapping.containsKey(bytecode_offset)) {
-      mapping.put(bytecode_offset, currentSourceLine);
-    }
+    mapping.putIfAbsent(bytecode_offset, currentSourceLine);
   }
 
   public void addMapping(Set<Integer> bytecode_offsets) {
@@ -44,9 +42,7 @@ public class BytecodeMappingTracer {
   public void addTracer(BytecodeMappingTracer tracer) {
     if (tracer != null) {
       for (Entry<Integer, Integer> entry : tracer.mapping.entrySet()) {
-        if (!mapping.containsKey(entry.getKey())) {
-          mapping.put(entry.getKey(), entry.getValue());
-        }
+        mapping.putIfAbsent(entry.getKey(), entry.getValue());
       }
     }
   }
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
index d5166b8..67fb04f 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -24,9 +22,7 @@ public class BytecodeSourceMapper {
     Map<Integer, Integer> method_mapping = class_mapping.computeIfAbsent(methodName, k -> new HashMap<>());
 
     // don't overwrite
-    if (!method_mapping.containsKey(bytecodeOffset)) {
-      method_mapping.put(bytecodeOffset, sourceLine);
-    }
+    method_mapping.putIfAbsent(bytecodeOffset, sourceLine);
   }
 
   public void addTracer(String className, String methodName, BytecodeMappingTracer tracer) {

From 6759c476efd2a59a74bfa331bb9a6fe5cbf4fb8f Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Thu, 1 Mar 2018 13:09:25 +0700
Subject: [PATCH 185/252] CleanUp: redundant String operation fixes applied

---
 src/org/jetbrains/java/decompiler/struct/gen/VarType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
index 384d31b..4362f38 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
@@ -82,7 +82,7 @@ public class VarType {  // TODO: optimize switch
           }
 
         default:
-          value = signature.substring(i, signature.length());
+          value = signature.substring(i);
           if ((clType && i == 0) || value.length() > 1) {
             type = CodeConstants.TYPE_OBJECT;
           }

From bc55d8d9ec87dfa867889111ea35d464f3b11d15 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 6 Mar 2018 17:10:28 +0100
Subject: [PATCH 186/252] [java decompiler] changes feedback address in README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 302aad0..225b42b 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 
 Fernflower is the first actually working analytical decompiler for Java and 
 probably for a high-level programming language in general. Naturally it is still 
-under development, please send your bug reports and improvement suggestions at 
-fernflower.decompiler@gmail.com
+under development, please send your bug reports and improvement suggestions to the
+[issue tracker](https://youtrack.jetbrains.com/newIssue?project=IDEA&clearDraft=true&c=Subsystem+Decompiler).
 
 ### Licence
 

From 429b66703122958bebddbeaf04462b33ec3c3073 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 6 Mar 2018 17:17:29 +0100
Subject: [PATCH 187/252] [java decompiler] restores thread-conscious context
 access (EA-116270)

---
 .../decompiler/main/DecompilerContext.java    | 82 ++++++++-----------
 .../java/decompiler/main/Fernflower.java      | 78 ++++++++++++------
 .../main/decompiler/BaseDecompiler.java       | 14 ++--
 .../main/decompiler/ConsoleDecompiler.java    | 36 ++++----
 .../decompiler/main/rels/ClassWrapper.java    |  4 +-
 .../main/rels/MethodProcessorRunnable.java    | 13 ++-
 .../decompiler/BulkDecompilationTest.java     |  6 +-
 .../java/decompiler/SingleClassesTest.java    |  8 +-
 8 files changed, 130 insertions(+), 111 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
index f75d751..e293635 100644
--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper;
@@ -10,8 +10,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
 import org.jetbrains.java.decompiler.struct.StructContext;
 
-import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
@@ -21,8 +19,6 @@ public class DecompilerContext {
   public static final String CURRENT_CLASS_NODE = "CURRENT_CLASS_NODE";
   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
 
-  private static volatile DecompilerContext currentContext = null;
-
   private final Map<String, Object> properties;
   private final IFernflowerLogger logger;
   private final StructContext structContext;
@@ -33,11 +29,16 @@ public class DecompilerContext {
   private CounterContainer counterContainer;
   private BytecodeSourceMapper bytecodeSourceMapper;
 
-  private DecompilerContext(Map<String, Object> properties,
-                            IFernflowerLogger logger,
-                            StructContext structContext,
-                            ClassesProcessor classProcessor,
-                            PoolInterceptor interceptor) {
+  public DecompilerContext(Map<String, Object> properties,
+                           IFernflowerLogger logger,
+                           StructContext structContext,
+                           ClassesProcessor classProcessor,
+                           PoolInterceptor interceptor) {
+    Objects.requireNonNull(properties);
+    Objects.requireNonNull(logger);
+    Objects.requireNonNull(structContext);
+    Objects.requireNonNull(classProcessor);
+
     this.properties = properties;
     this.logger = logger;
     this.structContext = structContext;
@@ -50,48 +51,31 @@ public class DecompilerContext {
   // context setup and update
   // *****************************************************************************
 
-  public static void initContext(Map<String, Object> customProperties,
-                                 IFernflowerLogger logger,
-                                 StructContext structContext,
-                                 ClassesProcessor classProcessor,
-                                 PoolInterceptor interceptor) {
-    Objects.requireNonNull(logger);
-    Objects.requireNonNull(structContext);
-    Objects.requireNonNull(classProcessor);
+  private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<>();
 
-    Map<String, Object> properties = new HashMap<>(IFernflowerPreferences.DEFAULTS);
-    if (customProperties != null) {
-      properties.putAll(customProperties);
-    }
-
-    String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
-    if (level != null) {
-      try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
-      }
-      catch (IllegalArgumentException ignore) { }
-    }
-
-    currentContext = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor);
+  public static DecompilerContext getCurrentContext() {
+    return currentContext.get();
   }
 
-  public static void clearContext() {
-    currentContext = null;
+  public static void setCurrentContext(DecompilerContext context) {
+    currentContext.set(context);
   }
 
   public static void setProperty(String key, Object value) {
-    currentContext.properties.put(key, value);
+    getCurrentContext().properties.put(key, value);
   }
 
   public static void startClass(ImportCollector importCollector) {
-    currentContext.importCollector = importCollector;
-    currentContext.counterContainer = new CounterContainer();
-    currentContext.bytecodeSourceMapper = new BytecodeSourceMapper();
+    DecompilerContext context = getCurrentContext();
+    context.importCollector = importCollector;
+    context.counterContainer = new CounterContainer();
+    context.bytecodeSourceMapper = new BytecodeSourceMapper();
   }
 
   public static void startMethod(VarProcessor varProcessor) {
-    currentContext.varProcessor = varProcessor;
-    currentContext.counterContainer = new CounterContainer();
+    DecompilerContext context = getCurrentContext();
+    context.varProcessor = varProcessor;
+    context.counterContainer = new CounterContainer();
   }
 
   // *****************************************************************************
@@ -99,7 +83,7 @@ public class DecompilerContext {
   // *****************************************************************************
 
   public static Object getProperty(String key) {
-    return currentContext.properties.get(key);
+    return getCurrentContext().properties.get(key);
   }
 
   public static boolean getOption(String key) {
@@ -112,34 +96,34 @@ public class DecompilerContext {
   }
 
   public static IFernflowerLogger getLogger() {
-    return currentContext.logger;
+    return getCurrentContext().logger;
   }
 
   public static StructContext getStructContext() {
-    return currentContext.structContext;
+    return getCurrentContext().structContext;
   }
 
   public static ClassesProcessor getClassProcessor() {
-    return currentContext.classProcessor;
+    return getCurrentContext().classProcessor;
   }
 
   public static PoolInterceptor getPoolInterceptor() {
-    return currentContext.poolInterceptor;
+    return getCurrentContext().poolInterceptor;
   }
 
   public static ImportCollector getImportCollector() {
-    return currentContext.importCollector;
+    return getCurrentContext().importCollector;
   }
 
   public static VarProcessor getVarProcessor() {
-    return currentContext.varProcessor;
+    return getCurrentContext().varProcessor;
   }
 
   public static CounterContainer getCounterContainer() {
-    return currentContext.counterContainer;
+    return getCurrentContext().counterContainer;
   }
 
   public static BytecodeSourceMapper getBytecodeSourceMapper() {
-    return currentContext.bytecodeSourceMapper;
+    return getCurrentContext().bytecodeSourceMapper;
   }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 1ad0080..b7ca4a8 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
@@ -14,27 +12,69 @@ import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
 import org.jetbrains.java.decompiler.util.TextBuffer;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public class Fernflower implements IDecompiledData {
   private final StructContext structContext;
   private final ClassesProcessor classProcessor;
-  private IIdentifierRenamer helper;
-  private IdentifierConverter converter;
+  private final IIdentifierRenamer helper;
+  private final IdentifierConverter converter;
+
+  public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> customProperties, IFernflowerLogger logger) {
+    Map<String, Object> properties = new HashMap<>(IFernflowerPreferences.DEFAULTS);
+    if (customProperties != null) {
+      properties.putAll(customProperties);
+    }
+
+    String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
+    if (level != null) {
+      try {
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
+      }
+      catch (IllegalArgumentException ignore) { }
+    }
 
-  public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
     structContext = new StructContext(saver, this, new LazyLoader(provider));
     classProcessor = new ClassesProcessor(structContext);
 
     PoolInterceptor interceptor = null;
-    Object rename = options.get(IFernflowerPreferences.RENAME_ENTITIES);
-    if ("1".equals(rename) || rename == null && "1".equals(IFernflowerPreferences.DEFAULTS.get(IFernflowerPreferences.RENAME_ENTITIES))) {
-      helper = loadHelper((String)options.get(IFernflowerPreferences.USER_RENAMER_CLASS));
+    if ("1".equals(properties.get(IFernflowerPreferences.RENAME_ENTITIES))) {
+      helper = loadHelper((String)properties.get(IFernflowerPreferences.USER_RENAMER_CLASS), logger);
       interceptor = new PoolInterceptor();
       converter = new IdentifierConverter(structContext, helper, interceptor);
     }
+    else {
+      helper = null;
+      converter = null;
+    }
 
-    DecompilerContext.initContext(options, logger, structContext, classProcessor, interceptor);
+    DecompilerContext context = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor);
+    DecompilerContext.setCurrentContext(context);
+  }
+
+  private static IIdentifierRenamer loadHelper(String className, IFernflowerLogger logger) {
+    if (className != null) {
+      try {
+        Class<?> renamerClass = Fernflower.class.getClassLoader().loadClass(className);
+        return (IIdentifierRenamer) renamerClass.getDeclaredConstructor().newInstance();
+      }
+      catch (Exception e) {
+        logger.writeMessage("Cannot load renamer '" + className + "'", IFernflowerLogger.Severity.WARN, e);
+      }
+    }
+
+    return new ConverterHelper();
+  }
+
+  public void addSource(File source) {
+    structContext.addSpace(source, true);
+  }
+
+  public void addLibrary(File library) {
+    structContext.addSpace(library, false);
   }
 
   public void decompileContext() {
@@ -47,24 +87,8 @@ public class Fernflower implements IDecompiledData {
     structContext.saveContext();
   }
 
-  private static IIdentifierRenamer loadHelper(String className) {
-    if (className != null) {
-      try {
-        Class<?> renamerClass = Fernflower.class.getClassLoader().loadClass(className);
-        return (IIdentifierRenamer) renamerClass.getDeclaredConstructor().newInstance();
-      }
-      catch (Exception ignored) { }
-    }
-
-    return new ConverterHelper();
-  }
-
   public void clearContext() {
-    DecompilerContext.clearContext();
-  }
-
-  public StructContext getStructContext() {
-    return structContext;
+    DecompilerContext.setCurrentContext(null);
   }
 
   @Override
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
index fb33f49..6d9152f 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.Fernflower;
@@ -11,22 +11,22 @@ import java.util.Map;
 
 @SuppressWarnings("unused")
 public class BaseDecompiler {
-  private final Fernflower fernflower;
+  private final Fernflower engine;
 
   public BaseDecompiler(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
-    fernflower = new Fernflower(provider, saver, options, logger);
+    engine = new Fernflower(provider, saver, options, logger);
   }
 
-  public void addSpace(File file, boolean isOwn) {
-    fernflower.getStructContext().addSpace(file, isOwn);
+  public void addSource(File source) {
+    engine.addSource(source);
   }
 
   public void decompileContext() {
     try {
-      fernflower.decompileContext();
+      engine.decompileContext();
     }
     finally {
-      fernflower.clearContext();
+      engine.clearContext();
     }
   }
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 7eaf57b..3b3819d 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -27,8 +27,8 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
     }
 
     Map<String, Object> mapOptions = new HashMap<>();
-    List<File> lstSources = new ArrayList<>();
-    List<File> lstLibraries = new ArrayList<>();
+    List<File> sources = new ArrayList<>();
+    List<File> libraries = new ArrayList<>();
 
     boolean isOption = true;
     for (int i = 0; i < args.length - 1; ++i) { // last parameter - destination
@@ -49,15 +49,15 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
         isOption = false;
 
         if (arg.startsWith("-e=")) {
-          addPath(lstLibraries, arg.substring(3));
+          addPath(libraries, arg.substring(3));
         }
         else {
-          addPath(lstSources, arg);
+          addPath(sources, arg);
         }
       }
     }
 
-    if (lstSources.isEmpty()) {
+    if (sources.isEmpty()) {
       System.out.println("error: no sources given");
       return;
     }
@@ -71,11 +71,11 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
     PrintStreamLogger logger = new PrintStreamLogger(System.out);
     ConsoleDecompiler decompiler = new ConsoleDecompiler(destination, mapOptions, logger);
 
-    for (File source : lstSources) {
-      decompiler.addSpace(source, true);
+    for (File source : sources) {
+      decompiler.addSource(source);
     }
-    for (File library : lstLibraries) {
-      decompiler.addSpace(library, false);
+    for (File library : libraries) {
+      decompiler.addLibrary(library);
     }
 
     decompiler.decompileContext();
@@ -97,25 +97,29 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   // *******************************************************************
 
   private final File root;
-  private final Fernflower fernflower;
+  private final Fernflower engine;
   private final Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<>();
   private final Map<String, Set<String>> mapArchiveEntries = new HashMap<>();
 
   protected ConsoleDecompiler(File destination, Map<String, Object> options, IFernflowerLogger logger) {
     root = destination;
-    fernflower = new Fernflower(this, this, options, logger);
+    engine = new Fernflower(this, this, options, logger);
   }
 
-  public void addSpace(File file, boolean isOwn) {
-    fernflower.getStructContext().addSpace(file, isOwn);
+  public void addSource(File source) {
+    engine.addSource(source);
+  }
+
+  public void addLibrary(File library) {
+    engine.addLibrary(library);
   }
 
   public void decompileContext() {
     try {
-      fernflower.decompileContext();
+      engine.decompileContext();
     }
     finally {
-      fernflower.clearContext();
+      engine.clearContext();
     }
   }
 
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 5b84ab3..9f41a37 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -62,7 +62,7 @@ public class ClassWrapper {
             root = MethodProcessorRunnable.codeToJava(mt, md, varProc);
           }
           else {
-            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, md, varProc);
+            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, md, varProc, DecompilerContext.getCurrentContext());
 
             Thread mtThread = new Thread(mtProc, "Java decompiler");
             long stopAt = System.currentTimeMillis() + maxSec * 1000;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 9f047d4..935589f 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -25,15 +25,20 @@ public class MethodProcessorRunnable implements Runnable {
   private final StructMethod method;
   private final MethodDescriptor methodDescriptor;
   private final VarProcessor varProc;
+  private final DecompilerContext parentContext;
 
   private volatile RootStatement root;
   private volatile Throwable error;
   private volatile boolean finished = false;
 
-  public MethodProcessorRunnable(StructMethod method, MethodDescriptor methodDescriptor, VarProcessor varProc) {
+  public MethodProcessorRunnable(StructMethod method,
+                                 MethodDescriptor methodDescriptor,
+                                 VarProcessor varProc,
+                                 DecompilerContext parentContext) {
     this.method = method;
     this.methodDescriptor = methodDescriptor;
     this.varProc = varProc;
+    this.parentContext = parentContext;
   }
 
   @Override
@@ -42,6 +47,7 @@ public class MethodProcessorRunnable implements Runnable {
     root = null;
 
     try {
+      DecompilerContext.setCurrentContext(parentContext);
       root = codeToJava(method, methodDescriptor, varProc);
     }
     catch (ThreadDeath ex) {
@@ -50,6 +56,9 @@ public class MethodProcessorRunnable implements Runnable {
     catch (Throwable ex) {
       error = ex;
     }
+    finally {
+      DecompilerContext.setCurrentContext(null);
+    }
 
     finished = true;
     synchronized (lock) {
diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
index bd39a8a..810c9ec 100644
--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+++ b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -36,7 +36,7 @@ public class BulkDecompilationTest {
     unpack(new File(fixture.getTestDataDir(), "bulk.jar"), classes);
 
     ConsoleDecompiler decompiler = fixture.getDecompiler();
-    decompiler.addSpace(classes, true);
+    decompiler.addSource(classes);
     decompiler.decompileContext();
 
     assertFilesEqual(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
@@ -55,7 +55,7 @@ public class BulkDecompilationTest {
   private void doTestJar(String name) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
     String jarName = name + ".jar";
-    decompiler.addSpace(new File(fixture.getTestDataDir(), jarName), true);
+    decompiler.addSource(new File(fixture.getTestDataDir(), jarName));
     decompiler.decompileContext();
 
     File unpacked = new File(fixture.getTempDir(), "unpacked");
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 1808d14..22d6cb4 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -125,14 +123,14 @@ public class SingleClassesTest {
     File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
     assertTrue(classFile.isFile());
     for (File file : collectClasses(classFile)) {
-      decompiler.addSpace(file, true);
+      decompiler.addSource(file);
     }
 
     for (String companionFile : companionFiles) {
       File companionClassFile = new File(fixture.getTestDataDir(), "/classes/" + companionFile + ".class");
       assertTrue(companionClassFile.isFile());
       for (File file : collectClasses(companionClassFile)) {
-        decompiler.addSpace(file, true);
+        decompiler.addSource(file);
       }
     }
 

From 2393cd9aa80eefd1dbbdfb4afe56018e7b76c992 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 7 Mar 2018 08:33:19 +0100
Subject: [PATCH 188/252] [java decompiler] restores plugin compatibility

---
 .../decompiler/main/decompiler/BaseDecompiler.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
index 6d9152f..dba1a64 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
@@ -21,6 +21,20 @@ public class BaseDecompiler {
     engine.addSource(source);
   }
 
+  public void addLibrary(File library) {
+    engine.addLibrary(library);
+  }
+
+  /** @deprecated use {@link #addSource(File)} / {@link #addLibrary(File)} instead */
+  public void addSpace(File file, boolean own) {
+    if (own) {
+      addSource(file);
+    }
+    else {
+      addLibrary(file);
+    }
+  }
+
   public void decompileContext() {
     try {
       engine.decompileContext();

From 95aa1ae2f0a001a38fa52d5f7336ced91c8fffcf Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 8 Mar 2018 11:34:42 +0100
Subject: [PATCH 189/252] Cleanup (warnings; formatting)

---
 .../java/decompiler/main/ClassWriter.java     | 23 ++++++--------
 .../java/decompiler/main/Fernflower.java      |  4 +--
 .../decompiler/main/rels/ClassWrapper.java    |  4 +--
 .../main/rels/MethodProcessorRunnable.java    | 31 ++++++-------------
 4 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 5d90668..a19bb36 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -517,10 +515,9 @@ public class ClassWriter {
           try {
             buffer.append(root.toJava(indent, tracer));
           }
-          catch (Throwable ex) {
-            DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.",
-                                                       IFernflowerLogger.Severity.WARN,
-                                                       ex);
+          catch (Throwable t) {
+            String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.";
+            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
             methodWrapper.decompiledWithErrors = true;
           }
         }
@@ -805,7 +802,6 @@ public class ClassWriter {
 
         buffer.append(';');
         buffer.appendLineSeparator();
-        tracer.incrementCurrentSourceLine();
       }
       else {
         if (!clinit && !dinit) {
@@ -831,11 +827,9 @@ public class ClassWriter {
             tracer.setCurrentSourceLine(codeTracer.getCurrentSourceLine());
             tracer.addTracer(codeTracer);
           }
-          catch (Throwable ex) {
-            DecompilerContext.getLogger()
-              .writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.",
-                            IFernflowerLogger.Severity.WARN,
-                            ex);
+          catch (Throwable t) {
+            String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.";
+            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
             methodWrapper.decompiledWithErrors = true;
           }
         }
@@ -850,8 +844,9 @@ public class ClassWriter {
           tracer.addMapping(root.getDummyExit().bytecode);
         }
         buffer.appendIndent(indent).append('}').appendLineSeparator();
-        tracer.incrementCurrentSourceLine();
       }
+
+      tracer.incrementCurrentSourceLine();
     }
     finally {
       DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD_WRAPPER, outerWrapper);
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index b7ca4a8..37a7db1 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -114,8 +114,8 @@ public class Fernflower implements IDecompiledData {
       classProcessor.writeClass(cl, buffer);
       return buffer.toString();
     }
-    catch (Throwable ex) {
-      DecompilerContext.getLogger().writeMessage("Class " + cl.qualifiedName + " couldn't be fully decompiled.", ex);
+    catch (Throwable t) {
+      DecompilerContext.getLogger().writeMessage("Class " + cl.qualifiedName + " couldn't be fully decompiled.", t);
       return null;
     }
   }
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 9f41a37..15a4898 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -122,9 +122,9 @@ public class ClassWrapper {
           }
         }
       }
-      catch (Throwable ex) {
+      catch (Throwable t) {
         String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.";
-        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, ex);
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
         isError = true;
       }
 
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 935589f..a639372 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -129,39 +129,26 @@ public class MethodProcessorRunnable implements Runnable {
 
     SequenceHelper.condenseSequences(root);
 
-    while (true) {
-      StackVarsProcessor stackProc = new StackVarsProcessor();
+    StackVarsProcessor stackProc = new StackVarsProcessor();
+
+    do {
       stackProc.simplifyStackVars(root, mt, cl);
-
       varProc.setVarVersions(root);
-
-      if (!new PPandMMHelper().findPPandMM(root)) {
-        break;
-      }
     }
+    while (new PPandMMHelper().findPPandMM(root));
 
     while (true) {
       LabelHelper.cleanUpEdges(root);
 
-      while (true) {
+      do {
         MergeHelper.enhanceLoops(root);
-
-        if (LoopExtractHelper.extractLoops(root)) {
-          continue;
-        }
-
-        if (!IfHelper.mergeAllIfs(root)) {
-          break;
-        }
       }
+      while (LoopExtractHelper.extractLoops(root) || IfHelper.mergeAllIfs(root));
 
       if (DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) {
         if (IdeaNotNullHelper.removeHardcodedChecks(root, mt)) {
           SequenceHelper.condenseSequences(root);
-
-          StackVarsProcessor stackProc = new StackVarsProcessor();
           stackProc.simplifyStackVars(root, mt, cl);
-
           varProc.setVarVersions(root);
         }
       }
@@ -178,9 +165,9 @@ public class MethodProcessorRunnable implements Runnable {
       }
 
       // FIXME: !!
-      //			if(!EliminateLoopsHelper.eliminateLoops(root)) {
-      //				break;
-      //			}
+      //if(!EliminateLoopsHelper.eliminateLoops(root)) {
+      //  break;
+      //}
     }
 
     ExitHelper.removeRedundantReturns(root);

From 6f30e387cf1c62df03a80c5fb66bfe65a15f4680 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 8 Mar 2018 13:33:07 +0100
Subject: [PATCH 190/252] [java decompiler] unnecessary rethrow (IDEA-187608;
 EA-81800)

No need to propagate ThreadDeath here - the thread is going to finish anyway.
---
 .../java/decompiler/main/rels/MethodProcessorRunnable.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index a639372..8217423 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -50,11 +50,8 @@ public class MethodProcessorRunnable implements Runnable {
       DecompilerContext.setCurrentContext(parentContext);
       root = codeToJava(method, methodDescriptor, varProc);
     }
-    catch (ThreadDeath ex) {
-      throw ex;
-    }
-    catch (Throwable ex) {
-      error = ex;
+    catch (Throwable t) {
+      error = t;
     }
     finally {
       DecompilerContext.setCurrentContext(null);

From 7c8e64da814095a53a658a5fee0bff51942a65a4 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 14 Mar 2018 15:59:37 +0700
Subject: [PATCH 191/252] StandardCharsets used where possible;
 try-with-resources used; cleanup

---
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java     | 3 ++-
 test/org/jetbrains/java/decompiler/DecompilerTestFixture.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 3b3819d..d79c8f9 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -9,6 +9,7 @@ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
@@ -238,7 +239,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       ZipOutputStream out = mapArchiveStreams.get(file);
       out.putNextEntry(new ZipEntry(entryName));
       if (content != null) {
-        out.write(content.getBytes("UTF-8"));
+        out.write(content.getBytes(StandardCharsets.UTF_8));
       }
     }
     catch (IOException ex) {
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index aebf570..50930ff 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -8,6 +8,7 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -106,7 +107,7 @@ public class DecompilerTestFixture {
 
   private static String getContent(File expected) {
     try {
-      return new String(InterpreterUtil.getBytes(expected), "UTF-8").replace("\r\n", "\n");
+      return new String(InterpreterUtil.getBytes(expected), StandardCharsets.UTF_8).replace("\r\n", "\n");
     }
     catch (IOException e) {
       throw new RuntimeException(e);

From a74a9d7d2537c2e21adc94c6126369c703ea7e80 Mon Sep 17 00:00:00 2001
From: Maxim Degtyarev <mdegtyarev@gmail.com>
Date: Fri, 27 Apr 2018 15:01:55 +0300
Subject: [PATCH 192/252] Fix NPE when decompiling constructor #654

---
 .../modules/decompiler/exps/ExprUtil.java     |  11 ++--
 .../java/decompiler/SingleClassesTest.java    |   3 +
 .../pkg/TestMissingConstructorCallBad.class   | Bin 0 -> 641 bytes
 .../pkg/TestMissingConstructorCallGood.class  | Bin 0 -> 699 bytes
 .../results/TestMissingConstructorCallBad.dec |  50 +++++++++++++++
 .../TestMissingConstructorCallGood.dec        |  60 ++++++++++++++++++
 .../pkg/TestMissingConstructorCallBad.jasm    |  42 ++++++++++++
 .../pkg/TestMissingConstructorCallGood.jasm   |  50 +++++++++++++++
 8 files changed, 212 insertions(+), 4 deletions(-)
 create mode 100644 testData/classes/pkg/TestMissingConstructorCallBad.class
 create mode 100644 testData/classes/pkg/TestMissingConstructorCallGood.class
 create mode 100644 testData/results/TestMissingConstructorCallBad.dec
 create mode 100644 testData/results/TestMissingConstructorCallGood.dec
 create mode 100644 testData/src/pkg/TestMissingConstructorCallBad.jasm
 create mode 100644 testData/src/pkg/TestMissingConstructorCallGood.jasm

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
index 90c6d90..b044570 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -1,12 +1,11 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 
 import java.util.ArrayList;
@@ -25,7 +24,11 @@ public class ExprUtil {
     ClassWrapper wrapper = node.getWrapper();
     if (wrapper != null) {
       // own class
-      mask = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor).synthParameters;
+      MethodWrapper methodWrapper = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor);
+      if (methodWrapper == null) {
+        return null;
+      }
+      mask = methodWrapper.synthParameters;
     }
     else if (parameters > 0 && node.type == ClassNode.CLASS_MEMBER && (node.access & CodeConstants.ACC_STATIC) == 0) {
       // non-static member class
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 22d6cb4..b9a6e4e 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -104,6 +104,9 @@ public class SingleClassesTest {
   @Test public void testPop2TwoIntPop2() { doTest("pkg/TestPop2TwoIntPop2"); }
   @Test public void testPop2TwoIntTwoPop() { doTest("pkg/TestPop2TwoIntTwoPop"); }
   @Test public void testSuperInner() { doTest("pkg/TestSuperInner", "pkg/TestSuperInnerBase"); }
+  @Test public void testMissingConstructorCallGood() { doTest("pkg/TestMissingConstructorCallGood"); }
+  @Test public void testMissingConstructorCallBad() { doTest("pkg/TestMissingConstructorCallBad"); }
+
 
   // TODO: fix all below
   //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
diff --git a/testData/classes/pkg/TestMissingConstructorCallBad.class b/testData/classes/pkg/TestMissingConstructorCallBad.class
new file mode 100644
index 0000000000000000000000000000000000000000..4c73fb14693d97dc07c3243908d5bac2c9359ef1
GIT binary patch
literal 641
zcmaKp&rae{6vn>`l?$~9;^;X3qiBriLN@L+E{4R7_$OjC#?=LG<YMV1?M31v_$02K
zg(jN#06vuQv}6L~V$!7T>G{s@`)<$2=j%Iw9jv8Mw2^|7!3uswZwodS;c{dcR?lT<
zj#L;b|E8+_&;<Ra(Lq&s-fz*`?uf9<kSuRrFqC??H<ka&8D=`-PE<VMld>J?foOP=
zA+@J`W%eCRB26^iH-D8%S55=vo4N_4Ag9@KZA3U}bY#=)M&5Q^_k*T9P!TRalGN`*
zBfrlPj7}5JW$Q*XZ;wRpJW9f`%)on*q31K?YRZ?#{cb}BahvRi?*FFR<**%O@iWSw
z<CtQwx<V0PEXXh`$25a`tQ)#@?+%pbxuKNqpe>9$kZw!6Z5hatgIN?9=E~P&haC%T
zRdq|EM2q@C3j`8$(Vqiti>iI97(J){AX#9~nAl=3u%74(A?dyX9(9pK4im`JTmc!(
zz$RLjoFA}6>>=wcW&_zbq^@3&xO{|Fdy4UCvYe;(2)RVaWmvI6k+3CFti!<u!9k{p
NLrxPkoToAY{sqqOiiiLJ

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestMissingConstructorCallGood.class b/testData/classes/pkg/TestMissingConstructorCallGood.class
new file mode 100644
index 0000000000000000000000000000000000000000..564f9b4209734d32d15fbe770ed5d0615817fb81
GIT binary patch
literal 699
zcmaKqPfr>_7{;Gj76-PA;vdjztBX~OCY6gf8!sgGP_#`kHKwNlCNj9}klmrgkKiZi
zSr3wE(htxN)$|?EKzrz6XLs_x&+mEOnf>+q;U|CtY-JF5NW-_wS{55v<;Zw=g_4H?
ze1^^5)n(;OCgwyXiHa_(I!a93ZyFs}MHqh2y2X$x?|x-i?1=B85{iff?N|>)Ba{p?
z?^UGCk&hS1Qm5{l=T4<7pJNr7x{0OeG8D?S3E@+tBb(;Xa^L*le!n9UQhRmXkDKyX
zS=0OkRKHG){FhFaG|Pyds~ge0IuX4yo0nsqf%j~zFk+aisYssoyA2tS$`o>(@$c-1
z9G;IHR_v5>9J35=S11BZ1sPAovA__V>V|Gz2Lly`K_X=^XbTezWYE$<TgI~FqliU@
zV)@(DkxYeltGXpoqDw2#Jpw5>)){nIwA-e)L+|w75d4-t7?x?Br8c|LSa6XaNwQCp
zBib=ry@R{J?lH5+hDc4c>)=!^5@DH4SCGLfvRH%tRdRTZ8+taMSYL=`?Q@SvUku@#
x|A1S&9pN*S@+B2*oH25XklPezhYa2lc9%Nd!AAv4)WhL?<fI_+JZ&B1{{T%~j;R0u

literal 0
HcmV?d00001

diff --git a/testData/results/TestMissingConstructorCallBad.dec b/testData/results/TestMissingConstructorCallBad.dec
new file mode 100644
index 0000000..a540d62
--- /dev/null
+++ b/testData/results/TestMissingConstructorCallBad.dec
@@ -0,0 +1,50 @@
+package pkg;
+
+public class TestMissingConstructorCallBad {
+   private TestMissingConstructorCallBad() {
+      System.out.println("Nobody will see what we do here!");// 14 15 16
+      this((Object)null);// 19 20
+   }// 21
+
+   public static void main(String... var0) {
+      try {
+         new TestMissingConstructorCallBad();
+      } catch (Throwable var2) {// 37
+         ;
+      }
+
+   }// 39
+}
+
+class 'pkg/TestMissingConstructorCallBad' {
+   method '<init> ()V' {
+      0      4
+      3      4
+      5      4
+      9      5
+      a      5
+      d      6
+   }
+
+   method 'main ([Ljava/lang/String;)V' {
+      b      11
+      c      15
+   }
+}
+
+Lines mapping:
+14 <-> 5
+15 <-> 5
+16 <-> 5
+19 <-> 6
+20 <-> 6
+21 <-> 7
+37 <-> 12
+39 <-> 16
+Not mapped:
+18
+28
+29
+30
+31
+33
diff --git a/testData/results/TestMissingConstructorCallGood.dec b/testData/results/TestMissingConstructorCallGood.dec
new file mode 100644
index 0000000..43af112
--- /dev/null
+++ b/testData/results/TestMissingConstructorCallGood.dec
@@ -0,0 +1,60 @@
+package pkg;
+
+public class TestMissingConstructorCallGood {
+   private TestMissingConstructorCallGood(Object var1) {
+   }// 16
+
+   private TestMissingConstructorCallGood() {
+      System.out.println("Nobody will see what we do here!");// 22 23 24
+      this((Object)null);// 27 28
+   }// 29
+
+   public static void main(String... var0) {
+      try {
+         new TestMissingConstructorCallGood();
+      } catch (Throwable var2) {// 45
+         ;
+      }
+
+   }// 47
+}
+
+class 'pkg/TestMissingConstructorCallGood' {
+   method '<init> (Ljava/lang/Object;)V' {
+      4      4
+   }
+
+   method '<init> ()V' {
+      0      7
+      3      7
+      5      7
+      9      8
+      a      8
+      d      9
+   }
+
+   method 'main ([Ljava/lang/String;)V' {
+      b      14
+      c      18
+   }
+}
+
+Lines mapping:
+16 <-> 5
+22 <-> 8
+23 <-> 8
+24 <-> 8
+27 <-> 9
+28 <-> 9
+29 <-> 10
+45 <-> 15
+47 <-> 19
+Not mapped:
+14
+15
+26
+36
+37
+38
+39
+41
diff --git a/testData/src/pkg/TestMissingConstructorCallBad.jasm b/testData/src/pkg/TestMissingConstructorCallBad.jasm
new file mode 100644
index 0000000..ff6f4b6
--- /dev/null
+++ b/testData/src/pkg/TestMissingConstructorCallBad.jasm
@@ -0,0 +1,42 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestMissingConstructorCallBad
+	version 52:0
+{
+
+private Method "<init>":"()V"
+	stack 2 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc	String "Nobody will see what we do here!";
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
+
+        aload_0;
+		aconst_null;
+		invokespecial	Method "<init>":"(Ljava/lang/Object;)V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 2 locals 2
+{
+		try t0;
+		new	class TestMissingConstructorCallBad;
+		dup;
+		invokespecial	Method "<init>":"()V";
+		pop;
+		endtry t0;
+		goto	L12;
+		catch t0 java/lang/Throwable;
+		stack_frame_type stack1;
+		stack_map class java/lang/Throwable;
+		astore_1;
+	L12:	stack_frame_type same;
+		return;
+}
+
+} // end Class TestMissingConstructorCallBad
diff --git a/testData/src/pkg/TestMissingConstructorCallGood.jasm b/testData/src/pkg/TestMissingConstructorCallGood.jasm
new file mode 100644
index 0000000..b08ac87
--- /dev/null
+++ b/testData/src/pkg/TestMissingConstructorCallGood.jasm
@@ -0,0 +1,50 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestMissingConstructorCallGood
+	version 52:0
+{
+
+private Method "<init>":"(Ljava/lang/Object;)V"
+	stack 1 locals 2
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+private Method "<init>":"()V"
+	stack 2 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc	String "Nobody will see what we do here!";
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
+
+        aload_0;
+		aconst_null;
+		invokespecial	Method "<init>":"(Ljava/lang/Object;)V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 2 locals 2
+{
+		try t0;
+		new	class TestMissingConstructorCallGood;
+		dup;
+		invokespecial	Method "<init>":"()V";
+		pop;
+		endtry t0;
+		goto	L12;
+		catch t0 java/lang/Throwable;
+		stack_frame_type stack1;
+		stack_map class java/lang/Throwable;
+		astore_1;
+	L12:	stack_frame_type same;
+		return;
+}
+
+} // end Class TestMissingConstructorCallGood

From 8be977e76c86dbb7f8effedec458aa3526cf5e73 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Fri, 27 Apr 2018 15:04:03 +0300
Subject: [PATCH 193/252] decompiler: do not fail on the invalid bytecode in
 IDEA

---
 .../java/decompiler/main/extern/IFernflowerPreferences.java | 6 +++---
 .../java/decompiler/modules/decompiler/exps/ExprUtil.java   | 3 ++-
 test/org/jetbrains/java/decompiler/SingleClassesTest.java   | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 3c0fac5..5af0b37 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -33,6 +31,7 @@ public interface IFernflowerPreferences {
   String IDEA_NOT_NULL_ANNOTATION = "inn";
   String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
   String BYTECODE_SOURCE_MAPPING = "bsm";
+  String FAIL_ON_INVALID_BYTECODE = "fib";
 
   String LOG_LEVEL = "log";
   String MAX_PROCESSING_METHOD = "mpm";
@@ -76,6 +75,7 @@ public interface IFernflowerPreferences {
     defaults.put(IDEA_NOT_NULL_ANNOTATION, "1");
     defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
     defaults.put(BYTECODE_SOURCE_MAPPING, "0");
+    defaults.put(FAIL_ON_INVALID_BYTECODE, "1");
 
     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
     defaults.put(MAX_PROCESSING_METHOD, "0");
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
index b044570..e3236c9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
@@ -25,7 +26,7 @@ public class ExprUtil {
     if (wrapper != null) {
       // own class
       MethodWrapper methodWrapper = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor);
-      if (methodWrapper == null) {
+      if (methodWrapper == null && !DecompilerContext.getOption(IFernflowerPreferences.FAIL_ON_INVALID_BYTECODE)) {
         return null;
       }
       mask = methodWrapper.synthParameters;
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index b9a6e4e..148945e 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -23,7 +23,8 @@ public class SingleClassesTest {
   public void setUp() throws IOException {
     fixture = new DecompilerTestFixture();
     fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
-                  IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1");
+                  IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
+                  IFernflowerPreferences.FAIL_ON_INVALID_BYTECODE, "0");
   }
 
   @After

From ba0e24955d971ba0a50185a00958f66fd267db0a Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Thu, 17 May 2018 19:12:39 +0300
Subject: [PATCH 194/252] inverted option for IDEA-CR-32210

---
 .../java/decompiler/main/extern/IFernflowerPreferences.java   | 4 ++--
 .../java/decompiler/modules/decompiler/exps/ExprUtil.java     | 2 +-
 test/org/jetbrains/java/decompiler/SingleClassesTest.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 5af0b37..7f2df24 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -31,7 +31,7 @@ public interface IFernflowerPreferences {
   String IDEA_NOT_NULL_ANNOTATION = "inn";
   String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
   String BYTECODE_SOURCE_MAPPING = "bsm";
-  String FAIL_ON_INVALID_BYTECODE = "fib";
+  String IGNOIRE_INVALID_BYTECODE = "iib";
 
   String LOG_LEVEL = "log";
   String MAX_PROCESSING_METHOD = "mpm";
@@ -75,7 +75,7 @@ public interface IFernflowerPreferences {
     defaults.put(IDEA_NOT_NULL_ANNOTATION, "1");
     defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
     defaults.put(BYTECODE_SOURCE_MAPPING, "0");
-    defaults.put(FAIL_ON_INVALID_BYTECODE, "1");
+    defaults.put(IGNOIRE_INVALID_BYTECODE, "0");
 
     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
     defaults.put(MAX_PROCESSING_METHOD, "0");
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
index e3236c9..c2b16dd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -26,7 +26,7 @@ public class ExprUtil {
     if (wrapper != null) {
       // own class
       MethodWrapper methodWrapper = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor);
-      if (methodWrapper == null && !DecompilerContext.getOption(IFernflowerPreferences.FAIL_ON_INVALID_BYTECODE)) {
+      if (methodWrapper == null && DecompilerContext.getOption(IFernflowerPreferences.IGNOIRE_INVALID_BYTECODE)) {
         return null;
       }
       mask = methodWrapper.synthParameters;
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 148945e..f2ab92b 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -24,7 +24,7 @@ public class SingleClassesTest {
     fixture = new DecompilerTestFixture();
     fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
                   IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
-                  IFernflowerPreferences.FAIL_ON_INVALID_BYTECODE, "0");
+                  IFernflowerPreferences.IGNOIRE_INVALID_BYTECODE, "1");
   }
 
   @After

From c4f23b9a16176d524060da2e1b3390a6f21497d3 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Mon, 21 May 2018 15:50:13 +0300
Subject: [PATCH 195/252] cleanup: spelling

---
 .../java/decompiler/main/extern/IFernflowerPreferences.java   | 4 ++--
 .../java/decompiler/modules/decompiler/exps/ExprUtil.java     | 2 +-
 test/org/jetbrains/java/decompiler/SingleClassesTest.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 7f2df24..7a965e8 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -31,7 +31,7 @@ public interface IFernflowerPreferences {
   String IDEA_NOT_NULL_ANNOTATION = "inn";
   String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
   String BYTECODE_SOURCE_MAPPING = "bsm";
-  String IGNOIRE_INVALID_BYTECODE = "iib";
+  String IGNORE_INVALID_BYTECODE = "iib";
 
   String LOG_LEVEL = "log";
   String MAX_PROCESSING_METHOD = "mpm";
@@ -75,7 +75,7 @@ public interface IFernflowerPreferences {
     defaults.put(IDEA_NOT_NULL_ANNOTATION, "1");
     defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
     defaults.put(BYTECODE_SOURCE_MAPPING, "0");
-    defaults.put(IGNOIRE_INVALID_BYTECODE, "0");
+    defaults.put(IGNORE_INVALID_BYTECODE, "0");
 
     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
     defaults.put(MAX_PROCESSING_METHOD, "0");
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
index c2b16dd..0e6f4a6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -26,7 +26,7 @@ public class ExprUtil {
     if (wrapper != null) {
       // own class
       MethodWrapper methodWrapper = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor);
-      if (methodWrapper == null && DecompilerContext.getOption(IFernflowerPreferences.IGNOIRE_INVALID_BYTECODE)) {
+      if (methodWrapper == null && DecompilerContext.getOption(IFernflowerPreferences.IGNORE_INVALID_BYTECODE)) {
         return null;
       }
       mask = methodWrapper.synthParameters;
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index f2ab92b..68cb460 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -24,7 +24,7 @@ public class SingleClassesTest {
     fixture = new DecompilerTestFixture();
     fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
                   IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
-                  IFernflowerPreferences.IGNOIRE_INVALID_BYTECODE, "1");
+                  IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1");
   }
 
   @After

From c5a0dc3acb2884ff379d86203fb6ba49bca8e4cc Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Mon, 21 May 2018 16:06:20 +0300
Subject: [PATCH 196/252] more descriptive exception for IDEA-CR-32210

---
 .../java/decompiler/modules/decompiler/exps/ExprUtil.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
index 0e6f4a6..302d62f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -26,8 +26,11 @@ public class ExprUtil {
     if (wrapper != null) {
       // own class
       MethodWrapper methodWrapper = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor);
-      if (methodWrapper == null && DecompilerContext.getOption(IFernflowerPreferences.IGNORE_INVALID_BYTECODE)) {
-        return null;
+      if (methodWrapper == null) {
+        if (DecompilerContext.getOption(IFernflowerPreferences.IGNORE_INVALID_BYTECODE)) {
+          return null;
+        }
+        throw new RuntimeException("Constructor " + node.classStruct.qualifiedName + "." + CodeConstants.INIT_NAME + descriptor + " not found");
       }
       mask = methodWrapper.synthParameters;
     }

From 43fec2e7bbb7540136423b991d9cabd5ff8136a6 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Sun, 17 Jun 2018 17:19:23 +0300
Subject: [PATCH 197/252] added missing @Deprecated to find these places later

---
 .../java/decompiler/main/decompiler/BaseDecompiler.java          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
index dba1a64..57bae44 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
@@ -26,6 +26,7 @@ public class BaseDecompiler {
   }
 
   /** @deprecated use {@link #addSource(File)} / {@link #addLibrary(File)} instead */
+  @Deprecated
   public void addSpace(File file, boolean own) {
     if (own) {
       addSource(file);

From 8824c20cbb0fd2320ac9a11a0c93469c43d78a24 Mon Sep 17 00:00:00 2001
From: stsypanov <stsypanov@luxoft.com>
Date: Wed, 25 Jul 2018 14:57:45 +0200
Subject: [PATCH 198/252] improve performance of logical conjunction
 (IDEA-182226)

---
 .../java/decompiler/modules/code/DeadCodeHelper.java     | 4 ++--
 .../java/decompiler/modules/decompiler/DecHelper.java    | 7 +++++--
 .../decompiler/modules/decompiler/FinallyProcessor.java  | 7 +++++--
 .../modules/decompiler/stats/CatchAllStatement.java      | 9 ++++++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
index 6f50c61..143dbca 100644
--- a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
@@ -216,14 +216,14 @@ public class DeadCodeHelper {
 
       for (int i = 0; i < node.getPreds().size(); i++) {
         BasicBlock pred = node.getPreds().get(i);
-        if (!marked.contains(pred) && pred != dom) {
+        if (pred != dom && !marked.contains(pred)) {
           lstNodes.add(pred);
         }
       }
 
       for (int i = 0; i < node.getPredExceptions().size(); i++) {
         BasicBlock pred = node.getPredExceptions().get(i);
-        if (!marked.contains(pred) && pred != dom) {
+        if (pred != dom && !marked.contains(pred)) {
           lstNodes.add(pred);
         }
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
index 50b76a7..8cfcdf7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
@@ -4,7 +4,10 @@ package org.jetbrains.java.decompiler.modules.decompiler;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 
 public class DecHelper {
@@ -145,7 +148,7 @@ public class DecHelper {
             if (head == statd) {
               return false;
             }
-            if (!setDest.contains(statd) && post != statd) {
+            if (post != statd && !setDest.contains(statd)) {
               if (post != null) {
                 return false;
               }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index 3e213da..d087783 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -1,7 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
-import org.jetbrains.java.decompiler.code.*;
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.code.Instruction;
+import org.jetbrains.java.decompiler.code.InstructionSequence;
+import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
 import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG;
@@ -321,7 +324,7 @@ public class FinallyProcessor {
 
       for (BasicBlock dest : lstSucc) {
         // break out
-        if (!setCopy.contains(dest) && dest != graph.getLast()) {
+        if (dest != graph.getLast() && !setCopy.contains(dest)) {
           // disable semaphore
           SimpleInstructionSequence seq = new SimpleInstructionSequence();
           seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 8d50513..6467acd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -5,7 +5,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
@@ -13,8 +12,12 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
 
 public class CatchAllStatement extends Statement {
 
@@ -75,7 +78,7 @@ public class CatchAllStatement extends Statement {
     for (StatEdge edge : head.getSuccessorEdges(StatEdge.TYPE_EXCEPTION)) {
       Statement exc = edge.getDestination();
 
-      if (edge.getExceptions() == null && setHandlers.contains(exc) && exc.getLastBasicType() == LASTBASICTYPE_GENERAL) {
+      if (edge.getExceptions() == null && exc.getLastBasicType() == LASTBASICTYPE_GENERAL && setHandlers.contains(exc)) {
         List<StatEdge> lstSuccs = exc.getSuccessorEdges(STATEDGE_DIRECT_ALL);
         if (lstSuccs.isEmpty() || lstSuccs.get(0).getType() != StatEdge.TYPE_REGULAR) {
 

From 02fdbec13231c16a8f8479a464327c57cd1a8681 Mon Sep 17 00:00:00 2001
From: temp1011 <34900092+temp1011@users.noreply.github.com>
Date: Tue, 31 Jul 2018 13:26:13 +0300
Subject: [PATCH 199/252] fix extra semicolon in decompiled empty blocks
 IDEA-196314 #843

---
 .../decompiler/stats/CatchStatement.java      |   6 +-
 .../modules/decompiler/stats/DoStatement.java |  12 ++-
 .../modules/decompiler/stats/IfStatement.java |  18 ++---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestEmptyBlocks.class    | Bin 0 -> 544 bytes
 testData/obfuscated/bc.java                   |   1 -
 testData/obfuscated/bd.java                   |   2 -
 testData/results/TestClassVar.dec             |  15 ++--
 testData/results/TestEmptyBlocks.dec          |  47 +++++++++++
 .../results/TestMissingConstructorCallBad.dec |   5 +-
 .../TestMissingConstructorCallGood.dec        |   5 +-
 testData/results/TestTryCatchFinally.dec      |  75 +++++++++---------
 testData/src/pkg/TestEmptyBlocks.java         |  48 +++++++++++
 13 files changed, 160 insertions(+), 75 deletions(-)
 create mode 100644 testData/classes/pkg/TestEmptyBlocks.class
 create mode 100644 testData/results/TestEmptyBlocks.dec
 create mode 100644 testData/src/pkg/TestEmptyBlocks.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index 87b9bd9..2c32d4c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -171,7 +169,7 @@ public class CatchStatement extends Statement {
       buf.append(vars.get(i - 1).toJava(indent, tracer));
       buf.append(") {").appendLineSeparator();
       tracer.incrementCurrentSourceLine();
-      buf.append(ExprProcessor.jmpWrapper(stat, indent + 1, true, tracer)).appendIndent(indent)
+      buf.append(ExprProcessor.jmpWrapper(stat, indent + 1, false, tracer)).appendIndent(indent)
         .append("}");
     }
     buf.appendLineSeparator();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
index 06a3a80..8abfc29 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.util.TextBuffer;
@@ -93,21 +91,21 @@ public class DoStatement extends Statement {
       case LOOP_DO:
         buf.appendIndent(indent).append("while(true) {").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("}").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
         break;
       case LOOP_DOWHILE:
         buf.appendIndent(indent).append("do {").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("} while(").append(conditionExprent.get(0).toJava(indent, tracer)).append(");").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
         break;
       case LOOP_WHILE:
         buf.appendIndent(indent).append("while(").append(conditionExprent.get(0).toJava(indent, tracer)).append(") {").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("}").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
         break;
@@ -120,7 +118,7 @@ public class DoStatement extends Statement {
           .append(conditionExprent.get(0).toJava(indent, tracer)).append("; ").append(incExprent.get(0).toJava(indent, tracer)).append(") {")
           .appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("}").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index 7962bb1..46fba5e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.util.TextBuffer;
@@ -204,24 +202,26 @@ public class IfStatement extends Statement {
     tracer.incrementCurrentSourceLine();
 
     if (ifstat == null) {
-      buf.appendIndent(indent + 1);
-
+      boolean semicolon = false;
       if (ifedge.explicit) {
+        semicolon = true;
         if (ifedge.getType() == StatEdge.TYPE_BREAK) {
           // break
-          buf.append("break");
+          buf.appendIndent(indent + 1).append("break");
         }
         else {
           // continue
-          buf.append("continue");
+          buf.appendIndent(indent + 1).append("continue");
         }
 
         if (ifedge.labeled) {
           buf.append(" label").append(ifedge.closure.id.toString());
         }
       }
-      buf.append(";").appendLineSeparator();
-      tracer.incrementCurrentSourceLine();
+      if(semicolon) {
+        buf.append(";").appendLineSeparator();
+        tracer.incrementCurrentSourceLine();
+      }
     }
     else {
       buf.append(ExprProcessor.jmpWrapper(ifstat, indent + 1, true, tracer));
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 68cb460..eb0cc2a 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -107,6 +107,7 @@ public class SingleClassesTest {
   @Test public void testSuperInner() { doTest("pkg/TestSuperInner", "pkg/TestSuperInnerBase"); }
   @Test public void testMissingConstructorCallGood() { doTest("pkg/TestMissingConstructorCallGood"); }
   @Test public void testMissingConstructorCallBad() { doTest("pkg/TestMissingConstructorCallBad"); }
+  @Test public void testEmptyBlocks() { doTest("pkg/TestEmptyBlocks"); }
 
 
   // TODO: fix all below
diff --git a/testData/classes/pkg/TestEmptyBlocks.class b/testData/classes/pkg/TestEmptyBlocks.class
new file mode 100644
index 0000000000000000000000000000000000000000..2f7e391dacb46a50d0668094bfa725dc4b18383e
GIT binary patch
literal 544
zcmZ8dO-oxr6g@XDc`tcM%$LS$s-*~}?V_pRF5<!xL7G~q642e`IqK-kn~+S3-TMbz
zx^<IvHU<>@0sftCM8x#I*BXj5%)N8Y+<WHC+&x|20$9PK3kPKfvkqRluuu-eoP&7>
z6@tC00%g_+*82}lLi~%~mxNqH1#+w3ZprSBX!*<(8`=|oQ*>2`|B-QXq<VxxV@LK(
zz1=at)_v`r^lB`3pf!OMuT4UB+X(OEo9IN1?1kWN>wedh8!A+vej)JbSo{<jB#|PN
z!hO{j!C|$2>dB5#Iw0gDwr`YQ{UL&V-Ok`O7TEa<rRU11|9k6LdWMh=<f&QL+LwZ*
z_~m<e3!A?w95GOMF-MnCl{0Zpd>ny>(Q%ri9g#(3c%S)OfGnmMrI4F6pGRWAvQ--(
z{?)3@CohpY0}aOaH?Vd`h+iRb0edk1{Xe#bkz@=B7O)UrxEQ%BGoE91mJL);!W%5{
i{ET-KBT25#qre?SUU}GchwC0e^Z+*(TAgM-hM7M%<7cD*

literal 0
HcmV?d00001

diff --git a/testData/obfuscated/bc.java b/testData/obfuscated/bc.java
index ee3c7f5..468d25f 100644
--- a/testData/obfuscated/bc.java
+++ b/testData/obfuscated/bc.java
@@ -150,7 +150,6 @@ public class bc extends DefaultHandler {
          var4.setContentHandler(this);
          var4.parse(new InputSource(var1));
       } catch (a_ var8) {
-         ;
       } finally {
          var1.close();
       }
diff --git a/testData/obfuscated/bd.java b/testData/obfuscated/bd.java
index af46c04..5368353 100644
--- a/testData/obfuscated/bd.java
+++ b/testData/obfuscated/bd.java
@@ -236,7 +236,6 @@ public class bd {
          try {
             b.update(var0.getBytes(j));
          } catch (UnsupportedEncodingException var4) {
-            ;
          }
 
          byte[] var2 = b.digest();
@@ -260,7 +259,6 @@ public class bd {
       try {
          var2 = (var0 + a).getBytes(j);
       } catch (UnsupportedEncodingException var9) {
-         ;
       }
 
       b.update(var2);
diff --git a/testData/results/TestClassVar.dec b/testData/results/TestClassVar.dec
index fb7cb0f..14e8b9e 100644
--- a/testData/results/TestClassVar.dec
+++ b/testData/results/TestClassVar.dec
@@ -28,7 +28,6 @@ public class TestClassVar {
       while(var1 < 10) {// 47
          int var2;
          for(var2 = var1; var1 < 10 && var1 == 0; ++var1) {// 49 51
-            ;
          }
 
          if (var2 != var1) {// 54
@@ -72,10 +71,10 @@ class 'pkg/TestClassVar' {
       d      29
       11      29
       14      29
-      1c      33
-      1f      34
-      22      34
-      28      38
+      1c      32
+      1f      33
+      22      33
+      28      37
    }
 }
 
@@ -90,8 +89,8 @@ Lines mapping:
 47 <-> 28
 49 <-> 30
 51 <-> 30
-54 <-> 34
-55 <-> 35
-58 <-> 39
+54 <-> 33
+55 <-> 34
+58 <-> 38
 Not mapped:
 57
diff --git a/testData/results/TestEmptyBlocks.dec b/testData/results/TestEmptyBlocks.dec
new file mode 100644
index 0000000..72a39b6
--- /dev/null
+++ b/testData/results/TestEmptyBlocks.dec
@@ -0,0 +1,47 @@
+import java.util.Random;
+
+public class TestEmptyBlocks {
+   public static void foo() {
+      try {
+         boolean var0 = false;// 22
+      } catch (Exception var1) {// 23
+      }
+
+      for(int i = 0; i < 5; ++i) {// 27
+      }
+
+      while((new Random()).nextBoolean()) {// 31
+      }
+
+      if ((new Random()).nextBoolean()) {// 35
+      }
+
+   }// 38
+}
+
+class 'TestEmptyBlocks' {
+   method 'foo ()V' {
+      0      5
+      1      5
+      5      6
+      6      9
+      7      9
+      9      9
+      a      9
+      d      9
+      1a      12
+      2a      15
+      2d      15
+      30      18
+   }
+}
+
+Lines mapping:
+22 <-> 6
+23 <-> 7
+27 <-> 10
+31 <-> 13
+35 <-> 16
+38 <-> 19
+Not mapped:
+25
diff --git a/testData/results/TestMissingConstructorCallBad.dec b/testData/results/TestMissingConstructorCallBad.dec
index a540d62..c4bec2b 100644
--- a/testData/results/TestMissingConstructorCallBad.dec
+++ b/testData/results/TestMissingConstructorCallBad.dec
@@ -10,7 +10,6 @@ public class TestMissingConstructorCallBad {
       try {
          new TestMissingConstructorCallBad();
       } catch (Throwable var2) {// 37
-         ;
       }
 
    }// 39
@@ -28,7 +27,7 @@ class 'pkg/TestMissingConstructorCallBad' {
 
    method 'main ([Ljava/lang/String;)V' {
       b      11
-      c      15
+      c      14
    }
 }
 
@@ -40,7 +39,7 @@ Lines mapping:
 20 <-> 6
 21 <-> 7
 37 <-> 12
-39 <-> 16
+39 <-> 15
 Not mapped:
 18
 28
diff --git a/testData/results/TestMissingConstructorCallGood.dec b/testData/results/TestMissingConstructorCallGood.dec
index 43af112..2173f97 100644
--- a/testData/results/TestMissingConstructorCallGood.dec
+++ b/testData/results/TestMissingConstructorCallGood.dec
@@ -13,7 +13,6 @@ public class TestMissingConstructorCallGood {
       try {
          new TestMissingConstructorCallGood();
       } catch (Throwable var2) {// 45
-         ;
       }
 
    }// 47
@@ -35,7 +34,7 @@ class 'pkg/TestMissingConstructorCallGood' {
 
    method 'main ([Ljava/lang/String;)V' {
       b      14
-      c      18
+      c      17
    }
 }
 
@@ -48,7 +47,7 @@ Lines mapping:
 28 <-> 9
 29 <-> 10
 45 <-> 15
-47 <-> 19
+47 <-> 18
 Not mapped:
 14
 15
diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
index 092564e..2af717c 100644
--- a/testData/results/TestTryCatchFinally.dec
+++ b/testData/results/TestTryCatchFinally.dec
@@ -8,7 +8,6 @@ public class TestTryCatchFinally {
          try {
             System.out.println("sout2");// 27
          } catch (Exception var8) {// 28
-            ;
          }
       } finally {
          System.out.println("finally");// 34
@@ -49,36 +48,36 @@ class 'pkg/TestTryCatchFinally' {
       17      8
       19      8
       1f      9
-      2b      13
-      2d      13
-      30      13
-      38      16
+      2b      12
+      2d      12
+      30      12
+      38      15
    }
 
    method 'foo (I)I' {
-      1      19
-      2      19
-      c      20
-      e      21
-      f      21
-      13      22
-      1b      24
+      1      18
+      2      18
+      c      19
+      e      20
+      f      20
+      13      21
+      1b      23
    }
 
    method 'test (Ljava/lang/String;)I' {
-      1      30
-      4      30
-      e      31
-      f      32
-      10      33
-      1a      33
-      23      33
-      26      33
-      31      38
-      34      35
-      35      35
-      38      35
-      3f      38
+      1      29
+      4      29
+      e      30
+      f      31
+      10      32
+      1a      32
+      23      32
+      26      32
+      31      37
+      34      34
+      35      34
+      38      34
+      3f      37
    }
 }
 
@@ -86,19 +85,19 @@ Lines mapping:
 24 <-> 6
 27 <-> 9
 28 <-> 10
-34 <-> 14
-36 <-> 17
-39 <-> 20
-40 <-> 21
-41 <-> 22
-42 <-> 23
-45 <-> 25
-51 <-> 31
-52 <-> 33
-53 <-> 34
-55 <-> 36
-56 <-> 39
-57 <-> 39
+34 <-> 13
+36 <-> 16
+39 <-> 19
+40 <-> 20
+41 <-> 21
+42 <-> 22
+45 <-> 24
+51 <-> 30
+52 <-> 32
+53 <-> 33
+55 <-> 35
+56 <-> 38
+57 <-> 38
 Not mapped:
 25
 32
diff --git a/testData/src/pkg/TestEmptyBlocks.java b/testData/src/pkg/TestEmptyBlocks.java
new file mode 100644
index 0000000..30e196f
--- /dev/null
+++ b/testData/src/pkg/TestEmptyBlocks.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.util.Random;
+
+public class TestEmptyBlocks {
+
+  public static void foo() {
+    try {
+      int a = 0;  //make sure whole try/catch not removed by compiler
+    } catch(Exception e) {
+
+    }
+
+    for(int i = 0; i < 5; i++) {
+
+    }
+
+    while(new Random().nextBoolean()) {
+
+    }
+
+    if(new Random().nextBoolean()) {
+
+    }
+  }
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file

From 2431c0fe94029c3e8f76cae957b798baa05b88fa Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Fri, 10 Aug 2018 14:59:17 +0200
Subject: [PATCH 200/252] Hiding default constructor with respect to its access
 modifiers

---
 .../java/decompiler/main/ClassWriter.java     |  20 ++++++++++++--
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../pkg/TestPrivateEmptyConstructor.class     | Bin 0 -> 420 bytes
 .../results/TestPrivateEmptyConstructor.dec   |  26 ++++++++++++++++++
 .../src/pkg/TestPrivateEmptyConstructor.java  |  10 +++++++
 5 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 testData/classes/pkg/TestPrivateEmptyConstructor.class
 create mode 100644 testData/results/TestPrivateEmptyConstructor.dec
 create mode 100644 testData/src/pkg/TestPrivateEmptyConstructor.java

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index a19bb36..42ef5f4 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -820,7 +820,7 @@ public class ClassWriter {
             BytecodeMappingTracer codeTracer = new BytecodeMappingTracer(tracer.getCurrentSourceLine());
             TextBuffer code = root.toJava(indent + 1, codeTracer);
 
-            hideMethod = (clinit || dinit || hideConstructor(wrapper, init, throwsExceptions, paramCount)) && code.length() == 0;
+            hideMethod = (code.length() == 0) && (clinit || dinit || hideConstructor(node, init, throwsExceptions, paramCount, flags));
 
             buffer.append(code);
 
@@ -859,13 +859,25 @@ public class ClassWriter {
     return !hideMethod;
   }
 
-  private static boolean hideConstructor(ClassWrapper wrapper, boolean init, boolean throwsExceptions, int paramCount) {
+  private static boolean hideConstructor(ClassNode node, boolean init, boolean throwsExceptions, int paramCount, int methodAccessFlags) {
+
     if (!init || throwsExceptions || paramCount > 0 || !DecompilerContext.getOption(IFernflowerPreferences.HIDE_DEFAULT_CONSTRUCTOR)) {
       return false;
     }
 
+    ClassWrapper wrapper = node.getWrapper();
+	  StructClass cl = wrapper.getClassStruct();
+
+	  int classAccesFlags = node.type == ClassNode.CLASS_ROOT ? cl.getAccessFlags() : node.access;
+    boolean isEnum = cl.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
+
+    // default constructor requires same accessibility flags. Exception: enum constructor which is always private
+  	if(!isEnum && ((classAccesFlags & ACCESSIBILITY_FLAGS) != (methodAccessFlags & ACCESSIBILITY_FLAGS))) {
+  	  return false;
+  	}
+
     int count = 0;
-    for (StructMethod mt : wrapper.getClassStruct().getMethods()) {
+    for (StructMethod mt : cl.getMethods()) {
       if (CodeConstants.INIT_NAME.equals(mt.getName())) {
         if (++count > 1) {
           return false;
@@ -1031,6 +1043,8 @@ public class ClassWriter {
   private static final int FIELD_EXCLUDED = CodeConstants.ACC_PUBLIC | CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL;
   private static final int METHOD_EXCLUDED = CodeConstants.ACC_PUBLIC | CodeConstants.ACC_ABSTRACT;
 
+  private static final int ACCESSIBILITY_FLAGS = CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE;
+
   private static void appendModifiers(TextBuffer buffer, int flags, int allowed, boolean isInterface, int excluded) {
     flags &= allowed;
     if (!isInterface) excluded = 0;
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index eb0cc2a..c8a7cad 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -108,6 +108,7 @@ public class SingleClassesTest {
   @Test public void testMissingConstructorCallGood() { doTest("pkg/TestMissingConstructorCallGood"); }
   @Test public void testMissingConstructorCallBad() { doTest("pkg/TestMissingConstructorCallBad"); }
   @Test public void testEmptyBlocks() { doTest("pkg/TestEmptyBlocks"); }
+  @Test public void testPrivateEmptyConstructor() { doTest("pkg/TestPrivateEmptyConstructor"); }
 
 
   // TODO: fix all below
diff --git a/testData/classes/pkg/TestPrivateEmptyConstructor.class b/testData/classes/pkg/TestPrivateEmptyConstructor.class
new file mode 100644
index 0000000000000000000000000000000000000000..cf452491f39304de763af86a8a2538f6d1e63ad1
GIT binary patch
literal 420
zcmaJ-O-sW-5Ph4bNs~rfTkBU5ya;U%2Ekj!OVLwNA*J_CT*{VYQ<6=gKT8h^9{d6R
zC~*=&J&3!oGyCSfna8|;yuJarK;MOhZ3iv18)&-NLB~ed#x8?(DV5Y$47I^<&R|Z`
z2f@&qN+oWKBox_<hcO|h7P)3{gS5yZaU)CYWJcJ1Cf8hx>tv-jlT_t8D<Yj{XG^~3
z9&9vh^gQfg-^PK5LmV;m|IsnDOQj!kweau4rHE+iFDTgLS|nsQEvV3&R%Ds_WJBpd
zXM!hVhVCCQgS{$Au_E2zOIS@Il~jxIaE^1-X;I}d=#qCZIP^QF$SBrFFJO<9&?4xy
iD$t~LHovK-BrK`U6O2yn8Rie&r4p*HWnYhS16!X%#aZwG

literal 0
HcmV?d00001

diff --git a/testData/results/TestPrivateEmptyConstructor.dec b/testData/results/TestPrivateEmptyConstructor.dec
new file mode 100644
index 0000000..c2a5aa4
--- /dev/null
+++ b/testData/results/TestPrivateEmptyConstructor.dec
@@ -0,0 +1,26 @@
+public final class TestPrivateEmptyConstructor {
+   private TestPrivateEmptyConstructor() {
+   }// 4
+
+   public final void test() {
+      System.out.println("test");// 7
+   }// 8
+}
+
+class 'TestPrivateEmptyConstructor' {
+   method '<init> ()V' {
+      4      2
+   }
+
+   method 'test ()V' {
+      0      5
+      3      5
+      5      5
+      8      6
+   }
+}
+
+Lines mapping:
+4 <-> 3
+7 <-> 6
+8 <-> 7
diff --git a/testData/src/pkg/TestPrivateEmptyConstructor.java b/testData/src/pkg/TestPrivateEmptyConstructor.java
new file mode 100644
index 0000000..2a54b6a
--- /dev/null
+++ b/testData/src/pkg/TestPrivateEmptyConstructor.java
@@ -0,0 +1,10 @@
+
+public final class PrivateEmptyConstructor {
+
+   private PrivateEmptyConstructor() {}
+
+   public final void test() {
+		System.out.println("test");
+   }
+}
+

From 7e98f686c0683344c12b02fd35d70769ef05aa22 Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Fri, 10 Aug 2018 15:00:26 +0200
Subject: [PATCH 201/252] Decompilation of synchronized blocks generated by the
 Kotlin compiler

---
 .../main/extern/IFernflowerPreferences.java   |   2 +
 .../main/rels/MethodProcessorRunnable.java    |   5 +
 .../modules/code/DeadCodeHelper.java          | 147 ++++++++++++++++++
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../pkg/TestSynchronizedUnprotected.class     | Bin 0 -> 532 bytes
 .../results/TestSynchronizedUnprotected.dec   |  25 +++
 6 files changed, 180 insertions(+)
 create mode 100644 testData/classes/pkg/TestSynchronizedUnprotected.class
 create mode 100644 testData/results/TestSynchronizedUnprotected.dec

diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 7a965e8..3c1f622 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -17,6 +17,7 @@ public interface IFernflowerPreferences {
   String HIDE_DEFAULT_CONSTRUCTOR = "hdc";
   String DECOMPILE_GENERIC_SIGNATURES = "dgs";
   String NO_EXCEPTIONS_RETURN = "ner";
+  String KT_SYNCHRONIZED_MONITOR = "ksm";
   String DECOMPILE_ENUM = "den";
   String REMOVE_GET_CLASS_NEW = "rgn";
   String LITERALS_AS_IS = "lit";
@@ -61,6 +62,7 @@ public interface IFernflowerPreferences {
     defaults.put(HIDE_DEFAULT_CONSTRUCTOR, "1");
     defaults.put(DECOMPILE_GENERIC_SIGNATURES, "0");
     defaults.put(NO_EXCEPTIONS_RETURN, "1");
+    defaults.put(KT_SYNCHRONIZED_MONITOR, "1");
     defaults.put(DECOMPILE_ENUM, "1");
     defaults.put(REMOVE_GET_CLASS_NEW, "1");
     defaults.put(LITERALS_AS_IS, "0");
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 8217423..cc5417a 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -88,6 +88,11 @@ public class MethodProcessorRunnable implements Runnable {
       ExceptionDeobfuscator.removeEmptyRanges(graph);
     }
 
+    if (DecompilerContext.getOption(IFernflowerPreferences.KT_SYNCHRONIZED_MONITOR)) {
+      // special case: search for 'synchronized' ranges w/o monitorexit instruction (generated by the Kotlin compiler)
+      DeadCodeHelper.extendSynchronizedRangeToMonitorexit(graph);
+    }
+
     if (DecompilerContext.getOption(IFernflowerPreferences.NO_EXCEPTIONS_RETURN)) {
       // special case: single return instruction outside of a protected range
       DeadCodeHelper.incorporateValueReturns(graph);
diff --git a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
index 143dbca..9d28d0e 100644
--- a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.code;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.Instruction;
 import org.jetbrains.java.decompiler.code.InstructionSequence;
+import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
 import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG;
@@ -254,6 +255,152 @@ public class DeadCodeHelper {
     }
   }
 
+  public static void extendSynchronizedRangeToMonitorexit(ControlFlowGraph graph) {
+
+    while(true) {
+
+      boolean range_extended = false;
+
+      for (ExceptionRangeCFG range : graph.getExceptions()) {
+
+        Set<BasicBlock> setPreds = new HashSet<>();
+        for (BasicBlock block : range.getProtectedRange()) {
+          setPreds.addAll(block.getPreds());
+        }
+        setPreds.removeAll(range.getProtectedRange());
+
+        if(setPreds.size() != 1) {
+          continue; // multiple predecessors, obfuscated range
+        }
+
+        BasicBlock predBlock = setPreds.iterator().next();
+        InstructionSequence predSeq = predBlock.getSeq();
+        if(predSeq.isEmpty() || predSeq.getLastInstr().opcode != CodeConstants.opc_monitorenter) {
+          continue; // not a synchronized range
+        }
+
+        boolean monitorexit_in_range = false;
+        Set<BasicBlock> setProtectedBlocks = new HashSet<>();
+        setProtectedBlocks.addAll(range.getProtectedRange());
+        setProtectedBlocks.add(range.getHandler());
+
+        for (BasicBlock block : setProtectedBlocks) {
+          InstructionSequence blockSeq = block.getSeq();
+          for (int i = 0; i < blockSeq.length(); i++) {
+            if (blockSeq.getInstr(i).opcode == CodeConstants.opc_monitorexit) {
+              monitorexit_in_range = true;
+              break;
+            }
+          }
+          if(monitorexit_in_range) {
+            break;
+          }
+        }
+
+        if(monitorexit_in_range) {
+          continue; // protected range already contains monitorexit
+        }
+
+        Set<BasicBlock> setSuccs = new HashSet<>();
+        for (BasicBlock block : range.getProtectedRange()) {
+          setSuccs.addAll(block.getSuccs());
+        }
+        setSuccs.removeAll(range.getProtectedRange());
+
+        if(setSuccs.size() != 1) {
+          continue; // non-unique successor
+        }
+
+        BasicBlock succBlock = setSuccs.iterator().next();
+        InstructionSequence succSeq = succBlock.getSeq();
+
+        int succ_monitorexit_index = -1;
+        for (int i = 0; i < succSeq.length(); i++) {
+          if (succSeq.getInstr(i).opcode == CodeConstants.opc_monitorexit) {
+            succ_monitorexit_index = i;
+            break;
+          }
+        }
+
+        if(succ_monitorexit_index < 0) {
+          continue; // monitorexit not found in the single successor block
+        }
+
+        BasicBlock handlerBlock = range.getHandler();
+        if(handlerBlock.getSuccs().size() != 1) {
+          continue; // non-unique handler successor
+        }
+        BasicBlock succHandler = handlerBlock.getSuccs().get(0);
+        InstructionSequence succHandlerSeq = succHandler.getSeq();
+        if(succHandlerSeq.isEmpty() || succHandlerSeq.getLastInstr().opcode != CodeConstants.opc_athrow) {
+          continue; // not a standard synchronized range
+        }
+
+        int handler_monitorexit_index = -1;
+        for (int i = 0; i < succHandlerSeq.length(); i++) {
+          if (succHandlerSeq.getInstr(i).opcode == CodeConstants.opc_monitorexit) {
+            handler_monitorexit_index = i;
+            break;
+          }
+        }
+
+        if(handler_monitorexit_index < 0) {
+          continue; // monitorexit not found in the handler successor block
+        }
+
+        // checks successful, prerequisites satisfied, now extend the range
+        if(succ_monitorexit_index < succSeq.length() - 1) { // split block
+
+          SimpleInstructionSequence seq = new SimpleInstructionSequence();
+          for(int counter = 0; counter < succ_monitorexit_index; counter++) {
+            seq.addInstruction(succSeq.getInstr(0), -1);
+            succSeq.removeInstruction(0);
+          }
+
+          // build a separate block
+          BasicBlock newblock = new BasicBlock(++graph.last_id);
+          newblock.setSeq(seq);
+
+          // insert new block
+          for (BasicBlock block : succBlock.getPreds()) {
+            block.replaceSuccessor(succBlock, newblock);
+          }
+
+          newblock.addSuccessor(succBlock);
+          graph.getBlocks().addWithKey(newblock, newblock.id);
+
+          succBlock = newblock;
+        }
+
+        // copy exception edges and extend protected ranges (successor block)
+        BasicBlock rangeExitBlock = succBlock.getPreds().get(0);
+        for (int j = 0; j < rangeExitBlock.getSuccExceptions().size(); j++) {
+          BasicBlock hd = rangeExitBlock.getSuccExceptions().get(j);
+          succBlock.addSuccessorException(hd);
+
+          ExceptionRangeCFG rng = graph.getExceptionRange(hd, rangeExitBlock);
+          rng.getProtectedRange().add(succBlock);
+        }
+
+        // copy instructions (handler successor block)
+        InstructionSequence handlerSeq = handlerBlock.getSeq();
+        for(int counter = 0; counter < handler_monitorexit_index; counter++) {
+          handlerSeq.addInstruction(succHandlerSeq.getInstr(0), -1);
+          succHandlerSeq.removeInstruction(0);
+        }
+
+        range_extended = true;
+        break;
+      }
+
+      if(!range_extended) {
+        break;
+      }
+    }
+
+  }
+
+
   public static void incorporateValueReturns(ControlFlowGraph graph) {
 
     for (BasicBlock block : graph.getBlocks()) {
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index c8a7cad..6b76492 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -109,6 +109,7 @@ public class SingleClassesTest {
   @Test public void testMissingConstructorCallBad() { doTest("pkg/TestMissingConstructorCallBad"); }
   @Test public void testEmptyBlocks() { doTest("pkg/TestEmptyBlocks"); }
   @Test public void testPrivateEmptyConstructor() { doTest("pkg/TestPrivateEmptyConstructor"); }
+  @Test public void testSynchronizedUnprotected() { doTest("pkg/TestSynchronizedUnprotected"); }
 
 
   // TODO: fix all below
diff --git a/testData/classes/pkg/TestSynchronizedUnprotected.class b/testData/classes/pkg/TestSynchronizedUnprotected.class
new file mode 100644
index 0000000000000000000000000000000000000000..2346ca5f54ca7e18a1e9b6c92ef8d7039805dbea
GIT binary patch
literal 532
zcmaKoOHaZ;6ot<eWDtuF5PYI6L5;-3oyLucD|{qH6PE=>Ey9%4L8E`jH7+!9p^5DL
zNiNhwiLZ@KdT;04@7z1RukVjf0M?ODAcoX1(wK~6B!LXF5>pb>0<ld`duB@@QYan?
zM7RCA5*RCcTJ3dORTWg+YLiOTs0$;Ibc|a&-*wxeJZK^@Bam?XPEb=jULVd^2s_uh
zb{6>ByHWK+-41-CYDU#p8}6lRLn1CQYhw=c5;+?SSQME1$0sn}cb1y2J}vE68*C<!
z{*fx2bv3x_FVMNZFsjAB^E<>d<&gLM(m~*9<Cs9Xt&OiXe`NvL?n6yYUtwSjXVc~B
z(~aU0)-c4q_8$wx5oa9cDaS0Bhn5~7y8PgJ7-OMmVFDxH=n1V6)~1$@%P)7ZQjvQ^
zmwUH}?=JUNp1UkZVbcP>sW4k%vlMksV2rUYk!4GpN(R;kF-syTF$y6u_C|=?W0A8z
E0i;ZCmH+?%

literal 0
HcmV?d00001

diff --git a/testData/results/TestSynchronizedUnprotected.dec b/testData/results/TestSynchronizedUnprotected.dec
new file mode 100644
index 0000000..8a789bd
--- /dev/null
+++ b/testData/results/TestSynchronizedUnprotected.dec
@@ -0,0 +1,25 @@
+public final class TestSynchronizedUnprotected {
+   public final void test() {
+      synchronized(this) {// 5
+         System.out.println("test");// 6
+      }
+   }// 7
+}
+
+class 'TestSynchronizedUnprotected' {
+   method 'test ()V' {
+      3      2
+      4      3
+      7      3
+      9      3
+      e      5
+   }
+}
+
+Lines mapping:
+5 <-> 3
+6 <-> 4
+7 <-> 6
+Not mapped:
+8
+

From 1af631be9d8cece7f0e5d243d858eb2a9b79e99e Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Fri, 10 Aug 2018 15:02:21 +0200
Subject: [PATCH 202/252] toString() methods + one old typo

---
 .../java/decompiler/code/Instruction.java     |  21 ++
 .../code/cfg/ExceptionRangeCFG.java           |  24 ++
 .../decompiler/stats/CatchAllStatement.java   |   3 +-
 .../java/decompiler/util/TextUtil.java        | 210 ++++++++++++++++++
 4 files changed, 256 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/Instruction.java b/src/org/jetbrains/java/decompiler/code/Instruction.java
index 23d510a..db25ee2 100644
--- a/src/org/jetbrains/java/decompiler/code/Instruction.java
+++ b/src/org/jetbrains/java/decompiler/code/Instruction.java
@@ -1,6 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
+import org.jetbrains.java.decompiler.util.TextUtil;
+
 public class Instruction implements CodeConstants {
   public static Instruction create(int opcode, boolean wide, int group, int bytecodeVersion, int[] operands) {
     if (opcode >= opc_ifeq && opcode <= opc_if_acmpne ||
@@ -57,6 +59,25 @@ public class Instruction implements CodeConstants {
            opcode != opc_jsr && opcode != opc_tableswitch && opcode != opc_lookupswitch;
   }
 
+  public String toString() {
+
+    String res = wide ? "@wide " : "";
+    res += "@" + TextUtil.getInstructionName(opcode);
+
+    int len = operandsCount();
+    for (int i = 0; i < len; i++) {
+      int op = operands[i];
+      if (op < 0) {
+        res += " -" + Integer.toHexString(-op);
+      }
+      else {
+        res += " " + Integer.toHexString(op);
+      }
+    }
+
+    return res;
+  }
+
   @Override
   @SuppressWarnings("MethodDoesntCallSuperMethod")
   public Instruction clone() {
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
index 0454176..c611cd5 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+
 public class ExceptionRangeCFG {
   private final List<BasicBlock> protectedRange; // FIXME: replace with set
   private BasicBlock handler;
@@ -23,6 +25,28 @@ public class ExceptionRangeCFG {
     return protectedRange.contains(handler);
   }
 
+  public String toString() {
+
+    String new_line_separator = DecompilerContext.getNewLineSeparator();
+
+    StringBuilder buf = new StringBuilder();
+
+    buf.append("exceptionType:");
+    for (String exception_type : exceptionTypes) {
+      buf.append(" ").append(exception_type);
+    }
+    buf.append(new_line_separator);
+
+    buf.append("handler: ").append(handler.id).append(new_line_separator);
+    buf.append("range: ");
+    for (int i = 0; i < protectedRange.size(); i++) {
+      buf.append(protectedRange.get(i).id).append(" ");
+    }
+    buf.append(new_line_separator);
+
+    return buf.toString();
+  }
+
   public BasicBlock getHandler() {
     return handler;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 6467acd..37cd85a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -168,8 +168,7 @@ public class CatchAllStatement extends Statement {
     }
 
     if (!this.vars.isEmpty()) {
-      // FIXME: WTF??? vars?!
-      vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
+      cas.vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                               new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
                               DecompilerContext.getVarProcessor()));
     }
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 30bc999..338a74e 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -72,4 +72,214 @@ public class TextUtil {
   private static boolean isKeyword(String id, int version) {
     return KEYWORDS.contains(id) || version > CodeConstants.BYTECODE_JAVA_5 && "enum".equals(id);
   }
+
+  public static String getInstructionName(int opcode) {
+    return opcodeNames[opcode];
+  }
+
+  private static final String[] opcodeNames = {
+      "nop",                                //    "nop",
+      "aconst_null",                //    "aconst_null",
+      "iconst_m1",                        //    "iconst_m1",
+      "iconst_0",                        //    "iconst_0",
+      "iconst_1",                        //    "iconst_1",
+      "iconst_2",                        //    "iconst_2",
+      "iconst_3",                        //    "iconst_3",
+      "iconst_4",                        //    "iconst_4",
+      "iconst_5",                        //    "iconst_5",
+      "lconst_0",                        //    "lconst_0",
+      "lconst_1",                        //    "lconst_1",
+      "fconst_0",                        //    "fconst_0",
+      "fconst_1",                        //    "fconst_1",
+      "fconst_2",                        //    "fconst_2",
+      "dconst_0",                        //    "dconst_0",
+      "dconst_1",                        //    "dconst_1",
+      "bipush",                        //    "bipush",
+      "sipush",                        //    "sipush",
+      "ldc",                        //    "ldc",
+      "ldc_w",                        //    "ldc_w",
+      "ldc2_w",                        //    "ldc2_w",
+      "iload",                        //    "iload",
+      "lload",                        //    "lload",
+      "fload",                        //    "fload",
+      "dload",                        //    "dload",
+      "aload",                        //    "aload",
+      "iload_0",                        //    "iload_0",
+      "iload_1",                        //    "iload_1",
+      "iload_2",                        //    "iload_2",
+      "iload_3",                        //    "iload_3",
+      "lload_0",                        //    "lload_0",
+      "lload_1",                        //    "lload_1",
+      "lload_2",                        //    "lload_2",
+      "lload_3",                        //    "lload_3",
+      "fload_0",                        //    "fload_0",
+      "fload_1",                        //    "fload_1",
+      "fload_2",                        //    "fload_2",
+      "fload_3",                        //    "fload_3",
+      "dload_0",                        //    "dload_0",
+      "dload_1",                        //    "dload_1",
+      "dload_2",                        //    "dload_2",
+      "dload_3",                        //    "dload_3",
+      "aload_0",                        //    "aload_0",
+      "aload_1",                        //    "aload_1",
+      "aload_2",                        //    "aload_2",
+      "aload_3",                        //    "aload_3",
+      "iaload",                        //    "iaload",
+      "laload",                        //    "laload",
+      "faload",                        //    "faload",
+      "daload",                        //    "daload",
+      "aaload",                        //    "aaload",
+      "baload",                        //    "baload",
+      "caload",                        //    "caload",
+      "saload",                        //    "saload",
+      "istore",                        //    "istore",
+      "lstore",                        //    "lstore",
+      "fstore",                        //    "fstore",
+      "dstore",                        //    "dstore",
+      "astore",                        //    "astore",
+      "istore_0",                        //    "istore_0",
+      "istore_1",                        //    "istore_1",
+      "istore_2",                        //    "istore_2",
+      "istore_3",                        //    "istore_3",
+      "lstore_0",                        //    "lstore_0",
+      "lstore_1",                        //    "lstore_1",
+      "lstore_2",                        //    "lstore_2",
+      "lstore_3",                        //    "lstore_3",
+      "fstore_0",                        //    "fstore_0",
+      "fstore_1",                        //    "fstore_1",
+      "fstore_2",                        //    "fstore_2",
+      "fstore_3",                        //    "fstore_3",
+      "dstore_0",                        //    "dstore_0",
+      "dstore_1",                        //    "dstore_1",
+      "dstore_2",                        //    "dstore_2",
+      "dstore_3",                        //    "dstore_3",
+      "astore_0",                        //    "astore_0",
+      "astore_1",                        //    "astore_1",
+      "astore_2",                        //    "astore_2",
+      "astore_3",                        //    "astore_3",
+      "iastore",                        //    "iastore",
+      "lastore",                        //    "lastore",
+      "fastore",                        //    "fastore",
+      "dastore",                        //    "dastore",
+      "aastore",                        //    "aastore",
+      "bastore",                        //    "bastore",
+      "castore",                        //    "castore",
+      "sastore",                        //    "sastore",
+      "pop",                        //    "pop",
+      "pop2",                        //    "pop2",
+      "dup",                        //    "dup",
+      "dup_x1",                        //    "dup_x1",
+      "dup_x2",                        //    "dup_x2",
+      "dup2",                        //    "dup2",
+      "dup2_x1",                        //    "dup2_x1",
+      "dup2_x2",                        //    "dup2_x2",
+      "swap",                        //    "swap",
+      "iadd",                        //    "iadd",
+      "ladd",                        //    "ladd",
+      "fadd",                        //    "fadd",
+      "dadd",                        //    "dadd",
+      "isub",                        //    "isub",
+      "lsub",                        //    "lsub",
+      "fsub",                        //    "fsub",
+      "dsub",                        //    "dsub",
+      "imul",                        //    "imul",
+      "lmul",                        //    "lmul",
+      "fmul",                        //    "fmul",
+      "dmul",                        //    "dmul",
+      "idiv",                        //    "idiv",
+      "ldiv",                        //    "ldiv",
+      "fdiv",                        //    "fdiv",
+      "ddiv",                        //    "ddiv",
+      "irem",                        //    "irem",
+      "lrem",                        //    "lrem",
+      "frem",                        //    "frem",
+      "drem",                        //    "drem",
+      "ineg",                        //    "ineg",
+      "lneg",                        //    "lneg",
+      "fneg",                        //    "fneg",
+      "dneg",                        //    "dneg",
+      "ishl",                        //    "ishl",
+      "lshl",                        //    "lshl",
+      "ishr",                        //    "ishr",
+      "lshr",                        //    "lshr",
+      "iushr",                        //    "iushr",
+      "lushr",                        //    "lushr",
+      "iand",                        //    "iand",
+      "land",                        //    "land",
+      "ior",                        //    "ior",
+      "lor",                        //    "lor",
+      "ixor",                        //    "ixor",
+      "lxor",                        //    "lxor",
+      "iinc",                        //    "iinc",
+      "i2l",                        //    "i2l",
+      "i2f",                        //    "i2f",
+      "i2d",                        //    "i2d",
+      "l2i",                        //    "l2i",
+      "l2f",                        //    "l2f",
+      "l2d",                        //    "l2d",
+      "f2i",                        //    "f2i",
+      "f2l",                        //    "f2l",
+      "f2d",                        //    "f2d",
+      "d2i",                        //    "d2i",
+      "d2l",                        //    "d2l",
+      "d2f",                        //    "d2f",
+      "i2b",                        //    "i2b",
+      "i2c",                        //    "i2c",
+      "i2s",                        //    "i2s",
+      "lcmp",                        //    "lcmp",
+      "fcmpl",                        //    "fcmpl",
+      "fcmpg",                        //    "fcmpg",
+      "dcmpl",                        //    "dcmpl",
+      "dcmpg",                        //    "dcmpg",
+      "ifeq",                        //    "ifeq",
+      "ifne",                        //    "ifne",
+      "iflt",                        //    "iflt",
+      "ifge",                        //    "ifge",
+      "ifgt",                        //    "ifgt",
+      "ifle",                        //    "ifle",
+      "if_icmpeq",                //    "if_icmpeq",
+      "if_icmpne",                //    "if_icmpne",
+      "if_icmplt",                //    "if_icmplt",
+      "if_icmpge",                //    "if_icmpge",
+      "if_icmpgt",                //    "if_icmpgt",
+      "if_icmple",                //    "if_icmple",
+      "if_acmpeq",                //    "if_acmpeq",
+      "if_acmpne",                //    "if_acmpne",
+      "goto",                        //    "goto",
+      "jsr",                        //    "jsr",
+      "ret",                        //    "ret",
+      "tableswitch",                        //    "tableswitch",
+      "lookupswitch",                        //    "lookupswitch",
+      "ireturn",                        //    "ireturn",
+      "lreturn",                        //    "lreturn",
+      "freturn",                        //    "freturn",
+      "dreturn",                        //    "dreturn",
+      "areturn",                        //    "areturn",
+      "return",                        //    "return",
+      "getstatic",                //    "getstatic",
+      "putstatic",                //    "putstatic",
+      "getfield",                //    "getfield",
+      "putfield",                //    "putfield",
+      "invokevirtual",                //    "invokevirtual",
+      "invokespecial",                //    "invokespecial",
+      "invokestatic",                //    "invokestatic",
+      "invokeinterface",                //    "invokeinterface",
+      //"xxxunusedxxx",   //    "xxxunusedxxx", Java 6 and before
+      "invokedynamic",                //    "invokedynamic", Java 7 and later
+      "new",                                //    "new",
+      "newarray",                //    "newarray",
+      "anewarray",                //    "anewarray",
+      "arraylength",                //    "arraylength",
+      "athrow",                        //    "athrow",
+      "checkcast",                //    "checkcast",
+      "instanceof",                //    "instanceof",
+      "monitorenter",                //    "monitorenter",
+      "monitorexit",                //    "monitorexit",
+      "wide",                        //    "wide",
+      "multianewarray",                //    "multianewarray",
+      "ifnull",                        //    "ifnull",
+      "ifnonnull",                //    "ifnonnull",
+      "goto_w",                        //    "goto_w",
+      "jsr_w"                        //    "jsr_w"
+    };
 }
\ No newline at end of file

From 6f70918c3b44fb66739da0254cb266e220531487 Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Fri, 10 Aug 2018 15:05:01 +0200
Subject: [PATCH 203/252] Addressed review comments + additional test

---
 .../decompiler/main/extern/IFernflowerPreferences.java    | 4 ++--
 .../decompiler/main/rels/MethodProcessorRunnable.java     | 4 ++--
 testData/src/pkg/TestPrivateEmptyConstructor.java         | 1 +
 testData/src/pkg/TestSynchronizedUnprotected.kt           | 8 ++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 testData/src/pkg/TestSynchronizedUnprotected.kt

diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 3c1f622..612b425 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -17,7 +17,7 @@ public interface IFernflowerPreferences {
   String HIDE_DEFAULT_CONSTRUCTOR = "hdc";
   String DECOMPILE_GENERIC_SIGNATURES = "dgs";
   String NO_EXCEPTIONS_RETURN = "ner";
-  String KT_SYNCHRONIZED_MONITOR = "ksm";
+  String ENSURE_SYNCHRONIZED_MONITOR = "esm";
   String DECOMPILE_ENUM = "den";
   String REMOVE_GET_CLASS_NEW = "rgn";
   String LITERALS_AS_IS = "lit";
@@ -62,7 +62,7 @@ public interface IFernflowerPreferences {
     defaults.put(HIDE_DEFAULT_CONSTRUCTOR, "1");
     defaults.put(DECOMPILE_GENERIC_SIGNATURES, "0");
     defaults.put(NO_EXCEPTIONS_RETURN, "1");
-    defaults.put(KT_SYNCHRONIZED_MONITOR, "1");
+    defaults.put(ENSURE_SYNCHRONIZED_MONITOR, "1");
     defaults.put(DECOMPILE_ENUM, "1");
     defaults.put(REMOVE_GET_CLASS_NEW, "1");
     defaults.put(LITERALS_AS_IS, "0");
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index cc5417a..32cdbc3 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -88,8 +88,8 @@ public class MethodProcessorRunnable implements Runnable {
       ExceptionDeobfuscator.removeEmptyRanges(graph);
     }
 
-    if (DecompilerContext.getOption(IFernflowerPreferences.KT_SYNCHRONIZED_MONITOR)) {
-      // special case: search for 'synchronized' ranges w/o monitorexit instruction (generated by the Kotlin compiler)
+    if (DecompilerContext.getOption(IFernflowerPreferences.ENSURE_SYNCHRONIZED_MONITOR)) {
+      // special case: search for 'synchronized' ranges w/o monitorexit instruction (as generated by Kotlin and Scala)
       DeadCodeHelper.extendSynchronizedRangeToMonitorexit(graph);
     }
 
diff --git a/testData/src/pkg/TestPrivateEmptyConstructor.java b/testData/src/pkg/TestPrivateEmptyConstructor.java
index 2a54b6a..3548536 100644
--- a/testData/src/pkg/TestPrivateEmptyConstructor.java
+++ b/testData/src/pkg/TestPrivateEmptyConstructor.java
@@ -1,3 +1,4 @@
+package pkg;
 
 public final class PrivateEmptyConstructor {
 
diff --git a/testData/src/pkg/TestSynchronizedUnprotected.kt b/testData/src/pkg/TestSynchronizedUnprotected.kt
new file mode 100644
index 0000000..a6c04e9
--- /dev/null
+++ b/testData/src/pkg/TestSynchronizedUnprotected.kt
@@ -0,0 +1,8 @@
+
+object TestSynchronizedUnprotected {
+    fun test() {
+        synchronized(this) {
+            println("Boom")
+        }
+    }
+}
\ No newline at end of file

From b2a676764092b0762e61f5a3700452e7aa4fb71f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 10 Aug 2018 15:10:31 +0200
Subject: [PATCH 204/252] Cleanup (test data format)

---
 .../pkg/TestPrivateEmptyConstructor.class     | Bin 420 -> 424 bytes
 .../pkg/TestSynchronizedUnprotected.class     | Bin 532 -> 1154 bytes
 .../results/TestPrivateEmptyConstructor.dec   |  20 ++++----
 .../results/TestSynchronizedUnprotected.dec   |  43 ++++++++++++------
 .../src/pkg/TestPrivateEmptyConstructor.java  |   8 ++--
 .../src/pkg/TestSynchronizedUnprotected.kt    |   3 +-
 6 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/testData/classes/pkg/TestPrivateEmptyConstructor.class b/testData/classes/pkg/TestPrivateEmptyConstructor.class
index cf452491f39304de763af86a8a2538f6d1e63ad1..a8aa7e0701ce62d7d56209a1db333a80fe86c004 100644
GIT binary patch
delta 18
acmZ3&yn=bc3|9Gq>~#H!iP96dd;kDG2?tUD

delta 14
WcmZ3%yo7ne3`XgRiP95yd;kC@y#?I>

diff --git a/testData/classes/pkg/TestSynchronizedUnprotected.class b/testData/classes/pkg/TestSynchronizedUnprotected.class
index 2346ca5f54ca7e18a1e9b6c92ef8d7039805dbea..e5cc393649a8c118ab6bfa14b438c8683de41fb0 100644
GIT binary patch
literal 1154
zcmah{OHUI~6#nk?F=Z%H%EJOuid2ObC{ytP7!yE<)wU9+bi-=ePRgb2Ow+kVaK+ZO
z|G<rFSZLxx3GVz)KF&-bDT#r}<lOU}=XcM!zy5st4qyqZ43o`THB~Tdp&gm!y_RM2
z_eN#MY_=?6l!Z}|!5BjO`hlLR>t;3ernFCX86F0&pfm>0%xsasx@9#2kgo)5N478;
zGI}V=YE$fR)~&>?)OL%TLK7`RZ>$E<i(n5F^f3(nCqPC&gWPm7>LwML=~U_BvpQQ0
zVgO+UAq+C~)+|xyW@^XeM0J=UkjZO>wfx2=LtnPbNv&@q(t{C<QtLR6>v1)1cTIwU
zWt^MtahqW(d&973o*n)!wE~UvonERNGA6H%MbK5MGNu^(&p2^>9>g^K3cQFj3|tb-
z8A7k<LZ_-y<G@23V~*%0SaKm8C=taPnGQLLipr2YI}RyQL{g;C*|8!897T$p9jB#5
zw(dLs<R|#bAM%Vzi(V%s&8RS<*Svv+8m-Q|VO0!<aMmj8^`hS5&dmyrVCc_s)5y0Q
zC8Kp=>C=Q>uI2RR1y(ex-6|Vf+zB7*fEPxoUEMqshG}z)_B#5uZ3^BnirnT@cFi;`
zp$l@^P$AK9oKK=P``{<WON2gN*rSPT@*Lqn?i9D?zF_DSWBKII&j^s5|8e3*4I)Ar
z5sbR02agDikjF<4Zya~rVMZ~5DA^yoJ|9V++pQlm!lX?gfG1=fhxC`qNV5Bb$%y@i
zSH@kLN-}4e7X(vu(tP1de8s&JQY5!;uw(4%<|KePc<|JXdWdB@KWMqNZRPsaD6iee
zt|YYBrM9IcV`}V%v>V>ClE^CRv^uxEqAH0^1uI17C6T;OcYCl4PX;sYKa0dAN@g&J
bd9q@`(Neo$HWs1o!e=9DBW=TPJ9_#b&29xr

literal 532
zcmaKoOHaZ;6ot<eWDtuF5PYI6L5;-3oyLucD|{qH6PE=>Ey9%4L8E`jH7+!9p^5DL
zNiNhwiLZ@KdT;04@7z1RukVjf0M?ODAcoX1(wK~6B!LXF5>pb>0<ld`duB@@QYan?
zM7RCA5*RCcTJ3dORTWg+YLiOTs0$;Ibc|a&-*wxeJZK^@Bam?XPEb=jULVd^2s_uh
zb{6>ByHWK+-41-CYDU#p8}6lRLn1CQYhw=c5;+?SSQME1$0sn}cb1y2J}vE68*C<!
z{*fx2bv3x_FVMNZFsjAB^E<>d<&gLM(m~*9<Cs9Xt&OiXe`NvL?n6yYUtwSjXVc~B
z(~aU0)-c4q_8$wx5oa9cDaS0Bhn5~7y8PgJ7-OMmVFDxH=n1V6)~1$@%P)7ZQjvQ^
zmwUH}?=JUNp1UkZVbcP>sW4k%vlMksV2rUYk!4GpN(R;kF-syTF$y6u_C|=?W0A8z
E0i;ZCmH+?%

diff --git a/testData/results/TestPrivateEmptyConstructor.dec b/testData/results/TestPrivateEmptyConstructor.dec
index c2a5aa4..3f866b1 100644
--- a/testData/results/TestPrivateEmptyConstructor.dec
+++ b/testData/results/TestPrivateEmptyConstructor.dec
@@ -1,3 +1,5 @@
+package pkg;
+
 public final class TestPrivateEmptyConstructor {
    private TestPrivateEmptyConstructor() {
    }// 4
@@ -7,20 +9,20 @@ public final class TestPrivateEmptyConstructor {
    }// 8
 }
 
-class 'TestPrivateEmptyConstructor' {
+class 'pkg/TestPrivateEmptyConstructor' {
    method '<init> ()V' {
-      4      2
+      4      4
    }
 
    method 'test ()V' {
-      0      5
-      3      5
-      5      5
-      8      6
+      0      7
+      3      7
+      5      7
+      8      8
    }
 }
 
 Lines mapping:
-4 <-> 3
-7 <-> 6
-8 <-> 7
+4 <-> 5
+7 <-> 8
+8 <-> 9
diff --git a/testData/results/TestSynchronizedUnprotected.dec b/testData/results/TestSynchronizedUnprotected.dec
index 8a789bd..d6405e8 100644
--- a/testData/results/TestSynchronizedUnprotected.dec
+++ b/testData/results/TestSynchronizedUnprotected.dec
@@ -1,25 +1,42 @@
+package pkg;
+
+import kotlin.Metadata;
+import kotlin.Unit;
+
+@Metadata(
+   mv = {1, 1, 11},
+   bv = {1, 0, 2},
+   k = 1,
+   xi = 2,
+   d1 = {"\u0000\u0010\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u0002\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0006\u0010\u0003\u001a\u00020\u0004"},
+   d2 = {"Lpkg/TestSynchronizedUnprotected;", "", "()V", "test", ""}
+)
 public final class TestSynchronizedUnprotected {
    public final void test() {
-      synchronized(this) {// 5
-         System.out.println("test");// 6
+      synchronized(this) {
+         String var2 = "Boom";// 6
+         System.out.println(var2);
+         Unit var3 = Unit.INSTANCE;// 5 7
       }
-   }// 7
+   }
 }
 
-class 'TestSynchronizedUnprotected' {
+class 'pkg/TestSynchronizedUnprotected' {
    method 'test ()V' {
-      3      2
-      4      3
-      7      3
-      9      3
-      e      5
+      3      15
+      5      16
+      7      16
+      8      17
+      c      17
+      f      18
+      12      18
+      15      20
    }
 }
 
 Lines mapping:
-5 <-> 3
-6 <-> 4
-7 <-> 6
+5 <-> 19
+6 <-> 17
+7 <-> 19
 Not mapped:
 8
-
diff --git a/testData/src/pkg/TestPrivateEmptyConstructor.java b/testData/src/pkg/TestPrivateEmptyConstructor.java
index 3548536..3323c93 100644
--- a/testData/src/pkg/TestPrivateEmptyConstructor.java
+++ b/testData/src/pkg/TestPrivateEmptyConstructor.java
@@ -1,11 +1,9 @@
 package pkg;
 
-public final class PrivateEmptyConstructor {
-
-   private PrivateEmptyConstructor() {}
+public final class TestPrivateEmptyConstructor {
+   private TestPrivateEmptyConstructor() {}
 
    public final void test() {
 		System.out.println("test");
    }
-}
-
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSynchronizedUnprotected.kt b/testData/src/pkg/TestSynchronizedUnprotected.kt
index a6c04e9..59d8c6b 100644
--- a/testData/src/pkg/TestSynchronizedUnprotected.kt
+++ b/testData/src/pkg/TestSynchronizedUnprotected.kt
@@ -1,5 +1,6 @@
+package pkg
 
-object TestSynchronizedUnprotected {
+class TestSynchronizedUnprotected {
     fun test() {
         synchronized(this) {
             println("Boom")

From 9669276a3edd81ace7ddcc40d57f7a9bdddc1502 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 10 Aug 2018 15:21:05 +0200
Subject: [PATCH 205/252] Cleanup (warnings; formatting; unneeded comments)

---
 .../java/decompiler/code/Instruction.java     |  13 +-
 .../code/cfg/ExceptionRangeCFG.java           |  11 +-
 .../java/decompiler/util/TextUtil.java        | 407 +++++++++---------
 3 files changed, 215 insertions(+), 216 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/Instruction.java b/src/org/jetbrains/java/decompiler/code/Instruction.java
index db25ee2..1a260f2 100644
--- a/src/org/jetbrains/java/decompiler/code/Instruction.java
+++ b/src/org/jetbrains/java/decompiler/code/Instruction.java
@@ -59,23 +59,24 @@ public class Instruction implements CodeConstants {
            opcode != opc_jsr && opcode != opc_tableswitch && opcode != opc_lookupswitch;
   }
 
+  @Override
   public String toString() {
-
-    String res = wide ? "@wide " : "";
-    res += "@" + TextUtil.getInstructionName(opcode);
+    StringBuilder res = new StringBuilder();
+    if (wide) res.append("@wide ");
+    res.append("@").append(TextUtil.getInstructionName(opcode));
 
     int len = operandsCount();
     for (int i = 0; i < len; i++) {
       int op = operands[i];
       if (op < 0) {
-        res += " -" + Integer.toHexString(-op);
+        res.append(" -").append(Integer.toHexString(-op));
       }
       else {
-        res += " " + Integer.toHexString(op);
+        res.append(" ").append(Integer.toHexString(op));
       }
     }
 
-    return res;
+    return res.toString();
   }
 
   @Override
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
index c611cd5..ce143aa 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
@@ -1,12 +1,12 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.jetbrains.java.decompiler.main.DecompilerContext;
-
 public class ExceptionRangeCFG {
   private final List<BasicBlock> protectedRange; // FIXME: replace with set
   private BasicBlock handler;
@@ -25,10 +25,9 @@ public class ExceptionRangeCFG {
     return protectedRange.contains(handler);
   }
 
+  @Override
   public String toString() {
-
     String new_line_separator = DecompilerContext.getNewLineSeparator();
-
     StringBuilder buf = new StringBuilder();
 
     buf.append("exceptionType:");
@@ -39,8 +38,8 @@ public class ExceptionRangeCFG {
 
     buf.append("handler: ").append(handler.id).append(new_line_separator);
     buf.append("range: ");
-    for (int i = 0; i < protectedRange.size(); i++) {
-      buf.append(protectedRange.get(i).id).append(" ");
+    for (BasicBlock block : protectedRange) {
+      buf.append(block.id).append(" ");
     }
     buf.append(new_line_separator);
 
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 338a74e..10e3991 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -78,208 +78,207 @@ public class TextUtil {
   }
 
   private static final String[] opcodeNames = {
-      "nop",                                //    "nop",
-      "aconst_null",                //    "aconst_null",
-      "iconst_m1",                        //    "iconst_m1",
-      "iconst_0",                        //    "iconst_0",
-      "iconst_1",                        //    "iconst_1",
-      "iconst_2",                        //    "iconst_2",
-      "iconst_3",                        //    "iconst_3",
-      "iconst_4",                        //    "iconst_4",
-      "iconst_5",                        //    "iconst_5",
-      "lconst_0",                        //    "lconst_0",
-      "lconst_1",                        //    "lconst_1",
-      "fconst_0",                        //    "fconst_0",
-      "fconst_1",                        //    "fconst_1",
-      "fconst_2",                        //    "fconst_2",
-      "dconst_0",                        //    "dconst_0",
-      "dconst_1",                        //    "dconst_1",
-      "bipush",                        //    "bipush",
-      "sipush",                        //    "sipush",
-      "ldc",                        //    "ldc",
-      "ldc_w",                        //    "ldc_w",
-      "ldc2_w",                        //    "ldc2_w",
-      "iload",                        //    "iload",
-      "lload",                        //    "lload",
-      "fload",                        //    "fload",
-      "dload",                        //    "dload",
-      "aload",                        //    "aload",
-      "iload_0",                        //    "iload_0",
-      "iload_1",                        //    "iload_1",
-      "iload_2",                        //    "iload_2",
-      "iload_3",                        //    "iload_3",
-      "lload_0",                        //    "lload_0",
-      "lload_1",                        //    "lload_1",
-      "lload_2",                        //    "lload_2",
-      "lload_3",                        //    "lload_3",
-      "fload_0",                        //    "fload_0",
-      "fload_1",                        //    "fload_1",
-      "fload_2",                        //    "fload_2",
-      "fload_3",                        //    "fload_3",
-      "dload_0",                        //    "dload_0",
-      "dload_1",                        //    "dload_1",
-      "dload_2",                        //    "dload_2",
-      "dload_3",                        //    "dload_3",
-      "aload_0",                        //    "aload_0",
-      "aload_1",                        //    "aload_1",
-      "aload_2",                        //    "aload_2",
-      "aload_3",                        //    "aload_3",
-      "iaload",                        //    "iaload",
-      "laload",                        //    "laload",
-      "faload",                        //    "faload",
-      "daload",                        //    "daload",
-      "aaload",                        //    "aaload",
-      "baload",                        //    "baload",
-      "caload",                        //    "caload",
-      "saload",                        //    "saload",
-      "istore",                        //    "istore",
-      "lstore",                        //    "lstore",
-      "fstore",                        //    "fstore",
-      "dstore",                        //    "dstore",
-      "astore",                        //    "astore",
-      "istore_0",                        //    "istore_0",
-      "istore_1",                        //    "istore_1",
-      "istore_2",                        //    "istore_2",
-      "istore_3",                        //    "istore_3",
-      "lstore_0",                        //    "lstore_0",
-      "lstore_1",                        //    "lstore_1",
-      "lstore_2",                        //    "lstore_2",
-      "lstore_3",                        //    "lstore_3",
-      "fstore_0",                        //    "fstore_0",
-      "fstore_1",                        //    "fstore_1",
-      "fstore_2",                        //    "fstore_2",
-      "fstore_3",                        //    "fstore_3",
-      "dstore_0",                        //    "dstore_0",
-      "dstore_1",                        //    "dstore_1",
-      "dstore_2",                        //    "dstore_2",
-      "dstore_3",                        //    "dstore_3",
-      "astore_0",                        //    "astore_0",
-      "astore_1",                        //    "astore_1",
-      "astore_2",                        //    "astore_2",
-      "astore_3",                        //    "astore_3",
-      "iastore",                        //    "iastore",
-      "lastore",                        //    "lastore",
-      "fastore",                        //    "fastore",
-      "dastore",                        //    "dastore",
-      "aastore",                        //    "aastore",
-      "bastore",                        //    "bastore",
-      "castore",                        //    "castore",
-      "sastore",                        //    "sastore",
-      "pop",                        //    "pop",
-      "pop2",                        //    "pop2",
-      "dup",                        //    "dup",
-      "dup_x1",                        //    "dup_x1",
-      "dup_x2",                        //    "dup_x2",
-      "dup2",                        //    "dup2",
-      "dup2_x1",                        //    "dup2_x1",
-      "dup2_x2",                        //    "dup2_x2",
-      "swap",                        //    "swap",
-      "iadd",                        //    "iadd",
-      "ladd",                        //    "ladd",
-      "fadd",                        //    "fadd",
-      "dadd",                        //    "dadd",
-      "isub",                        //    "isub",
-      "lsub",                        //    "lsub",
-      "fsub",                        //    "fsub",
-      "dsub",                        //    "dsub",
-      "imul",                        //    "imul",
-      "lmul",                        //    "lmul",
-      "fmul",                        //    "fmul",
-      "dmul",                        //    "dmul",
-      "idiv",                        //    "idiv",
-      "ldiv",                        //    "ldiv",
-      "fdiv",                        //    "fdiv",
-      "ddiv",                        //    "ddiv",
-      "irem",                        //    "irem",
-      "lrem",                        //    "lrem",
-      "frem",                        //    "frem",
-      "drem",                        //    "drem",
-      "ineg",                        //    "ineg",
-      "lneg",                        //    "lneg",
-      "fneg",                        //    "fneg",
-      "dneg",                        //    "dneg",
-      "ishl",                        //    "ishl",
-      "lshl",                        //    "lshl",
-      "ishr",                        //    "ishr",
-      "lshr",                        //    "lshr",
-      "iushr",                        //    "iushr",
-      "lushr",                        //    "lushr",
-      "iand",                        //    "iand",
-      "land",                        //    "land",
-      "ior",                        //    "ior",
-      "lor",                        //    "lor",
-      "ixor",                        //    "ixor",
-      "lxor",                        //    "lxor",
-      "iinc",                        //    "iinc",
-      "i2l",                        //    "i2l",
-      "i2f",                        //    "i2f",
-      "i2d",                        //    "i2d",
-      "l2i",                        //    "l2i",
-      "l2f",                        //    "l2f",
-      "l2d",                        //    "l2d",
-      "f2i",                        //    "f2i",
-      "f2l",                        //    "f2l",
-      "f2d",                        //    "f2d",
-      "d2i",                        //    "d2i",
-      "d2l",                        //    "d2l",
-      "d2f",                        //    "d2f",
-      "i2b",                        //    "i2b",
-      "i2c",                        //    "i2c",
-      "i2s",                        //    "i2s",
-      "lcmp",                        //    "lcmp",
-      "fcmpl",                        //    "fcmpl",
-      "fcmpg",                        //    "fcmpg",
-      "dcmpl",                        //    "dcmpl",
-      "dcmpg",                        //    "dcmpg",
-      "ifeq",                        //    "ifeq",
-      "ifne",                        //    "ifne",
-      "iflt",                        //    "iflt",
-      "ifge",                        //    "ifge",
-      "ifgt",                        //    "ifgt",
-      "ifle",                        //    "ifle",
-      "if_icmpeq",                //    "if_icmpeq",
-      "if_icmpne",                //    "if_icmpne",
-      "if_icmplt",                //    "if_icmplt",
-      "if_icmpge",                //    "if_icmpge",
-      "if_icmpgt",                //    "if_icmpgt",
-      "if_icmple",                //    "if_icmple",
-      "if_acmpeq",                //    "if_acmpeq",
-      "if_acmpne",                //    "if_acmpne",
-      "goto",                        //    "goto",
-      "jsr",                        //    "jsr",
-      "ret",                        //    "ret",
-      "tableswitch",                        //    "tableswitch",
-      "lookupswitch",                        //    "lookupswitch",
-      "ireturn",                        //    "ireturn",
-      "lreturn",                        //    "lreturn",
-      "freturn",                        //    "freturn",
-      "dreturn",                        //    "dreturn",
-      "areturn",                        //    "areturn",
-      "return",                        //    "return",
-      "getstatic",                //    "getstatic",
-      "putstatic",                //    "putstatic",
-      "getfield",                //    "getfield",
-      "putfield",                //    "putfield",
-      "invokevirtual",                //    "invokevirtual",
-      "invokespecial",                //    "invokespecial",
-      "invokestatic",                //    "invokestatic",
-      "invokeinterface",                //    "invokeinterface",
-      //"xxxunusedxxx",   //    "xxxunusedxxx", Java 6 and before
-      "invokedynamic",                //    "invokedynamic", Java 7 and later
-      "new",                                //    "new",
-      "newarray",                //    "newarray",
-      "anewarray",                //    "anewarray",
-      "arraylength",                //    "arraylength",
-      "athrow",                        //    "athrow",
-      "checkcast",                //    "checkcast",
-      "instanceof",                //    "instanceof",
-      "monitorenter",                //    "monitorenter",
-      "monitorexit",                //    "monitorexit",
-      "wide",                        //    "wide",
-      "multianewarray",                //    "multianewarray",
-      "ifnull",                        //    "ifnull",
-      "ifnonnull",                //    "ifnonnull",
-      "goto_w",                        //    "goto_w",
-      "jsr_w"                        //    "jsr_w"
-    };
+    "nop",
+    "aconst_null",
+    "iconst_m1",
+    "iconst_0",
+    "iconst_1",
+    "iconst_2",
+    "iconst_3",
+    "iconst_4",
+    "iconst_5",
+    "lconst_0",
+    "lconst_1",
+    "fconst_0",
+    "fconst_1",
+    "fconst_2",
+    "dconst_0",
+    "dconst_1",
+    "bipush",
+    "sipush",
+    "ldc",
+    "ldc_w",
+    "ldc2_w",
+    "iload",
+    "lload",
+    "fload",
+    "dload",
+    "aload",
+    "iload_0",
+    "iload_1",
+    "iload_2",
+    "iload_3",
+    "lload_0",
+    "lload_1",
+    "lload_2",
+    "lload_3",
+    "fload_0",
+    "fload_1",
+    "fload_2",
+    "fload_3",
+    "dload_0",
+    "dload_1",
+    "dload_2",
+    "dload_3",
+    "aload_0",
+    "aload_1",
+    "aload_2",
+    "aload_3",
+    "iaload",
+    "laload",
+    "faload",
+    "daload",
+    "aaload",
+    "baload",
+    "caload",
+    "saload",
+    "istore",
+    "lstore",
+    "fstore",
+    "dstore",
+    "astore",
+    "istore_0",
+    "istore_1",
+    "istore_2",
+    "istore_3",
+    "lstore_0",
+    "lstore_1",
+    "lstore_2",
+    "lstore_3",
+    "fstore_0",
+    "fstore_1",
+    "fstore_2",
+    "fstore_3",
+    "dstore_0",
+    "dstore_1",
+    "dstore_2",
+    "dstore_3",
+    "astore_0",
+    "astore_1",
+    "astore_2",
+    "astore_3",
+    "iastore",
+    "lastore",
+    "fastore",
+    "dastore",
+    "aastore",
+    "bastore",
+    "castore",
+    "sastore",
+    "pop",
+    "pop2",
+    "dup",
+    "dup_x1",
+    "dup_x2",
+    "dup2",
+    "dup2_x1",
+    "dup2_x2",
+    "swap",
+    "iadd",
+    "ladd",
+    "fadd",
+    "dadd",
+    "isub",
+    "lsub",
+    "fsub",
+    "dsub",
+    "imul",
+    "lmul",
+    "fmul",
+    "dmul",
+    "idiv",
+    "ldiv",
+    "fdiv",
+    "ddiv",
+    "irem",
+    "lrem",
+    "frem",
+    "drem",
+    "ineg",
+    "lneg",
+    "fneg",
+    "dneg",
+    "ishl",
+    "lshl",
+    "ishr",
+    "lshr",
+    "iushr",
+    "lushr",
+    "iand",
+    "land",
+    "ior",
+    "lor",
+    "ixor",
+    "lxor",
+    "iinc",
+    "i2l",
+    "i2f",
+    "i2d",
+    "l2i",
+    "l2f",
+    "l2d",
+    "f2i",
+    "f2l",
+    "f2d",
+    "d2i",
+    "d2l",
+    "d2f",
+    "i2b",
+    "i2c",
+    "i2s",
+    "lcmp",
+    "fcmpl",
+    "fcmpg",
+    "dcmpl",
+    "dcmpg",
+    "ifeq",
+    "ifne",
+    "iflt",
+    "ifge",
+    "ifgt",
+    "ifle",
+    "if_icmpeq",
+    "if_icmpne",
+    "if_icmplt",
+    "if_icmpge",
+    "if_icmpgt",
+    "if_icmple",
+    "if_acmpeq",
+    "if_acmpne",
+    "goto",
+    "jsr",
+    "ret",
+    "tableswitch",
+    "lookupswitch",
+    "ireturn",
+    "lreturn",
+    "freturn",
+    "dreturn",
+    "areturn",
+    "return",
+    "getstatic",
+    "putstatic",
+    "getfield",
+    "putfield",
+    "invokevirtual",
+    "invokespecial",
+    "invokestatic",
+    "invokeinterface",
+    "invokedynamic",  // since Java 7
+    "new",
+    "newarray",
+    "anewarray",
+    "arraylength",
+    "athrow",
+    "checkcast",
+    "instanceof",
+    "monitorenter",
+    "monitorexit",
+    "wide",
+    "multianewarray",
+    "ifnull",
+    "ifnonnull",
+    "goto_w",
+    "jsr_w"
+  };
 }
\ No newline at end of file

From 8ee7853268d029d6b5f585d0d2fe40560811389a Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 14 Aug 2018 17:47:50 +0200
Subject: [PATCH 206/252] add override

---
 .../java/decompiler/code/InstructionSequence.java   |  3 ++-
 .../decompiler/code/SimpleInstructionSequence.java  |  3 ++-
 .../java/decompiler/code/cfg/BasicBlock.java        |  3 ++-
 .../main/decompiler/PrintStreamLogger.java          |  3 ++-
 .../decompiler/modules/decompiler/ExprentStack.java |  4 +++-
 .../deobfuscator/ExceptionDeobfuscator.java         |  4 +++-
 .../modules/decompiler/exps/ArrayExprent.java       |  7 ++++---
 .../modules/decompiler/exps/ConstExprent.java       |  5 ++---
 .../decompiler/stats/BasicBlockStatement.java       |  8 ++++----
 .../modules/decompiler/stats/CatchAllStatement.java |  8 +++++---
 .../modules/decompiler/stats/CatchStatement.java    |  4 +++-
 .../modules/decompiler/stats/DoStatement.java       |  6 +++++-
 .../modules/decompiler/stats/GeneralStatement.java  |  7 +++----
 .../modules/decompiler/stats/IfStatement.java       |  9 ++++++++-
 .../modules/decompiler/stats/RootStatement.java     |  7 +++----
 .../modules/decompiler/stats/SequenceStatement.java |  8 ++++----
 .../modules/decompiler/stats/SwitchStatement.java   | 13 +++++++++----
 .../decompiler/stats/SynchronizedStatement.java     | 13 +++++++++----
 .../modules/decompiler/vars/VarVersionNode.java     |  3 ++-
 .../modules/decompiler/vars/VarVersionsGraph.java   |  4 +++-
 .../java/decompiler/util/FastFixedSetFactory.java   |  6 +++++-
 .../java/decompiler/util/FastSparseSetFactory.java  |  6 +++++-
 .../jetbrains/java/decompiler/util/ListStack.java   |  4 +++-
 .../java/decompiler/util/SFormsFastMapDirect.java   |  5 ++++-
 .../java/decompiler/util/VBStyleCollection.java     |  9 ++++++++-
 25 files changed, 103 insertions(+), 49 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
index 41a11df..3d0cab0 100644
--- a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -30,6 +30,7 @@ public abstract class InstructionSequence {
   // *****************************************************************************
 
   // to nbe overwritten
+  @Override
   public InstructionSequence clone() {
     return null;
   }
diff --git a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
index 4a8399a..0b62c51 100644
--- a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
@@ -12,6 +12,7 @@ public class SimpleInstructionSequence extends InstructionSequence {
     super(collinstr);
   }
 
+  @Override
   public SimpleInstructionSequence clone() {
     SimpleInstructionSequence newseq = new SimpleInstructionSequence(collinstr.clone());
     newseq.setPointer(this.getPointer());
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
index 66d7ffb..265ffca 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
 import org.jetbrains.java.decompiler.code.Instruction;
@@ -160,6 +160,7 @@ public class BasicBlock implements IGraphNode {
     return instrOldOffsets;
   }
 
+  @Override
   public List<? extends IGraphNode> getPredecessors() {
     List<BasicBlock> lst = new ArrayList<>(preds);
     lst.addAll(predExceptions);
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
index cbc03fd..ff3b9b3 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
@@ -71,6 +71,7 @@ public class PrintStreamLogger extends IFernflowerLogger {
     }
   }
 
+  @Override
   public void endMethod() {
     if (accepts(Severity.INFO)) {
       --indent;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
index f1db32f..e0bb1b2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -14,11 +14,13 @@ public class ExprentStack extends ListStack<Exprent> {
     pointer = list.getPointer();
   }
 
+  @Override
   public Exprent pop() {
 
     return this.remove(--pointer);
   }
 
+  @Override
   public ExprentStack clone() {
     return new ExprentStack(this);
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index 261f22c..676f448 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.deobfuscator;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -211,10 +211,12 @@ public class ExceptionDeobfuscator {
   public static void removeCircularRanges(final ControlFlowGraph graph) {
 
     GenericDominatorEngine engine = new GenericDominatorEngine(new IGraph() {
+      @Override
       public List<? extends IGraphNode> getReversePostOrderList() {
         return graph.getReversePostOrder();
       }
 
+      @Override
       public Set<? extends IGraphNode> getRoots() {
         return new HashSet<>(Collections.singletonList(graph.getFirst()));
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
index bc482a2..753a0a6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -44,10 +42,12 @@ public class ArrayExprent extends Exprent {
     }
   }
 
+  @Override
   public int getExprentUse() {
     return array.getExprentUse() & index.getExprentUse() & Exprent.MULTIPLE_USES;
   }
 
+  @Override
   public CheckTypesResult checkExprTypeBounds() {
     CheckTypesResult result = new CheckTypesResult();
     result.addMinTypeExprent(index, VarType.VARTYPE_BYTECHAR);
@@ -55,6 +55,7 @@ public class ArrayExprent extends Exprent {
     return result;
   }
 
+  @Override
   public List<Exprent> getAllExprents() {
     List<Exprent> lst = new ArrayList<>();
     lst.add(array);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 402b9e7..d250db9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -97,6 +95,7 @@ public class ConstExprent extends Exprent {
     return Exprent.MULTIPLE_USES | Exprent.SIDE_EFFECTS_FREE;
   }
 
+  @Override
   public List<Exprent> getAllExprents() {
     return new ArrayList<>();
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
index 377d212..262a01f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -8,10 +6,10 @@ import org.jetbrains.java.decompiler.code.Instruction;
 import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 public class BasicBlockStatement extends Statement {
 
@@ -55,12 +53,14 @@ public class BasicBlockStatement extends Statement {
   // public methods
   // *****************************************************************************
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer tb = ExprProcessor.listToJava(varDefinitions, indent, tracer);
     tb.append(ExprProcessor.listToJava(exprents, indent, tracer));
     return tb;
   }
 
+  @Override
   public Statement getSimpleCopy() {
 
     BasicBlock newblock = new BasicBlock(
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 37cd85a..376abe5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -96,6 +94,7 @@ public class CatchAllStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     String new_line_separator = DecompilerContext.getNewLineSeparator();
 
@@ -146,6 +145,7 @@ public class CatchAllStatement extends Statement {
     return buf;
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     if (handler == oldstat) {
@@ -155,6 +155,7 @@ public class CatchAllStatement extends Statement {
     super.replaceStatement(oldstat, newstat);
   }
 
+  @Override
   public Statement getSimpleCopy() {
 
     CatchAllStatement cas = new CatchAllStatement();
@@ -176,6 +177,7 @@ public class CatchAllStatement extends Statement {
     return cas;
   }
 
+  @Override
   public void initSimpleCopy() {
     first = stats.get(0);
     handler = stats.get(1);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index 2c32d4c..652931a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -4,7 +4,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.stats;
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
@@ -12,6 +11,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -130,6 +130,7 @@ public class CatchStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
@@ -178,6 +179,7 @@ public class CatchStatement extends Statement {
     return buf;
   }
 
+  @Override
   public Statement getSimpleCopy() {
     CatchStatement cs = new CatchStatement();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
index 8abfc29..f9a149f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -1,11 +1,11 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,6 +77,7 @@ public class DoStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
@@ -126,6 +127,7 @@ public class DoStatement extends Statement {
     return buf;
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
     List<Object> lst = new ArrayList<>();
@@ -152,6 +154,7 @@ public class DoStatement extends Statement {
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (initExprent.get(0) == oldexpr) {
       initExprent.set(0, newexpr);
@@ -164,6 +167,7 @@ public class DoStatement extends Statement {
     }
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new DoStatement();
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
index fffd34d..56ada55 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
@@ -1,10 +1,8 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -41,6 +39,7 @@ public class GeneralStatement extends Statement {
   // public methods
   // *****************************************************************************
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index 46fba5e..bf18c51 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -1,7 +1,6 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -11,6 +10,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
 import org.jetbrains.java.decompiler.struct.match.IMatchable;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
@@ -187,6 +187,7 @@ public class IfStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
@@ -266,6 +267,7 @@ public class IfStatement extends Statement {
     return buf;
   }
 
+  @Override
   public void initExprents() {
 
     IfExprent ifexpr = (IfExprent)first.getExprents().remove(first.getExprents().size() - 1);
@@ -278,6 +280,7 @@ public class IfStatement extends Statement {
     headexprent.set(0, ifexpr);
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
     List<Object> lst = new ArrayList<>(stats);
@@ -286,12 +289,14 @@ public class IfStatement extends Statement {
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (headexprent.get(0) == oldexpr) {
       headexprent.set(0, newexpr);
     }
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     super.replaceStatement(oldstat, newstat);
@@ -324,6 +329,7 @@ public class IfStatement extends Statement {
     }
   }
 
+  @Override
   public Statement getSimpleCopy() {
 
     IfStatement is = new IfStatement();
@@ -333,6 +339,7 @@ public class IfStatement extends Statement {
     return is;
   }
 
+  @Override
   public void initSimpleCopy() {
 
     first = stats.get(0);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
index 5133036..61eca33 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
@@ -1,11 +1,9 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 public class RootStatement extends Statement {
   private final DummyExitStatement dummyExit;
@@ -20,6 +18,7 @@ public class RootStatement extends Statement {
     first.setParent(this);
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     return ExprProcessor.listToJava(varDefinitions, indent, tracer).append(first.toJava(indent, tracer));
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
index 8122b5c..7acad0c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
@@ -1,13 +1,11 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.Arrays;
 import java.util.List;
@@ -86,6 +84,7 @@ public class SequenceStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
     boolean islabeled = isLabeled();
@@ -122,6 +121,7 @@ public class SequenceStatement extends Statement {
     return buf;
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new SequenceStatement();
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
index ae41af7..6633d80 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
@@ -1,12 +1,9 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.SwitchInstruction;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
@@ -18,6 +15,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 
@@ -97,6 +95,7 @@ public class SwitchStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     SwitchHelper.simplify(this);
 
@@ -153,6 +152,7 @@ public class SwitchStatement extends Statement {
     return buf;
   }
 
+  @Override
   public void initExprents() {
     SwitchExprent swexpr = (SwitchExprent)first.getExprents().remove(first.getExprents().size() - 1);
     swexpr.setCaseValues(caseValues);
@@ -160,6 +160,7 @@ public class SwitchStatement extends Statement {
     headexprent.set(0, swexpr);
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
     List<Object> lst = new ArrayList<>(stats);
@@ -168,12 +169,14 @@ public class SwitchStatement extends Statement {
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (headexprent.get(0) == oldexpr) {
       headexprent.set(0, newexpr);
     }
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     for (int i = 0; i < caseStatements.size(); i++) {
@@ -185,10 +188,12 @@ public class SwitchStatement extends Statement {
     super.replaceStatement(oldstat, newstat);
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new SwitchStatement();
   }
 
+  @Override
   public void initSimpleCopy() {
     first = stats.get(0);
     default_edge = first.getSuccessorEdges(Statement.STATEDGE_DIRECT_ALL).get(0);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
index 90408d7..bc56583 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
@@ -1,16 +1,14 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
-import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.SequenceHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,6 +56,7 @@ public class SynchronizedStatement extends Statement {
   // public methods
   // *****************************************************************************
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
@@ -88,10 +87,12 @@ public class SynchronizedStatement extends Statement {
     }
   }
 
+  @Override
   public void initExprents() {
     headexprent.set(0, first.getExprents().remove(first.getExprents().size() - 1));
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
     List<Object> lst = new ArrayList<>(stats);
@@ -100,12 +101,14 @@ public class SynchronizedStatement extends Statement {
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (headexprent.get(0) == oldexpr) {
       headexprent.set(0, newexpr);
     }
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     if (body == oldstat) {
@@ -122,10 +125,12 @@ public class SynchronizedStatement extends Statement {
     stats.removeWithKey(exc.id);
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new SynchronizedStatement();
   }
 
+  @Override
   public void initSimpleCopy() {
     first = stats.get(0);
     body = stats.get(1);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
index 6c7ae33..914995e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode;
@@ -31,6 +31,7 @@ public class VarVersionNode implements IGraphNode {
     this.version = version;
   }
 
+  @Override
   public List<IGraphNode> getPredecessors() {
     List<IGraphNode> lst = new ArrayList<>(preds.size());
     for (VarVersionEdge edge : preds) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index ef0fc4b..e295915 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine;
@@ -72,10 +72,12 @@ public class VarVersionsGraph {
     }
 
     engine = new GenericDominatorEngine(new IGraph() {
+      @Override
       public List<? extends IGraphNode> getReversePostOrderList() {
         return getReversedPostOrder(roots);
       }
 
+      @Override
       public Set<? extends IGraphNode> getRoots() {
         return new HashSet<IGraphNode>(roots);
       }
diff --git a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
index 80ac7d6..d05b7d4 100644
--- a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.Collection;
@@ -174,6 +174,7 @@ public class FastFixedSetFactory<E> {
       return true;
     }
 
+    @Override
     public Iterator<E> iterator() {
       return new FastFixedSetIterator<>(this);
     }
@@ -288,11 +289,13 @@ public class FastFixedSetFactory<E> {
       return -1;
     }
 
+    @Override
     public boolean hasNext() {
       next_pointer = getNextIndex(pointer);
       return (next_pointer >= 0);
     }
 
+    @Override
     public E next() {
       if (next_pointer >= 0) {
         pointer = next_pointer;
@@ -308,6 +311,7 @@ public class FastFixedSetFactory<E> {
       return pointer < size ? colValuesInternal.getKey(pointer) : null;
     }
 
+    @Override
     public void remove() {
       int[] index = colValuesInternal.get(pointer);
       data[index[0]] &= ~index[1];
diff --git a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
index 91cdabc..08bf156 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.Collection;
@@ -317,6 +317,7 @@ public class FastSparseSetFactory<E> {
       return data.length == 0 || (next[0] == 0 && data[0] == 0);
     }
 
+    @Override
     public Iterator<E> iterator() {
       return new FastSparseSetIterator<>(this);
     }
@@ -407,11 +408,13 @@ public class FastSparseSetFactory<E> {
       return -1;
     }
 
+    @Override
     public boolean hasNext() {
       next_pointer = getNextIndex(pointer);
       return (next_pointer >= 0);
     }
 
+    @Override
     public E next() {
       if (next_pointer >= 0) {
         pointer = next_pointer;
@@ -427,6 +430,7 @@ public class FastSparseSetFactory<E> {
       return pointer < size ? colValuesInternal.getKey(pointer) : null;
     }
 
+    @Override
     public void remove() {
       int[] index = colValuesInternal.get(pointer);
       data[index[0]] &= ~index[1];
diff --git a/src/org/jetbrains/java/decompiler/util/ListStack.java b/src/org/jetbrains/java/decompiler/util/ListStack.java
index e1d169f..d5ae774 100644
--- a/src/org/jetbrains/java/decompiler/util/ListStack.java
+++ b/src/org/jetbrains/java/decompiler/util/ListStack.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.ArrayList;
@@ -14,6 +14,7 @@ public class ListStack<T> extends ArrayList<T> {
     super(list);
   }
 
+  @Override
   @SuppressWarnings("MethodDoesntCallSuperMethod")
   public ListStack<T> clone() {
     ListStack<T> copy = new ListStack<>(this);
@@ -62,6 +63,7 @@ public class ListStack<T> extends ArrayList<T> {
     pointer++;
   }
 
+  @Override
   public void clear() {
     super.clear();
     pointer = 0;
diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
index d1465c6..16a0484 100644
--- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
+++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
@@ -348,14 +348,17 @@ public class SFormsFastMapDirect {
             private final Integer var = key;
             private final FastSparseSet<Integer> val = ent;
 
+            @Override
             public Integer getKey() {
               return var;
             }
 
+            @Override
             public FastSparseSet<Integer> getValue() {
               return val;
             }
 
+            @Override
             public FastSparseSet<Integer> setValue(FastSparseSet<Integer> newvalue) {
               return null;
             }
diff --git a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
index 8200843..4454337 100644
--- a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
+++ b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.ArrayList;
@@ -21,16 +21,19 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     map = new HashMap<>(initialCapacity);
   }
 
+  @Override
   public boolean add(E element) {
     lstKeys.add(null);
     super.add(element);
     return true;
   }
 
+  @Override
   public boolean remove(Object element) {   // TODO: error on void remove(E element)
     throw new RuntimeException("not implemented!");
   }
 
+  @Override
   public boolean addAll(Collection<? extends E> c) {
     for (int i = c.size() - 1; i >= 0; i--) {
       lstKeys.add(null);
@@ -67,6 +70,7 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     return null;
   }
 
+  @Override
   public void add(int index, E element) {
     addToListIndex(index, 1);
     lstKeys.add(index, null);
@@ -88,6 +92,7 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     map.remove(key);
   }
 
+  @Override
   public E remove(int index) {
     addToListIndex(index + 1, -1);
     K obj = lstKeys.get(index);
@@ -118,12 +123,14 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     return map.containsKey(key);
   }
 
+  @Override
   public void clear() {
     map.clear();
     lstKeys.clear();
     super.clear();
   }
 
+  @Override
   public VBStyleCollection<E, K> clone() {
     VBStyleCollection<E, K> c = new VBStyleCollection<>();
     c.addAll(new ArrayList<>(this));

From d42689b205db6387f8f5760a81546328d5f97f50 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 5 Sep 2018 20:14:55 +0700
Subject: [PATCH 207/252] for -> foreach; generifying; other warning fixes

---
 .../modules/decompiler/exps/FunctionExprent.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index 2c5a2ac..6bdd8db 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -566,12 +566,12 @@ public class FunctionExprent extends Exprent {
   }
 
   private static VarType getMaxVarType(VarType[] arr) {
-    int[] types = new int[]{CodeConstants.TYPE_DOUBLE, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_LONG};
-    VarType[] vartypes = new VarType[]{VarType.VARTYPE_DOUBLE, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG};
+    int[] types = {CodeConstants.TYPE_DOUBLE, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_LONG};
+    VarType[] vartypes = {VarType.VARTYPE_DOUBLE, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG};
 
     for (int i = 0; i < types.length; i++) {
-      for (int j = 0; j < arr.length; j++) {
-        if (arr[j].type == types[i]) {
+      for (VarType anArr : arr) {
+        if (anArr.type == types[i]) {
           return vartypes[i];
         }
       }

From 21a80957bb2f6d470c38c3599674f06f2e905721 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 6 Sep 2018 16:43:10 +0300
Subject: [PATCH 208/252] cleanup: remove 'public' modifier from constructors
 in non-public classes (IDEA-195931)

public constructors in non-public classes may be confusing, and removing them makes code shorter.
---
 .../java/decompiler/main/rels/NestedClassProcessor.java   | 2 +-
 .../decompiler/modules/decompiler/FinallyProcessor.java   | 2 +-
 .../java/decompiler/modules/decompiler/IfHelper.java      | 2 +-
 .../deobfuscator/IrreducibleCFGDeobfuscator.java          | 2 +-
 .../decompiler/sforms/FlattenStatementsHelper.java        | 8 ++++----
 .../jetbrains/java/decompiler/DecompilerTestFixture.java  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index f865167..b08d85c 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -902,7 +902,7 @@ public class NestedClassProcessor {
     public String fieldKey;
     public VarVersionPair varPair;
 
-    public VarFieldPair(String field, VarVersionPair varPair) {
+    VarFieldPair(String field, VarVersionPair varPair) {
       this.fieldKey = field;
       this.varPair = varPair;
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index d087783..7a431d7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -553,7 +553,7 @@ public class FinallyProcessor {
       // TODO: correct handling (merging) of multiple paths
       public List<int[]> lstStoreVars;
 
-      public BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) {
+      BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) {
         this.blockCatch = blockCatch;
         this.blockSample = blockSample;
         this.lstStoreVars = new ArrayList<>(lstStoreVars);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index b46cdae..719a017 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -678,7 +678,7 @@ public class IfHelper {
     public final List<IfNode> succs = new ArrayList<>();
     public final List<Integer> edgetypes = new ArrayList<>();
 
-    public IfNode(Statement value) {
+    IfNode(Statement value) {
       this.value = value;
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
index 78eb38d..4017b3e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
@@ -20,7 +20,7 @@ public class IrreducibleCFGDeobfuscator {
       public final Set<Node> preds = new HashSet<>();
       public final Set<Node> succs = new HashSet<>();
 
-      public Node(Integer id) {
+      Node(Integer id) {
         this.id = id;
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
index b465126..2db1e30 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
@@ -64,7 +64,7 @@ public class FlattenStatementsHelper {
       public int edgeIndex;
       public List<StatEdge> succEdges;
 
-      public StatementStackEntry(Statement statement, LinkedList<StackEntry> stackFinally, List<Exprent> tailExprents) {
+      StatementStackEntry(Statement statement, LinkedList<StackEntry> stackFinally, List<Exprent> tailExprents) {
         this.statement = statement;
         this.stackFinally = stackFinally;
         this.tailExprents = tailExprents;
@@ -517,7 +517,7 @@ public class FlattenStatementsHelper {
     public final DirectNode finallyShortRangeSource;
     public final DirectNode finallyLongRangeSource;
 
-    public StackEntry(CatchAllStatement catchstatement,
+    StackEntry(CatchAllStatement catchstatement,
                       boolean state,
                       int edgetype,
                       Statement destination,
@@ -539,7 +539,7 @@ public class FlattenStatementsHelper {
       this.finallyLongRangeSource = finallyLongRangeSource;
     }
 
-    public StackEntry(CatchAllStatement catchstatement, boolean state) {
+    StackEntry(CatchAllStatement catchstatement, boolean state) {
       this(catchstatement, state, -1, null, null, null, null, null, false);
     }
   }
@@ -549,7 +549,7 @@ public class FlattenStatementsHelper {
     public final Integer statid;
     public final int edgetype;
 
-    public Edge(String sourceid, Integer statid, int edgetype) {
+    Edge(String sourceid, Integer statid, int edgetype) {
       this.sourceid = sourceid;
       this.statid = statid;
       this.edgetype = edgetype;
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index 50930ff..4c5641f 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -118,7 +118,7 @@ public class DecompilerTestFixture {
   private static class TestConsoleDecompiler extends ConsoleDecompiler {
     private final HashMap<String, ZipFile> zipFiles = new HashMap<>();
 
-    public TestConsoleDecompiler(File destination, Map<String, Object> options) {
+    TestConsoleDecompiler(File destination, Map<String, Object> options) {
       super(destination, options, new PrintStreamLogger(System.out));
     }
 

From b53c895399f3a9b80bba698e391974f671233969 Mon Sep 17 00:00:00 2001
From: JDLogic <jrd2558@gmail.com>
Date: Tue, 11 Sep 2018 22:29:06 +0300
Subject: [PATCH 209/252] Fix super qualifier for default interfaces #855

---
 .../decompiler/modules/decompiler/exps/InvocationExprent.java | 4 +++-
 test/org/jetbrains/java/decompiler/SingleClassesTest.java     | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 12d4600..f92682a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -247,7 +247,9 @@ public class InvocationExprent extends Exprent {
 
           if (invocationTyp == INVOKE_SPECIAL) {
             if (!classname.equals(this_classname)) { // TODO: direct comparison to the super class?
-              super_qualifier = this_classname;
+              StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+              boolean isInterface = cl != null && (cl.getAccessFlags() & CodeConstants.ACC_INTERFACE) != 0;
+              super_qualifier = !isInterface ? this_classname : classname;
             }
           }
         }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 6b76492..e08ab4b 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -110,7 +110,7 @@ public class SingleClassesTest {
   @Test public void testEmptyBlocks() { doTest("pkg/TestEmptyBlocks"); }
   @Test public void testPrivateEmptyConstructor() { doTest("pkg/TestPrivateEmptyConstructor"); }
   @Test public void testSynchronizedUnprotected() { doTest("pkg/TestSynchronizedUnprotected"); }
-
+  @Test public void testInterfaceSuper() { doTest("pkg/TestInterfaceSuper"); }
 
   // TODO: fix all below
   //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
@@ -118,7 +118,6 @@ public class SingleClassesTest {
   //@Test public void testUnionType() { doTest("pkg/TestUnionType"); }
   //@Test public void testInnerClassConstructor2() { doTest("pkg/TestInner2"); }
   //@Test public void testInUse() { doTest("pkg/TestInUse"); }
-  //@Test public void testInterfaceSuper() { doTest("pkg/TestInterfaceSuper"); }
 
   @Test public void testGroovyClass() { doTest("pkg/TestGroovyClass"); }
   @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }

From 0a29a0a8df4093088cd61ff2abfa310a68361d69 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Wed, 12 Sep 2018 14:29:32 +0300
Subject: [PATCH 210/252] cleanup: use hasModifier

---
 .../decompiler/modules/decompiler/exps/InvocationExprent.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index f92682a..8472cef 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -248,7 +248,7 @@ public class InvocationExprent extends Exprent {
           if (invocationTyp == INVOKE_SPECIAL) {
             if (!classname.equals(this_classname)) { // TODO: direct comparison to the super class?
               StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-              boolean isInterface = cl != null && (cl.getAccessFlags() & CodeConstants.ACC_INTERFACE) != 0;
+              boolean isInterface = cl != null && cl.hasModifier(CodeConstants.ACC_INTERFACE);
               super_qualifier = !isInterface ? this_classname : classname;
             }
           }

From bc4d142688682c6e11b2e8550c169386439ccfb3 Mon Sep 17 00:00:00 2001
From: JDLogic <jrd2558@gmail.com>
Date: Tue, 11 Sep 2018 19:48:32 +0300
Subject: [PATCH 211/252] Fix short name imports shadowed by super inner
 classes

---
 .../main/collectors/ImportCollector.java      |  32 ++++++++++++++++--
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 testData/classes/pkg/TestShadowing.class      | Bin 342 -> 509 bytes
 .../pkg/TestShadowingSuperClass$Builder.class | Bin 0 -> 296 bytes
 .../classes/pkg/TestShadowingSuperClass.class | Bin 0 -> 296 bytes
 testData/results/TestShadowing.dec            |   3 +-
 testData/src/pkg/TestShadowing.java           |   9 ++++-
 7 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 testData/classes/pkg/TestShadowingSuperClass$Builder.class
 create mode 100644 testData/classes/pkg/TestShadowingSuperClass.class

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 5e2d064..16e5ad4 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -5,6 +5,7 @@ package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
 import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
@@ -20,6 +21,7 @@ public class ImportCollector {
   private final Set<String> setNotImportedNames = new HashSet<>();
   // set of field names in this class and all its predecessors.
   private final Set<String> setFieldNames = new HashSet<>();
+  private final Set<String> setInnerClassNames = new HashSet<>();
   private final String currentPackageSlash;
   private final String currentPackagePoint;
 
@@ -37,15 +39,37 @@ public class ImportCollector {
     }
 
     Map<String, StructClass> classes = DecompilerContext.getStructContext().getClasses();
+    LinkedList<String> queue = new LinkedList<>();
     StructClass currentClass = root.classStruct;
     while (currentClass != null) {
+      if (currentClass.superClass != null) {
+        queue.add(currentClass.superClass.getString());
+      }
+
+      Collections.addAll(queue, currentClass.getInterfaceNames());
+
       // all field names for the current class ..
       for (StructField f : currentClass.getFields()) {
         setFieldNames.add(f.getName());
       }
 
+      // .. all inner classes for the current class ..
+      if (currentClass.hasAttribute(StructInnerClassesAttribute.ATTRIBUTE_INNER_CLASSES)) {
+        StructInnerClassesAttribute attribute =
+                            (StructInnerClassesAttribute)currentClass.getAttribute(StructInnerClassesAttribute.ATTRIBUTE_INNER_CLASSES);
+
+        for (StructInnerClassesAttribute.Entry entry : attribute.getEntries()) {
+          if (entry.enclosingName != null && entry.enclosingName.equals(currentClass.qualifiedName)) {
+            setInnerClassNames.add(entry.simpleName);
+          }
+        }
+      }
+
       // .. and traverse through parent.
-      currentClass = currentClass.superClass != null ? classes.get(currentClass.superClass.getString()) : null;
+      currentClass = !queue.isEmpty() ? classes.get(queue.removeFirst()) : null;
+      while (currentClass == null && !queue.isEmpty()) {
+        currentClass = classes.get(queue.removeFirst());
+      }
     }
   }
 
@@ -105,12 +129,14 @@ public class ImportCollector {
 
     StructContext context = DecompilerContext.getStructContext();
 
-    // check for another class which could 'shadow' this one. Two cases:
+    // check for another class which could 'shadow' this one. Three cases:
     // 1) class with the same short name in the current package
     // 2) class with the same short name in the default package
+    // 3) inner class with the same short name in the current class, a super class, or an implemented interface
     boolean existsDefaultClass =
       (context.getClass(currentPackageSlash + shortName) != null && !packageName.equals(currentPackagePoint)) || // current package
-      (context.getClass(shortName) != null && !currentPackagePoint.isEmpty());  // default package
+      (context.getClass(shortName) != null && !currentPackagePoint.isEmpty()) || // default package
+      setInnerClassNames.contains(shortName); // inner class
 
     if (existsDefaultClass ||
         (mapSimpleNames.containsKey(shortName) && !packageName.equals(mapSimpleNames.get(shortName)))) {
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index e08ab4b..896d2db 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -70,7 +70,8 @@ public class SingleClassesTest {
   @Test public void testAnonymousSignature() { doTest("pkg/TestAnonymousSignature"); }
   @Test public void testLocalsSignature() { doTest("pkg/TestLocalsSignature"); }
   @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
-  @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
+  @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow",
+           "pkg/TestShadowingSuperClass"); }
   @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
   @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
   @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
diff --git a/testData/classes/pkg/TestShadowing.class b/testData/classes/pkg/TestShadowing.class
index 228fd8f7571f13eb43fd7fd3d86211b334142ec8..caca6001028523399a47d6a7737f665a8f393213 100644
GIT binary patch
literal 509
zcmZ`$$xZ@65Pdx??F=IbE-0X);h-Fxi#Lo1NK8zK9v~(j8>Yq9v4_l}{+0(qqKO~i
zM;VJHE+HPO>Q!}By_f2b&)0VV$Jn=EqR6pj!9dZ(5=tBu3#nPM&9TF=%aBnzjD+sX
z%bO+xBeT!7mO;xCVJJg}Y+F7@PUlv*{!^{lV6ghaYsSiRWx&9{QKfw+9)%M}%5z%6
zliC$QZT?DA=@X?@bjpx8IJ{y=wtQDI<l0Khi};}@gRba#RIxgK9Q5Uxnk0p;45Jyf
z(u1Q3fsH&0997c!TbB(B%N%<QrT=Bv$YO;dKfE6}e>O9e7iyh&IKKjk`k^9Giv+0B
zeNDQ%K}JHzW5PwAk&$AGtArXzOe^L37_9yV<9dw52uXq|g6R?X%XDase3qI)AC^QK
aIdEFOPPu^%*c1zd3~VAp#3_`i!~6pFe{Nv_

delta 229
zcmey%e2q!z)W2Q(7#J8#7$mqD*cb%a8HBkQm>2{(8CV%a*cn9G8N?>)n@pVPRnN`9
z!_FYi$iS0YQKBE5k(iQSuHwYQz|O$M$RJpdovt5}T3iAV&&*3_WDv+oEKAhSNz6;v
z_fN`7O)g<%;6i9+PykxM2DF$Fh=FE6SwKsGBD_GJ4g)h-PC#or1Ebb%26Lv!?F`IY
o8CW)gmGS{ekV6@O%2<F#F){E1*-Q)q44hyYMj%^=frEh)09i03F#rGn

diff --git a/testData/classes/pkg/TestShadowingSuperClass$Builder.class b/testData/classes/pkg/TestShadowingSuperClass$Builder.class
new file mode 100644
index 0000000000000000000000000000000000000000..ec4d6ad2c774c1ff65034e9b4b11178eb0e0c7a7
GIT binary patch
literal 296
zcmX^0Z`VEs1_l!bK`sVn1}=669(D$PMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;|
zRKL>Pq|~C2#H1Xc2v=}^X;E^jTPBDj6p~t85}c8kl3$*gm#&wUSeD4cz{0@F&LF_Z
zpj?ohu8*Q1xU?X($T=smxLC!hG&3h9wTO{{9nRwM%*%sHrxr6Z2!Kq}&q>Tn*Y{7#
zN=+_dWRS*VB7*`06VN{(zzD=ZM*wLyAWIfVgG5-hwlgqp1WU66Nj9(`H&7D?kjKQp
S$-oDsxqzZf4BQO73>*N(azX?E

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestShadowingSuperClass.class b/testData/classes/pkg/TestShadowingSuperClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..e489b608e218f71e7aabae983287bd2fcf85b22f
GIT binary patch
literal 296
zcmaKnJx>Bb5Qg93YjHUQZH<YE7C^x@l!ihQ5)z}u5&J!EaxNTu<UZhcS(#Y)1N>3O
zIYL9@Bs;V3^Uh>;e}2Ed0ZeeEQAbzdQlY2NC#a{=CJ|=@Z{Zwgv&7^%=Y-ayb+(ui
z>Vx4Mp)pG%CiI@I<Ck(9a<(*KB18vinXPzkD{;N#ya?V+lpd^$$7{1U9u(Syo82b%
z&)lHgoz@ZhRi~dA7yGZ_npXwk{-1$|)1z^Rn*65<k|T?xUdZiMYDJo(PteEF){<LC
TsAZ@lss>L8poKO>HPQY9n)pHq

literal 0
HcmV?d00001

diff --git a/testData/results/TestShadowing.dec b/testData/results/TestShadowing.dec
index 45adbea..b7c0cd7 100644
--- a/testData/results/TestShadowing.dec
+++ b/testData/results/TestShadowing.dec
@@ -1,6 +1,7 @@
 package pkg;
 
-class TestShadowing {
+class TestShadowing extends TestShadowingSuperClass {
    ext.Shadow.B instanceOfB = new ext.Shadow.B();
+   java.util.Calendar.Builder calBuilder = new java.util.Calendar.Builder();
 }
 
diff --git a/testData/src/pkg/TestShadowing.java b/testData/src/pkg/TestShadowing.java
index c8792b2..8539778 100644
--- a/testData/src/pkg/TestShadowing.java
+++ b/testData/src/pkg/TestShadowing.java
@@ -1,5 +1,12 @@
 package pkg;
 
-class TestShadowing {
+import java.util.Calendar;
+
+class TestShadowing extends TestShadowingSuperClass {
   ext.Shadow.B instanceOfB = new ext.Shadow.B();
+  Calendar.Builder calBuilder = new Calendar.Builder();
+}
+
+class TestShadowingSuperClass {
+  static class Builder { }
 }
\ No newline at end of file

From 290eae52186f8c86ac04b69f9a96faefb507ee85 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Thu, 27 Sep 2018 15:37:20 +0300
Subject: [PATCH 212/252] cleanup: use typed attribute keys

---
 .../java/decompiler/main/ClassWriter.java     | 38 ++++----
 .../decompiler/main/ClassesProcessor.java     |  9 +-
 .../main/collectors/ImportCollector.java      | 11 +--
 .../main/rels/NestedClassProcessor.java       |  6 +-
 .../modules/decompiler/exps/ExitExprent.java  |  7 +-
 .../java/decompiler/struct/StructMember.java  | 15 ++--
 .../java/decompiler/struct/StructMethod.java  |  4 +-
 .../struct/attr/StructGeneralAttribute.java   | 86 +++++++++++--------
 .../decompiler/struct/lazy/LazyLoader.java    |  4 +-
 9 files changed, 93 insertions(+), 87 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 42ef5f4..216b914 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -274,8 +274,8 @@ public class ClassWriter {
     StructClass cl = wrapper.getClassStruct();
 
     int flags = node.type == ClassNode.CLASS_ROOT ? cl.getAccessFlags() : node.access;
-    boolean isDeprecated = cl.hasAttribute("Deprecated");
-    boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || cl.hasAttribute("Synthetic");
+    boolean isDeprecated = cl.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
+    boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || cl.hasAttribute(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
     boolean isEnum = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM) && (flags & CodeConstants.ACC_ENUM) != 0;
     boolean isInterface = (flags & CodeConstants.ACC_INTERFACE) != 0;
     boolean isAnnotation = (flags & CodeConstants.ACC_ANNOTATION) != 0;
@@ -366,7 +366,7 @@ public class ClassWriter {
   private void fieldToJava(ClassWrapper wrapper, StructClass cl, StructField fd, TextBuffer buffer, int indent, BytecodeMappingTracer tracer) {
     int start = buffer.length();
     boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
-    boolean isDeprecated = fd.hasAttribute("Deprecated");
+    boolean isDeprecated = fd.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
     boolean isEnum = fd.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
 
     if (isDeprecated) {
@@ -394,7 +394,7 @@ public class ClassWriter {
 
     GenericFieldDescriptor descriptor = null;
     if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)fd.getAttribute("Signature");
+      StructGenericSignatureAttribute attr = fd.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
       if (attr != null) {
         descriptor = GenericMain.parseFieldSignature(attr.getSignature());
       }
@@ -580,7 +580,7 @@ public class ClassWriter {
       boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
       boolean isAnnotation = cl.hasModifier(CodeConstants.ACC_ANNOTATION);
       boolean isEnum = cl.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
-      boolean isDeprecated = mt.hasAttribute("Deprecated");
+      boolean isDeprecated = mt.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
       boolean clinit = false, init = false, dinit = false;
 
       MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
@@ -602,7 +602,7 @@ public class ClassWriter {
         appendRenameComment(buffer, oldName, MType.METHOD, indent);
       }
 
-      boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || mt.hasAttribute("Synthetic");
+      boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || mt.hasAttribute(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
       boolean isBridge = (flags & CodeConstants.ACC_BRIDGE) != 0;
       if (isSynthetic) {
         appendComment(buffer, "synthetic method", indent);
@@ -640,7 +640,7 @@ public class ClassWriter {
 
       GenericMethodDescriptor descriptor = null;
       if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-        StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)mt.getAttribute("Signature");
+        StructGenericSignatureAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
         if (attr != null) {
           descriptor = GenericMain.parseMethodSignature(attr.getSignature());
           if (descriptor != null) {
@@ -768,7 +768,7 @@ public class ClassWriter {
 
         buffer.append(')');
 
-        StructExceptionsAttribute attr = (StructExceptionsAttribute)mt.getAttribute("Exceptions");
+        StructExceptionsAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_EXCEPTIONS);
         if ((descriptor != null && !descriptor.exceptionTypes.isEmpty()) || attr != null) {
           throwsExceptions = true;
           buffer.append(" throws ");
@@ -793,7 +793,7 @@ public class ClassWriter {
 
       if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) { // native or abstract method (explicit or interface)
         if (isAnnotation) {
-          StructAnnDefaultAttribute attr = (StructAnnDefaultAttribute)mt.getAttribute("AnnotationDefault");
+          StructAnnDefaultAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_ANNOTATION_DEFAULT);
           if (attr != null) {
             buffer.append(" default ");
             buffer.append(attr.getDefaultValue().toJava(0, BytecodeMappingTracer.DUMMY));
@@ -946,18 +946,18 @@ public class ClassWriter {
     buffer.appendIndent(indent).append("// $FF: ").append(comment).appendLineSeparator();
   }
 
-  private static final String[] ANNOTATION_ATTRIBUTES = {
+  private static final StructGeneralAttribute.Key[] ANNOTATION_ATTRIBUTES = {
     StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS};
-  private static final String[] PARAMETER_ANNOTATION_ATTRIBUTES = {
+  private static final StructGeneralAttribute.Key[] PARAMETER_ANNOTATION_ATTRIBUTES = {
     StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
-  private static final String[] TYPE_ANNOTATION_ATTRIBUTES = {
+  private static final StructGeneralAttribute.Key[] TYPE_ANNOTATION_ATTRIBUTES = {
     StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS};
 
   private static void appendAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType) {
     Set<String> filter = new HashSet<>();
 
-    for (String name : ANNOTATION_ATTRIBUTES) {
-      StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttribute(name);
+    for (StructGeneralAttribute.Key key : ANNOTATION_ATTRIBUTES) {
+      StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttribute(key);
       if (attribute != null) {
         for (AnnotationExprent annotation : attribute.getAnnotations()) {
           String text = annotation.toJava(indent, BytecodeMappingTracer.DUMMY).toString();
@@ -973,8 +973,8 @@ public class ClassWriter {
   private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, int param) {
     Set<String> filter = new HashSet<>();
 
-    for (String name : PARAMETER_ANNOTATION_ATTRIBUTES) {
-      StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttribute(name);
+    for (StructGeneralAttribute.Key key : PARAMETER_ANNOTATION_ATTRIBUTES) {
+      StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttribute(key);
       if (attribute != null) {
         List<List<AnnotationExprent>> annotations = attribute.getParamAnnotations();
         if (param < annotations.size()) {
@@ -991,8 +991,8 @@ public class ClassWriter {
   }
 
   private static void appendTypeAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType, int index, Set<String> filter) {
-    for (String name : TYPE_ANNOTATION_ATTRIBUTES) {
-      StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)mb.getAttribute(name);
+    for (StructGeneralAttribute.Key key : TYPE_ANNOTATION_ATTRIBUTES) {
+      StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)mb.getAttribute(key);
       if (attribute != null) {
         for (TypeAnnotation annotation : attribute.getAnnotations()) {
           if (annotation.isTopLevel() && annotation.getTargetType() == targetType && (index < 0 || annotation.getIndex() == index)) {
@@ -1057,7 +1057,7 @@ public class ClassWriter {
 
   public static GenericClassDescriptor getGenericClassDescriptor(StructClass cl) {
     if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)cl.getAttribute("Signature");
+      StructGenericSignatureAttribute attr = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
       if (attr != null) {
         return GenericMain.parseClassSignature(attr.getSignature());
       }
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 86b7194..49ccd49 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -18,6 +16,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -59,7 +58,7 @@ public class ClassesProcessor {
     for (StructClass cl : context.getClasses().values()) {
       if (cl.isOwn() && !mapRootClasses.containsKey(cl.qualifiedName)) {
         if (bDecompileInner) {
-          StructInnerClassesAttribute inner = (StructInnerClassesAttribute)cl.getAttribute("InnerClasses");
+          StructInnerClassesAttribute inner = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
 
           if (inner != null) {
             for (StructInnerClassesAttribute.Entry entry : inner.getEntries()) {
@@ -136,7 +135,7 @@ public class ClassesProcessor {
             Set<String> setNestedClasses = mapNestedClassReferences.get(superClass);
             if (setNestedClasses != null) {
               StructClass scl = superNode.classStruct;
-              StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttribute("InnerClasses");
+              StructInnerClassesAttribute inner = scl.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
 
               if (inner == null || inner.getEntries().isEmpty()) {
                 DecompilerContext.getLogger().writeMessage(superClass + " does not contain inner classes!", IFernflowerLogger.Severity.WARN);
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 16e5ad4..7b8c3b4 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -1,10 +1,9 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
 import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.struct.StructClass;
@@ -54,10 +53,8 @@ public class ImportCollector {
       }
 
       // .. all inner classes for the current class ..
-      if (currentClass.hasAttribute(StructInnerClassesAttribute.ATTRIBUTE_INNER_CLASSES)) {
-        StructInnerClassesAttribute attribute =
-                            (StructInnerClassesAttribute)currentClass.getAttribute(StructInnerClassesAttribute.ATTRIBUTE_INNER_CLASSES);
-
+      StructInnerClassesAttribute attribute = currentClass.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
+      if (attribute != null) {
         for (StructInnerClassesAttribute.Entry entry : attribute.getEntries()) {
           if (entry.enclosingName != null && entry.enclosingName.equals(currentClass.qualifiedName)) {
             setInnerClassNames.add(entry.simpleName);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index b08d85c..b3e5710 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -171,8 +172,7 @@ public class NestedClassProcessor {
         Set<String> setEnclosing = child.enclosingClasses;
 
         if (!setEnclosing.isEmpty()) {
-          StructEnclosingMethodAttribute attr =
-            (StructEnclosingMethodAttribute)child.classStruct.getAttribute("EnclosingMethod");
+          StructEnclosingMethodAttribute attr = child.classStruct.getAttribute(StructGeneralAttribute.ATTRIBUTE_ENCLOSING_METHOD);
           if (attr != null &&
               attr.getMethodName() != null &&
               node.classStruct.qualifiedName.equals(attr.getClassName()) &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index 25506fa..b3cc07d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -11,6 +9,7 @@ import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
@@ -84,7 +83,7 @@ public class ExitExprent extends Exprent {
       ClassNode node = ((ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE));
 
       if (method != null && node != null) {
-        StructExceptionsAttribute attr = (StructExceptionsAttribute)method.methodStruct.getAttribute("Exceptions");
+        StructExceptionsAttribute attr = method.methodStruct.getAttribute(StructGeneralAttribute.ATTRIBUTE_EXCEPTIONS);
 
         if (attr != null) {
           String classname = null;
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index 7a3afc4..a5b87f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -22,12 +22,13 @@ public class StructMember {
     return accessFlags;
   }
 
-  public StructGeneralAttribute getAttribute(String name) {
-    return attributes.get(name);
+  public <T extends StructGeneralAttribute> T getAttribute(StructGeneralAttribute.Key<T> attribute) {
+    //noinspection unchecked
+    return (T)attributes.get(attribute.getName());
   }
 
-  public boolean hasAttribute(String name) {
-    return attributes.containsKey(name);
+  public boolean hasAttribute(StructGeneralAttribute.Key<?> attribute) {
+    return attributes.containsKey(attribute.getName());
   }
 
   public boolean hasModifier(int modifier) {
@@ -49,12 +50,12 @@ public class StructMember {
       StructGeneralAttribute attribute = readAttribute(in, pool, name);
 
       if (attribute != null) {
-        if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(name)) {
+        if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.getName().equals(name) && attributes.containsKey(name)) {
           // merge all variable tables
           StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.get(name);
           table.add((StructLocalVariableTableAttribute)attribute);
         }
-        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name) && attributes.containsKey(name)) {
+        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.getName().equals(name) && attributes.containsKey(name)) {
           // merge all variable tables
           StructLocalVariableTypeTableAttribute table = (StructLocalVariableTypeTableAttribute)attributes.get(name);
           table.add((StructLocalVariableTypeTableAttribute)attribute);
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index 42003f3..ae6343d 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.*;
@@ -63,7 +63,7 @@ public class StructMethod extends StructMember {
 
   @Override
   protected StructGeneralAttribute readAttribute(DataInputFullStream in, ConstantPool pool, String name) throws IOException {
-    if (StructGeneralAttribute.ATTRIBUTE_CODE.equals(name)) {
+    if (StructGeneralAttribute.ATTRIBUTE_CODE.getName().equals(name)) {
       if (!classStruct.isOwn()) {
         // skip code in foreign classes
         in.discard(8);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index eb69af4..f421671 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -16,75 +14,87 @@ import java.io.IOException;
   }
 */
 public class StructGeneralAttribute {
-  public static final String ATTRIBUTE_CODE = "Code";
-  public static final String ATTRIBUTE_INNER_CLASSES = "InnerClasses";
-  public static final String ATTRIBUTE_SIGNATURE = "Signature";
-  public static final String ATTRIBUTE_ANNOTATION_DEFAULT = "AnnotationDefault";
-  public static final String ATTRIBUTE_EXCEPTIONS = "Exceptions";
-  public static final String ATTRIBUTE_ENCLOSING_METHOD = "EnclosingMethod";
-  public static final String ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS = "RuntimeVisibleAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS = "RuntimeInvisibleAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = "RuntimeVisibleParameterAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = "RuntimeInvisibleParameterAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = "RuntimeVisibleTypeAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = "RuntimeInvisibleTypeAnnotations";
-  public static final String ATTRIBUTE_LOCAL_VARIABLE_TABLE = "LocalVariableTable";
-  public static final String ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE = "LocalVariableTypeTable";
-  public static final String ATTRIBUTE_CONSTANT_VALUE = "ConstantValue";
-  public static final String ATTRIBUTE_BOOTSTRAP_METHODS = "BootstrapMethods";
-  public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
-  public static final String ATTRIBUTE_DEPRECATED = "Deprecated";
-  public static final String ATTRIBUTE_LINE_NUMBER_TABLE = "LineNumberTable";
-  public static final String ATTRIBUTE_METHOD_PARAMETERS = "MethodParameters";
+  public static final Key<StructGeneralAttribute> ATTRIBUTE_CODE = new Key<>("Code");
+  public static final Key<StructInnerClassesAttribute> ATTRIBUTE_INNER_CLASSES = new Key<>("InnerClasses");
+  public static final Key<StructGenericSignatureAttribute> ATTRIBUTE_SIGNATURE = new Key<>("Signature");
+  public static final Key<StructAnnDefaultAttribute> ATTRIBUTE_ANNOTATION_DEFAULT = new Key<>("AnnotationDefault");
+  public static final Key<StructExceptionsAttribute> ATTRIBUTE_EXCEPTIONS = new Key<>("Exceptions");
+  public static final Key<StructEnclosingMethodAttribute> ATTRIBUTE_ENCLOSING_METHOD = new Key<>("EnclosingMethod");
+  public static final Key<StructAnnotationAttribute> ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS = new Key<>("RuntimeVisibleAnnotations");
+  public static final Key<StructAnnotationAttribute> ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS = new Key<>("RuntimeInvisibleAnnotations");
+  public static final Key<StructAnnotationParameterAttribute> ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = new Key<>("RuntimeVisibleParameterAnnotations");
+  public static final Key<StructAnnotationParameterAttribute> ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = new Key<>("RuntimeInvisibleParameterAnnotations");
+  public static final Key<StructTypeAnnotationAttribute> ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = new Key<>("RuntimeVisibleTypeAnnotations");
+  public static final Key<StructTypeAnnotationAttribute> ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = new Key<>("RuntimeInvisibleTypeAnnotations");
+  public static final Key<StructLocalVariableTableAttribute> ATTRIBUTE_LOCAL_VARIABLE_TABLE = new Key<>("LocalVariableTable");
+  public static final Key<StructLocalVariableTypeTableAttribute> ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE = new Key<>("LocalVariableTypeTable");
+  public static final Key<StructConstantValueAttribute> ATTRIBUTE_CONSTANT_VALUE = new Key<>("ConstantValue");
+  public static final Key<StructBootstrapMethodsAttribute> ATTRIBUTE_BOOTSTRAP_METHODS = new Key<>("BootstrapMethods");
+  public static final Key<StructGeneralAttribute> ATTRIBUTE_SYNTHETIC = new Key<>("Synthetic");
+  public static final Key<StructGeneralAttribute> ATTRIBUTE_DEPRECATED = new Key<>("Deprecated");
+  public static final Key<StructLineNumberTableAttribute> ATTRIBUTE_LINE_NUMBER_TABLE = new Key<>("LineNumberTable");
+  public static final Key<StructMethodParametersAttribute> ATTRIBUTE_METHOD_PARAMETERS = new Key<>("MethodParameters");
+
+  public static class Key<T extends StructGeneralAttribute> {
+    private final String name;
+
+    public Key(String name) {
+      this.name = name;
+    }
+
+    public String getName() {
+      return name;
+    }
+  }
 
   private String name;
 
   public static StructGeneralAttribute createAttribute(String name) {
     StructGeneralAttribute attr;
 
-    if (ATTRIBUTE_INNER_CLASSES.equals(name)) {
+    if (ATTRIBUTE_INNER_CLASSES.getName().equals(name)) {
       attr = new StructInnerClassesAttribute();
     }
-    else if (ATTRIBUTE_CONSTANT_VALUE.equals(name)) {
+    else if (ATTRIBUTE_CONSTANT_VALUE.getName().equals(name)) {
       attr = new StructConstantValueAttribute();
     }
-    else if (ATTRIBUTE_SIGNATURE.equals(name)) {
+    else if (ATTRIBUTE_SIGNATURE.getName().equals(name)) {
       attr = new StructGenericSignatureAttribute();
     }
-    else if (ATTRIBUTE_ANNOTATION_DEFAULT.equals(name)) {
+    else if (ATTRIBUTE_ANNOTATION_DEFAULT.getName().equals(name)) {
       attr = new StructAnnDefaultAttribute();
     }
-    else if (ATTRIBUTE_EXCEPTIONS.equals(name)) {
+    else if (ATTRIBUTE_EXCEPTIONS.getName().equals(name)) {
       attr = new StructExceptionsAttribute();
     }
-    else if (ATTRIBUTE_ENCLOSING_METHOD.equals(name)) {
+    else if (ATTRIBUTE_ENCLOSING_METHOD.getName().equals(name)) {
       attr = new StructEnclosingMethodAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS.equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS.equals(name)) {
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS.getName().equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS.getName().equals(name)) {
       attr = new StructAnnotationAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS.equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS.equals(name)) {
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS.getName().equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS.getName().equals(name)) {
       attr = new StructAnnotationParameterAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS.equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(name)) {
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS.getName().equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.getName().equals(name)) {
       attr = new StructTypeAnnotationAttribute();
     }
-    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name)) {
+    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.getName().equals(name)) {
       attr = new StructLocalVariableTableAttribute();
     }
-    else if (ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) {
+    else if (ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.getName().equals(name)) {
       attr = new StructLocalVariableTypeTableAttribute();
     }
-    else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
+    else if (ATTRIBUTE_BOOTSTRAP_METHODS.getName().equals(name)) {
       attr = new StructBootstrapMethodsAttribute();
     }
-    else if (ATTRIBUTE_SYNTHETIC.equals(name) || ATTRIBUTE_DEPRECATED.equals(name)) {
+    else if (ATTRIBUTE_SYNTHETIC.getName().equals(name) || ATTRIBUTE_DEPRECATED.getName().equals(name)) {
       attr = new StructGeneralAttribute();
     }
-    else if (ATTRIBUTE_LINE_NUMBER_TABLE.equals(name)) {
+    else if (ATTRIBUTE_LINE_NUMBER_TABLE.getName().equals(name)) {
       attr = new StructLineNumberTableAttribute();
     }
-    else if (ATTRIBUTE_METHOD_PARAMETERS.equals(name)) {
+    else if (ATTRIBUTE_METHOD_PARAMETERS.getName().equals(name)) {
       attr = new StructMethodParametersAttribute();
     }
     else {
diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
index abd24f9..63c0f8e 100644
--- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.lazy;
 
 import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
@@ -90,7 +90,7 @@ public class LazyLoader {
           for (int j = 0; j < attrSize; j++) {
             int attrNameIndex = in.readUnsignedShort();
             String attrName = pool.getPrimitiveConstant(attrNameIndex).getString();
-            if (!StructGeneralAttribute.ATTRIBUTE_CODE.equals(attrName)) {
+            if (!StructGeneralAttribute.ATTRIBUTE_CODE.getName().equals(attrName)) {
               in.discard(in.readInt());
               continue;
             }

From 44bfa867e57f38ec0fddac6e02d15f4d81868fab Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Fri, 28 Sep 2018 15:44:42 +0200
Subject: [PATCH 213/252] Deeper sanity checks of inconsistent inner classes
 (anonymous vs. local)

---
 .../decompiler/main/ClassesProcessor.java     | 109 ++++++++++++++++--
 .../main/rels/NestedClassProcessor.java       |   7 +-
 2 files changed, 102 insertions(+), 14 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 49ccd49..2e52ba1 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -2,6 +2,8 @@
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.code.Instruction;
+import org.jetbrains.java.decompiler.code.InstructionSequence;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper;
 import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
@@ -18,6 +20,7 @@ import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.TextBuffer;
@@ -26,7 +29,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;
 
-public class ClassesProcessor {
+public class ClassesProcessor implements CodeConstants {
   public static final int AVERAGE_CLASS_SIZE = 16 * 1024;
 
   private final StructContext context;
@@ -171,20 +174,24 @@ public class ClassesProcessor {
                 if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) {
                   StructClass cl = nestedNode.classStruct;
 
-                  // remove static if anonymous class (a common compiler bug)
-                  nestedNode.access &= ~CodeConstants.ACC_STATIC;
-
                   int[] interfaces = cl.getInterfaces();
 
-                  if (interfaces.length > 0) {
-                    if (interfaces.length > 1) {
-                      String message = "Inconsistent anonymous class definition: " + cl.qualifiedName;
-                      DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+                  // sanity checks of the class supposed to be anonymous
+                  boolean isAnonymousChecked = checkClassAnonymous(cl, scl);
+                  
+                  if(isAnonymousChecked) {
+                    // remove static if anonymous class (a common compiler bug)
+                    nestedNode.access &= ~CodeConstants.ACC_STATIC;
+                    
+                    if (interfaces.length > 0) {
+                      nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
                     }
-                    nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
-                  }
-                  else {
-                    nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
+                    else {
+                      nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
+                    }
+                  } else { // change it to a local class
+                    nestedNode.type = ClassNode.CLASS_LOCAL;
+                    nestedNode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
                   }
                 }
                 else if (nestedNode.type == ClassNode.CLASS_LOCAL) {
@@ -205,6 +212,84 @@ public class ClassesProcessor {
       }
     }
   }
+  
+  private boolean checkClassAnonymous(StructClass cl, StructClass enclosing_cl) {
+    
+    int[] interfaces = cl.getInterfaces();
+    boolean hasNonTrivialSuperClass = cl.superClass != null && !VarType.VARTYPE_OBJECT.equals(new VarType(cl.superClass.getString(), true));
+    
+    // checking super class and interfaces
+    if(interfaces.length > 0) { 
+      if(hasNonTrivialSuperClass || interfaces.length > 1) { // can't have multiple 'sources'
+        String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName+"'. Multiple interfaces and/or super class defined.";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+        return false;
+      }
+    } else if(cl.superClass == null) { // neither interface nor super class defined
+      String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName+"'. Neither interface nor super class defined.";
+      DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+      return false;
+    }
+    
+    // FIXME: check constructors
+    // FIXME: check enclosing class/method
+    
+    ConstantPool pool = enclosing_cl.getPool();
+    
+    int ref_counter = 0;
+    boolean ref_not_new = false;
+    
+    // checking references in the enclosing class (TODO: limit to the enclosing method?)
+    for (StructMethod mt : enclosing_cl.getMethods()) {
+      try {
+        mt.expandData();
+        InstructionSequence seq = mt.getInstructionSequence();
+  
+        int len = seq.length();
+        for (int i = 0; i < len; i++) {
+          Instruction instr = seq.getInstr(i);
+
+          switch(instr.opcode) {
+          case opc_checkcast:
+          case opc_instanceof:
+            if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+              ref_counter++;
+              ref_not_new = true;
+            }
+            break;
+          case opc_new:
+          case opc_anewarray:
+          case opc_multianewarray:
+            if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+              ref_counter++;
+            }
+            break;
+          case opc_getstatic:
+          case opc_putstatic:
+            if(cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
+              ref_counter++;
+              ref_not_new = true;
+            }
+          }
+        }
+
+        mt.releaseResources();
+      } catch(IOException ex) {
+        String message = "Could not read method while checking anonymous class definition: '"+enclosing_cl.qualifiedName+"', '"+
+                         InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor())+"'";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+        return false;
+      }
+      
+      if(ref_counter > 1 || ref_not_new) {
+        String message = "Inconsistent references to the class '"+cl.qualifiedName+"' which is supposed to be anonymous";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+        return false;
+      }
+    }
+    
+    return true;
+  }
 
   public void writeClass(StructClass cl, TextBuffer buffer) throws IOException {
     ClassNode root = mapRootClasses.get(cl.qualifiedName);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index b3e5710..8ea5285 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -72,8 +72,11 @@ public class NestedClassProcessor {
       else if (child.type != ClassNode.CLASS_MEMBER || (child.access & CodeConstants.ACC_STATIC) == 0) {
         insertLocalVars(node, child);
 
-        if (child.type == ClassNode.CLASS_LOCAL) {
-          setLocalClassDefinition(node.getWrapper().getMethods().getWithKey(child.enclosingMethod), child);
+        if (child.type == ClassNode.CLASS_LOCAL && child.enclosingMethod != null) {
+          MethodWrapper enclosingMethodWrapper = node.getWrapper().getMethods().getWithKey(child.enclosingMethod);
+          if(enclosingMethodWrapper != null) { // e.g. in case of switch-on-enum. FIXME: some proper handling of multiple enclosing classes 
+            setLocalClassDefinition(enclosingMethodWrapper, child);
+          }
         }
       }
     }

From eaa28305964ee54e5266bf78189c75c4d5eb7878 Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Fri, 28 Sep 2018 15:54:51 +0200
Subject: [PATCH 214/252] Addressed review comments + additional test

---
 .../decompiler/main/ClassesProcessor.java     |  51 ++++---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../pkg/TestSuspendLambdaKt$sl1$1.class       | Bin 0 -> 2808 bytes
 .../classes/pkg/TestSuspendLambdaKt.class     | Bin 0 -> 1171 bytes
 testData/results/TestSuspendLambdaKt.dec      | 139 ++++++++++++++++++
 testData/src/pkg/TestSuspendLambda.kt         |   4 +
 6 files changed, 171 insertions(+), 24 deletions(-)
 create mode 100644 testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class
 create mode 100644 testData/classes/pkg/TestSuspendLambdaKt.class
 create mode 100644 testData/results/TestSuspendLambdaKt.dec
 create mode 100644 testData/src/pkg/TestSuspendLambda.kt

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 2e52ba1..0e29334 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -245,30 +245,33 @@ public class ClassesProcessor implements CodeConstants {
         mt.expandData();
         InstructionSequence seq = mt.getInstructionSequence();
   
-        int len = seq.length();
-        for (int i = 0; i < len; i++) {
-          Instruction instr = seq.getInstr(i);
-
-          switch(instr.opcode) {
-          case opc_checkcast:
-          case opc_instanceof:
-            if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
-              ref_counter++;
-              ref_not_new = true;
-            }
-            break;
-          case opc_new:
-          case opc_anewarray:
-          case opc_multianewarray:
-            if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
-              ref_counter++;
-            }
-            break;
-          case opc_getstatic:
-          case opc_putstatic:
-            if(cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
-              ref_counter++;
-              ref_not_new = true;
+        if(seq != null) {
+          
+          int len = seq.length();
+          for (int i = 0; i < len; i++) {
+            Instruction instr = seq.getInstr(i);
+  
+            switch(instr.opcode) {
+            case opc_checkcast:
+            case opc_instanceof:
+              if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+                ref_counter++;
+                ref_not_new = true;
+              }
+              break;
+            case opc_new:
+            case opc_anewarray:
+            case opc_multianewarray:
+              if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+                ref_counter++;
+              }
+              break;
+            case opc_getstatic:
+            case opc_putstatic:
+              if(cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
+                ref_counter++;
+                ref_not_new = true;
+              }
             }
           }
         }
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 896d2db..b2df702 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -123,6 +123,7 @@ public class SingleClassesTest {
   @Test public void testGroovyClass() { doTest("pkg/TestGroovyClass"); }
   @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
   @Test public void testPrivateClasses() { doTest("pkg/PrivateClasses"); }
+  @Test public void testSuspendLambdaKt() { doTest("pkg/TestSuspendLambdaKt"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class b/testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..dd1fe0e7d04ef998b189081ff1e702befaa7acf8
GIT binary patch
literal 2808
zcmbVO+jA3D82_Cl?Iug;jRJCyQfZqMmLP(Xij+2$&@`=VTdY-avpJ;OY<BBjN_pei
zN5>amdGrYxrgUURD!%zY>G+*=b16yfXeN8E-}$b;?>pzuzkmG=z!f}ZII+N8Pxak(
zZk6&{wOG<-ydl?252YnAh9B}3+cOPI(QU`}J;UOzvbIrG49nw=rJ2f}qnSFjAbIFp
zx@Xvyt4s%@^mu*0h1;ZU5nEpqq~jOs1dEp8Wo~BjYubjUn3`2q=89`v7i$b-|3xPW
z5r(tDiGB2v(9O_oSQ~bQGh7&H7dzU%)a1I4H4<cot0Q%j_MysjU>!#kaTy^TW;nd7
zR^Vrbp}g&sl{M}a9nB!;YL;btHSf7f!8c8<Xmaw=`F|s`JwZuSqwSug$U4N=&|M|h
z7|wVS1{jW&xi>j?Z*FlRSI9n47uES}VJbVtFgViDia{KeaRkR0x=1f>GO%16@8Cp?
zY&*$tE)cK!y3Sp9&Y9K>(|7n#&`UVY5aXLVUl;ITINB11g;mFXRI@gYvp5&S86+6O
zYCavsdklR|=%|lfk5?rO(Kdm&!N#zad9u}0J%?-6OdJ<59K-t<VK`Ddy_Y~jl0jM*
zCrqJBCzve7F@}pWQn<u$C@@ceS;A$8Xs)0xOcW-w6xKQ{YDkY$GJX(48du3FO~rGj
z$;+ClQha%~?ga_g7!+MI&4gzsh8^zuRX&_3@`tv=6T`c38BRPhywyYlb5VRm2p=~{
zlbdg;PSzV%IWtPC-#|vjb&NAayj8<xIF;YGJP>-ig=~}jInWZ8AW!!MV0TTzZNlZj
z`LIMFAIa7I(=fqRT1!QsZ&pSZrb!i@Lg-QQ-aeTBL7W-ldP`A?;%+n5_td^-en`kO
z9M@O5UYXY%t;(r7=G?+=o-qt}fJ%$YS|U)uoQzq_i&#vF3UH4hagf4s+(AwdFUHY}
zm>At>=&v7}<(^j3JdGk2s&0g-@-xvKqG_=<g_wpYIV)liru9vOno^o-;m#9TrZ3bN
zl0(r@-_Dbhq08*fo9}P^vCVd#ym{Ikp;d9DbcFyvu35JAxN7?@p$wEp9pEEjl?q1N
z#-$1YDKcr7D2M}joAAA)IflsZ1<^3{=IQn+_|+nJf|bLR7<y$^TMy=^?)h|=RC&(Y
zFkFKUO*CsGVe0MOMx^$T#Z;qgX&zM}2JIj)wOv@Fb*JwG+r|wTTyP9i|3gNzLNu~X
zR&C$W`LrQiHMl#O;zhrl-Sjw>b5T8evzBh!E@eAGV%07Y&~ui>ok>%3T~6tKB5=`C
zoBME?K-EPNrB?xAgi1KIU40XDQN?JbLbIbp5u!epOzq&%7J8o11n3u#B!mf)AE}Q}
zKedhHh2#sI`dLtjmq_zBm|FfFXMTdbgEKGi?(6#l=VzZ|bZiUCbA0&h6|OH2eEbrh
zyrv^znA9F4v191LO?*l-F}j5bQmRU`9-;}?_QSYFvaQ{<zi^r?nJm!P1Dn>miN25e
zb^0XA1X5f4C<z1Wj?~!DW-^j`iO+tiZTE}BBd)?Wr6!5&O%2R!<MUStEfb+SJ0{$~
zYKq3G7Y@0L1sZ)v;}D#Ncp-6*_<r#U2)JJ-QsLa*WNHgbI|z|4w(v!hw{QY&2Tl;9
zRw-^nO5fX3x&uYR@MtT9HTcxq>g>e4+$l-rnc9O;PO6FeXj)Ds(ut15ZHx8SrJT&m
z>GSEat2feelB)Oy35~#@_7QzD`A66zkhV!}mgdV8q%T(x&S9nY{|aB%XW!)T0N>`I
Yp(sZB3Yd!$_zEH}9=a&Ih`NaX1B0pc`v3p{

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestSuspendLambdaKt.class b/testData/classes/pkg/TestSuspendLambdaKt.class
new file mode 100644
index 0000000000000000000000000000000000000000..c686101169d710526af7dbbf4884515d885c357f
GIT binary patch
literal 1171
zcmb_a-%ry}6#i~ox~@(c1#ufF2q>EZ-FRgoF(f356QctX!&A4FrK4+2@9p9v@lWwD
z@W+Ej6SLr(f0XguLj8rvi%omZJ*Ve8=iGC?uirj?2CxpBVRF~yq80P!ZqRKygLc<>
zC^BFS`MxuBY~Klb_TzTn?T}YxP`O`Ym~S41!uJBZKOESHanKQ77;t<0>{Q!e=w1?1
zPyctqD2#;{xZK_f13JWx%vN7b1NH(>Y;0~c|Lli+42#V$>e+o)v?Ir(7MvgmMUsHq
zJE7Q#eV?NAo-10i@r80FO?y%6IgCNiLctXVqu!xgdSa6<UassjOr+>Xu5h}Ja45Ml
z7^*Z)CIw-Xc49)B3IjVL*9(tCm+J40j;GDhv8fc4(=SgtFCB)uutJAY!C;nY8J1=#
zRkf;Ex}_CZRjaZuAK2*l<dtp`AXCzevAllrQqc%ml*!i_thBjb_wZv?7tEP10EXgU
zSg=H^UaDnqi{@89o5Er_t#MJh%6<;>xNTw%3k<jZ&65n47^cqEUON&D*_PJ}91%w@
z!_3o|m@#l0!O-Jg+jk%QTr-2V6?Q3Tyh$Y5i3e>r+I1*~;qcOJ|0fojtuT%{?zShZ
z<{ClZMq9qaxyxy^XT9&A>l`&=nI@@&k|Z5j%aSz6piEjPzmeEQWMLAaDrC))S3cTX
z<X)3zxJOdPO5`d2{%?2#S8<L0OZ0L=OJMvH=AN<lSRCQbJLKM+OQd2YNq85lq)md)
zkp>D_Bl(2vaVnZWfZD)B@>-Zot*HjCV_J$EQWOrrIEpA8z~C6;nBkb^xS70J4wFOw
E4(0SBy8r+H

literal 0
HcmV?d00001

diff --git a/testData/results/TestSuspendLambdaKt.dec b/testData/results/TestSuspendLambdaKt.dec
new file mode 100644
index 0000000..2193908
--- /dev/null
+++ b/testData/results/TestSuspendLambdaKt.dec
@@ -0,0 +1,139 @@
+import kotlin.Metadata;
+import kotlin.Unit;
+import kotlin.SuccessOrFailure.Failure;
+import kotlin.coroutines.Continuation;
+import kotlin.coroutines.intrinsics.IntrinsicsKt;
+import kotlin.coroutines.jvm.internal.SuspendLambda;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.Intrinsics;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@Metadata(
+   mv = {1, 1, 11},
+   bv = {1, 0, 2},
+   k = 2,
+   xi = 2,
+   d1 = {"\u0000\u0016\n\u0000\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\u0010\u0000\n\u0002\b\u0003\",\u0010\u0000\u001a\u0018\b\u0001\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00030\u0002\u0012\u0006\u0012\u0004\u0018\u00010\u00040\u0001ø\u0001\u0000¢\u0006\n\n\u0002\u0010\u0007\u001a\u0004\b\u0005\u0010\u0006\u0082\u0002\u0004\n\u0002\b\u0019"},
+   d2 = {"sl1", "Lkotlin/Function1;", "Lkotlin/coroutines/Continuation;", "", "", "getSl1", "()Lkotlin/jvm/functions/Function1;", "Lkotlin/jvm/functions/Function1;"}
+)
+public final class TestSuspendLambdaKt {
+   @NotNull
+   private static final Function1<Continuation<? super Unit>, Object> sl1;
+
+   @NotNull
+   public static final Function1<Continuation<? super Unit>, Object> getSl1() {
+      return sl1;
+   }
+
+   static {
+      @Metadata(
+         mv = {1, 1, 11},
+         bv = {1, 0, 2},
+         k = 3,
+         xi = 2,
+         d1 = {"\u0000\n\n\u0000\n\u0002\u0010\u0002\n\u0002\b\u0002\u0010\u0000\u001a\u00020\u0001H\u008a@ø\u0001\u0000¢\u0006\u0004\b\u0002\u0010\u0003"},
+         d2 = {"<anonymous>", "", "invoke", "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
+      )
+      final class NamelessClass_1 extends SuspendLambda implements Function1<Continuation<? super Unit>, Object> {
+         int label;
+
+         @Nullable
+         public final Object invokeSuspend(@NotNull Object var1) {
+            Object var3 = IntrinsicsKt.getCOROUTINE_SUSPENDED();
+            switch(this.label) {
+            case 0:
+               if (var1 instanceof Failure) {
+                  throw ((Failure)var1).exception;
+               }
+
+               String var2 = "SL1";// 3
+               System.out.println(var2);
+               return Unit.INSTANCE;// 4
+            default:
+               throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
+            }
+         }
+
+         NamelessClass_1(Continuation var1) {
+            super(1, var1);
+         }
+
+         @NotNull
+         public final Continuation<Unit> create(@NotNull Continuation<? super Unit> continuation) {
+            Intrinsics.checkParameterIsNotNull(continuation, "continuation");
+            NamelessClass_1 var2 = new NamelessClass_1(continuation);
+            return var2;
+         }
+
+         @Nullable
+         public final Object invoke(@NotNull Continuation<? super Unit> continuation) {
+            return ((NamelessClass_1)this.create(continuation)).invokeSuspend(Unit.INSTANCE);
+         }
+      }
+
+      sl1 = (Function1)(new NamelessClass_1((Continuation)null));// 2
+   }
+}
+
+class 'TestSuspendLambdaKt' {
+   method 'getSl1 ()Lkotlin/jvm/functions/Function1;' {
+      0      25
+      3      25
+   }
+
+   method '<clinit> ()V' {
+      4      74
+      8      74
+      b      74
+      e      75
+   }
+}
+
+class 'TestSuspendLambdaKt$sl1$1' {
+   method 'invokeSuspend (Ljava/lang/Object;)Ljava/lang/Object;' {
+      0      42
+      3      42
+      5      43
+      8      43
+      1e      45
+      21      45
+      24      46
+      27      46
+      2a      46
+      2c      49
+      2e      49
+      2f      50
+      33      50
+      36      51
+      39      51
+      3e      53
+      43      53
+   }
+
+   method '<init> (Lkotlin/coroutines/Continuation;)V' {
+      1      58
+      3      58
+      6      59
+   }
+
+   method 'create (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;' {
+      1      63
+      3      63
+      e      64
+      10      65
+   }
+
+   method 'invoke (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
+      2      70
+      5      70
+      8      70
+      b      70
+      e      70
+   }
+}
+
+Lines mapping:
+2 <-> 75
+3 <-> 50
+4 <-> 52
diff --git a/testData/src/pkg/TestSuspendLambda.kt b/testData/src/pkg/TestSuspendLambda.kt
new file mode 100644
index 0000000..6feef9d
--- /dev/null
+++ b/testData/src/pkg/TestSuspendLambda.kt
@@ -0,0 +1,4 @@
+
+val sl1: suspend () -> Unit = {
+    println("SL1")
+}
\ No newline at end of file

From 866661df298b34e5ea08cda4f5922964e275bfaa Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 28 Sep 2018 17:09:10 +0200
Subject: [PATCH 215/252] Cleanup (test data format)

---
 .../java/decompiler/SingleClassesTest.java    |   2 +-
 .../pkg/TestSuspendLambdaKt$sl1$1.class       | Bin 2808 -> 2740 bytes
 .../classes/pkg/TestSuspendLambdaKt.class     | Bin 1171 -> 1174 bytes
 testData/results/TestSuspendLambdaKt.dec      | 132 ++++++++++--------
 testData/src/pkg/TestSuspendLambda.kt         |   1 +
 5 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index b2df702..7482741 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -123,7 +123,7 @@ public class SingleClassesTest {
   @Test public void testGroovyClass() { doTest("pkg/TestGroovyClass"); }
   @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
   @Test public void testPrivateClasses() { doTest("pkg/PrivateClasses"); }
-  @Test public void testSuspendLambdaKt() { doTest("pkg/TestSuspendLambdaKt"); }
+  @Test public void testSuspendLambda() { doTest("pkg/TestSuspendLambdaKt"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class b/testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class
index dd1fe0e7d04ef998b189081ff1e702befaa7acf8..47b0abe9c35e4fb37e3a2dce42a23b377e20180c 100644
GIT binary patch
delta 1119
zcmY*YYf~F#6n@^l<g!g@lQvw6+?v=+5*vfi3aMyYpvDHQ1*|mQHn623$p*U{YQ-7G
zpTN9+&>5#cz|k4#Ftj5x7QXt;8GnMm!O;&oJ};o7n?2_}=RNo5Y<^E{Ct^SS^}~+<
zhVZ#S&q{46w-pVGwrJH|ZPuKbmbc=#i?T;#w2P&U{l56PQ)w+tIljGU`*uM<+>>7f
zy1GSOXA+%ymE@6JQiHT0cg31$mzTA{kxq13=)h?Kvu;<MI?crhUO-P68hQm1wWeRM
zy1Cnq*Q)!eNxNEaJ#d2Pm)~h;&z(Usi~*zs^qEpVgtG!CmhDwLSGV1z+{`1-cN#&Q
zmw#yep)@jKTtHS1=$+!C9Mw}@FC%Xuhe3g3M`h;RsvpFVe5m(?F5z+*!+2GGqo>5E
z+}DT175ST<>=?uA77BPn!0_)^Iayyxp|lb0k`u;|IVq4lFE`D8`Pj&W#!$3i;w|~J
zajVT*Xf{^rj$duMAxz7>nH0C=oH^Nk8#5N(!E6L$c+=wO?+OenbQ9NX&$-@o{i@rt
zRa}t?3i5k184(B^u0)_$ZkfFuL6jpXVM@h+5J3oGC4D4+HP0N63TTy8wGj~FnoI>I
zyE|0ZvySH<?X+Y!DvS0_0??3O1va!<HASC!B|TQSpd`5#jLTnw?mE}QJO*N_26Qy3
zeaX|{IsOdY)9G#WeM^PU;Nfw=Pi5x!G4M64Jq&E)#pie8=cb<ErR)w~d4iG6T@>cy
zuRX=p=k(UGLf*~+m=o7<{UF0Q<%xBU@Cns6I;mflg)b4~2Zwim^79Ge#x$u79`6G5
zKgH801vxzu6rhl%ta?AmB&tp@ZDgL}=9aQ@I6}$H%3<W74(~GYx1V8sZWr1-J?~6q
zH)$3BX*I@H-&5g?pT<0GEy@~J|LsH-|6eCD+$D;Ko%GUGbrMf!_VE4=KHP&wXm;?i
zDx^kXx;R~QJfx~2f=_vRGG*N`jy}S5D_yek$$WNrG;gIREIguz0hjzUlEqT01ki~!
z@?~lk0Xya~S+vamAAvnyrsafUF~#B@H+|A$q)nVFW#~mL9K4Hg{?YEKz@;Kix8Xk1
Tc&K8z48udsL*2t&58=N7?<&dt

delta 1161
zcmZWo&2JM|5dXbhuh+ZT1b-xf0QqzZiEUyWOakGfq=W=h=c9E}nx<cCXMv5KHSw+k
zhy#Cv^^i~x9JuuuP~;#Ym7H_zxl((t)N?PbI?p%(RB7LvnK$$1_nVow+Z}&*wC?}=
z<`)2?c*M~4GNdupZ#$diqQ!?;ob~WOlpa-u&X6ABzbk!bhO=wtrkO06&fVmEe$6U)
zmkb18=#bFL(E9FjuIk>moK^mYJ!WA(CXHTiM~99GIvJFbnYT&|EMwppx-`0YoT0Z^
z_DZ&s%vB2o%XQ}~)23ajR;<CMRB@8OkWQWML9d2x^fAb}Y$|{OhTwZfxks*Nt*aR1
ze@T7)r*K-sCm3RgG(zlha-m{7Ue2pnCPl?~QXcF|;EawqMi^R}9F`p0Q*oA;<nF*I
z&S^*?&1>=?8{>63%`Wgi<!EFAmvoHdGK0^%XS)n1vb9hbzv@dXpD{!m-Qv%D@xTOb
z=uj}t_k9aNqfmA{+o_tKU3LPv#fOwA%kr!;9iGFyj#(@in81{1=a>99CE9M_CNjcY
zGH?W%&~Ec<{(+tr1}VQO)9@fRi8@*oicIGZZNA~3W|3Mba$LndhW16v^_o-3n(O&h
zbEN3;U;Q=76ij<-&qHijDEwzNEKMDph5tWpzN2p3q`4825}c&bYhWmn)j`Z8l3Faj
zhn70pw#WcNf;BM|Ax}yANKU=R(Ye?*PVm{lu_xU>LEl67Hu~S*4o7ESVK`Ao@)gc+
z?P7d6d~pX?-qIx*CE7a)BY`$t#iwKm?HVSD!8%!O6eBnMGR6qVd3W{?PC~`?Ia+Nf
z)0v;*gCy_MQrQ!-LZm_Ty;)17k%zo7Uwj8MFB|TVm;|L2l_VQbR9!s$`D=W!3u&1G
zbF&FiG;1(5NQ&}rVUe^A(j`<5@de_?_#yEdHPeq%tmx&DSiFv}_8?I=>iGJ7a?u8I
zH`^ez4`JLxnBXA{aS)jPCKDMRSrXQuR7olG9c_l*ucybddMcVqq$g5(j2`YLIeoBc
ze?Uv8ECLwx=RTzU2HDG$^P3gO8LTwEZ}HuM^?e3E;KvM1<b_sP0duhmYXv?RcU;_c
I5pZGr2TNPefB*mh

diff --git a/testData/classes/pkg/TestSuspendLambdaKt.class b/testData/classes/pkg/TestSuspendLambdaKt.class
index c686101169d710526af7dbbf4884515d885c357f..37db7834b3d282183710c9d337560fa3c196f002 100644
GIT binary patch
delta 123
zcmbQtIgL~B)W2Q(7#J8#81xw##0#?1^*8eRGD`9?GB72TF#{zSKm;=*17kLb!8Ey;
zaXzaoNZn>(rlX9E%#&|2d#E!5Rq24F8PphbfixEbBZEAUW?+zD&;yb_Kt4YM>tqiW
L1xE47c`T{`nXMB;

delta 97
zcmbQnIhm99)W2Q(7#J9g81xw#gf|NMGD>nYGB72TF#`n|Km-#b17kK&s3LQ6Ipcgr
w$%%r(oAsDBF)}hue#q<rB(+%N*#j9E8Tc94CI_%6u!%B=doqYlE@V*!0LAALOaK4?

diff --git a/testData/results/TestSuspendLambdaKt.dec b/testData/results/TestSuspendLambdaKt.dec
index 2193908..f4623b2 100644
--- a/testData/results/TestSuspendLambdaKt.dec
+++ b/testData/results/TestSuspendLambdaKt.dec
@@ -1,8 +1,11 @@
+package pkg;
+
 import kotlin.Metadata;
 import kotlin.Unit;
-import kotlin.SuccessOrFailure.Failure;
+import kotlin.Result.Failure;
 import kotlin.coroutines.Continuation;
 import kotlin.coroutines.intrinsics.IntrinsicsKt;
+import kotlin.coroutines.jvm.internal.DebugMetadata;
 import kotlin.coroutines.jvm.internal.SuspendLambda;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.Intrinsics;
@@ -10,10 +13,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 @Metadata(
-   mv = {1, 1, 11},
-   bv = {1, 0, 2},
+   mv = {1, 1, 13},
+   bv = {1, 0, 3},
    k = 2,
-   xi = 2,
    d1 = {"\u0000\u0016\n\u0000\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\u0010\u0000\n\u0002\b\u0003\",\u0010\u0000\u001a\u0018\b\u0001\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00030\u0002\u0012\u0006\u0012\u0004\u0018\u00010\u00040\u0001ø\u0001\u0000¢\u0006\n\n\u0002\u0010\u0007\u001a\u0004\b\u0005\u0010\u0006\u0082\u0002\u0004\n\u0002\b\u0019"},
    d2 = {"sl1", "Lkotlin/Function1;", "Lkotlin/coroutines/Continuation;", "", "", "getSl1", "()Lkotlin/jvm/functions/Function1;", "Lkotlin/jvm/functions/Function1;"}
 )
@@ -27,29 +29,37 @@ public final class TestSuspendLambdaKt {
    }
 
    static {
+      @DebugMetadata(
+         f = "TestSuspendLambda.kt",
+         l = {3},
+         i = {},
+         s = {},
+         n = {},
+         m = "invokeSuspend",
+         c = "pkg/TestSuspendLambdaKt$sl1$1"
+      )
       @Metadata(
-         mv = {1, 1, 11},
-         bv = {1, 0, 2},
+         mv = {1, 1, 13},
+         bv = {1, 0, 3},
          k = 3,
-         xi = 2,
          d1 = {"\u0000\n\n\u0000\n\u0002\u0010\u0002\n\u0002\b\u0002\u0010\u0000\u001a\u00020\u0001H\u008a@ø\u0001\u0000¢\u0006\u0004\b\u0002\u0010\u0003"},
-         d2 = {"<anonymous>", "", "invoke", "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;"}
+         d2 = {"<anonymous>", "", "invoke", "(Ljava/lang/Object;)Ljava/lang/Object;"}
       )
       final class NamelessClass_1 extends SuspendLambda implements Function1<Continuation<? super Unit>, Object> {
          int label;
 
          @Nullable
-         public final Object invokeSuspend(@NotNull Object var1) {
+         public final Object invokeSuspend(@NotNull Object result) {
             Object var3 = IntrinsicsKt.getCOROUTINE_SUSPENDED();
             switch(this.label) {
             case 0:
-               if (var1 instanceof Failure) {
-                  throw ((Failure)var1).exception;
+               if (result instanceof Failure) {
+                  throw ((Failure)result).exception;
                }
 
-               String var2 = "SL1";// 3
+               String var2 = "SL1";// 4
                System.out.println(var2);
-               return Unit.INSTANCE;// 4
+               return Unit.INSTANCE;// 5
             default:
                throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
             }
@@ -60,80 +70,80 @@ public final class TestSuspendLambdaKt {
          }
 
          @NotNull
-         public final Continuation<Unit> create(@NotNull Continuation<? super Unit> continuation) {
-            Intrinsics.checkParameterIsNotNull(continuation, "continuation");
-            NamelessClass_1 var2 = new NamelessClass_1(continuation);
+         public final Continuation<Unit> create(@NotNull Continuation<?> completion) {
+            Intrinsics.checkParameterIsNotNull(completion, "completion");
+            NamelessClass_1 var2 = new NamelessClass_1(completion);
             return var2;
          }
 
-         @Nullable
-         public final Object invoke(@NotNull Continuation<? super Unit> continuation) {
-            return ((NamelessClass_1)this.create(continuation)).invokeSuspend(Unit.INSTANCE);
+         public final Object invoke(Object var1) {
+            return ((NamelessClass_1)this.create((Continuation)var1)).invokeSuspend(Unit.INSTANCE);
          }
       }
 
-      sl1 = (Function1)(new NamelessClass_1((Continuation)null));// 2
+      sl1 = (Function1)(new NamelessClass_1((Continuation)null));// 3
    }
 }
 
-class 'TestSuspendLambdaKt' {
+class 'pkg/TestSuspendLambdaKt' {
    method 'getSl1 ()Lkotlin/jvm/functions/Function1;' {
-      0      25
-      3      25
+      0      27
+      3      27
    }
 
    method '<clinit> ()V' {
-      4      74
-      8      74
-      b      74
-      e      75
+      4      83
+      8      83
+      b      83
+      e      84
    }
 }
 
-class 'TestSuspendLambdaKt$sl1$1' {
+class 'pkg/TestSuspendLambdaKt$sl1$1' {
    method 'invokeSuspend (Ljava/lang/Object;)Ljava/lang/Object;' {
-      0      42
-      3      42
-      5      43
-      8      43
-      1e      45
-      21      45
-      24      46
-      27      46
-      2a      46
-      2c      49
-      2e      49
-      2f      50
-      33      50
-      36      51
-      39      51
-      3e      53
-      43      53
+      0      52
+      3      52
+      5      53
+      8      53
+      1e      55
+      21      55
+      24      56
+      27      56
+      2a      56
+      2c      59
+      2e      59
+      2f      60
+      33      60
+      36      61
+      39      61
+      3e      63
+      43      63
    }
 
    method '<init> (Lkotlin/coroutines/Continuation;)V' {
-      1      58
-      3      58
-      6      59
+      1      68
+      3      68
+      6      69
    }
 
    method 'create (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;' {
-      1      63
-      3      63
-      e      64
-      10      65
+      1      73
+      3      73
+      e      74
+      10      75
    }
 
-   method 'invoke (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
-      2      70
-      5      70
-      8      70
-      b      70
-      e      70
+   method 'invoke (Ljava/lang/Object;)Ljava/lang/Object;' {
+      2      79
+      5      79
+      8      79
+      b      79
+      e      79
+      11      79
    }
 }
 
 Lines mapping:
-2 <-> 75
-3 <-> 50
-4 <-> 52
+3 <-> 84
+4 <-> 60
+5 <-> 62
diff --git a/testData/src/pkg/TestSuspendLambda.kt b/testData/src/pkg/TestSuspendLambda.kt
index 6feef9d..8b80110 100644
--- a/testData/src/pkg/TestSuspendLambda.kt
+++ b/testData/src/pkg/TestSuspendLambda.kt
@@ -1,3 +1,4 @@
+package pkg
 
 val sl1: suspend () -> Unit = {
     println("SL1")

From 89977a8438107814dfd001d132f7045cba8784bb Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 28 Sep 2018 18:17:53 +0200
Subject: [PATCH 216/252] [java decompiler] improves anonymous classes
 verification

- puts the check under an option
- uses 'EnclosingMethod' attribute to skip unrelated methods
---
 .../decompiler/main/ClassesProcessor.java     | 140 +++++++++---------
 .../main/extern/IFernflowerPreferences.java   |   2 +
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 3 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 0e29334..1ee22f2 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -18,6 +18,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -56,6 +57,7 @@ public class ClassesProcessor implements CodeConstants {
     Map<String, String> mapNewSimpleNames = new HashMap<>();
 
     boolean bDecompileInner = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_INNER);
+    boolean verifyAnonymousClasses = DecompilerContext.getOption(IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES);
 
     // create class nodes
     for (StructClass cl : context.getClasses().values()) {
@@ -171,27 +173,22 @@ public class ClassesProcessor implements CodeConstants {
                 nestedNode.type = rec.type;
                 nestedNode.access = rec.accessFlags;
 
+                // sanity checks of the class supposed to be anonymous
+                if (verifyAnonymousClasses && nestedNode.type == ClassNode.CLASS_ANONYMOUS && !isAnonymous(nestedNode.classStruct, scl)) {
+                  nestedNode.type = ClassNode.CLASS_LOCAL;
+                }
+
                 if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) {
                   StructClass cl = nestedNode.classStruct;
+                  // remove static if anonymous class (a common compiler bug)
+                  nestedNode.access &= ~CodeConstants.ACC_STATIC;
 
                   int[] interfaces = cl.getInterfaces();
-
-                  // sanity checks of the class supposed to be anonymous
-                  boolean isAnonymousChecked = checkClassAnonymous(cl, scl);
-                  
-                  if(isAnonymousChecked) {
-                    // remove static if anonymous class (a common compiler bug)
-                    nestedNode.access &= ~CodeConstants.ACC_STATIC;
-                    
-                    if (interfaces.length > 0) {
-                      nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
-                    }
-                    else {
-                      nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
-                    }
-                  } else { // change it to a local class
-                    nestedNode.type = ClassNode.CLASS_LOCAL;
-                    nestedNode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
+                  if (interfaces.length > 0) {
+                    nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
+                  }
+                  else {
+                    nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
                   }
                 }
                 else if (nestedNode.type == ClassNode.CLASS_LOCAL) {
@@ -212,85 +209,90 @@ public class ClassesProcessor implements CodeConstants {
       }
     }
   }
-  
-  private boolean checkClassAnonymous(StructClass cl, StructClass enclosing_cl) {
-    
-    int[] interfaces = cl.getInterfaces();
-    boolean hasNonTrivialSuperClass = cl.superClass != null && !VarType.VARTYPE_OBJECT.equals(new VarType(cl.superClass.getString(), true));
-    
+
+  private static boolean isAnonymous(StructClass cl, StructClass enclosingCl) {
     // checking super class and interfaces
-    if(interfaces.length > 0) { 
-      if(hasNonTrivialSuperClass || interfaces.length > 1) { // can't have multiple 'sources'
-        String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName+"'. Multiple interfaces and/or super class defined.";
+    int[] interfaces = cl.getInterfaces();
+    if (interfaces.length > 0) {
+      boolean hasNonTrivialSuperClass = cl.superClass != null && !VarType.VARTYPE_OBJECT.equals(new VarType(cl.superClass.getString(), true));
+      if (hasNonTrivialSuperClass || interfaces.length > 1) { // can't have multiple 'sources'
+        String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName + "'. Multiple interfaces and/or super class defined.";
         DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
         return false;
       }
-    } else if(cl.superClass == null) { // neither interface nor super class defined
-      String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName+"'. Neither interface nor super class defined.";
+    }
+    else if (cl.superClass == null) { // neither interface nor super class defined
+      String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName + "'. Neither interface nor super class defined.";
       DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
       return false;
     }
-    
+
     // FIXME: check constructors
     // FIXME: check enclosing class/method
-    
-    ConstantPool pool = enclosing_cl.getPool();
-    
-    int ref_counter = 0;
-    boolean ref_not_new = false;
-    
-    // checking references in the enclosing class (TODO: limit to the enclosing method?)
-    for (StructMethod mt : enclosing_cl.getMethods()) {
+
+    ConstantPool pool = enclosingCl.getPool();
+
+    int refCounter = 0;
+    boolean refNotNew = false;
+
+    StructEnclosingMethodAttribute attribute = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_ENCLOSING_METHOD);
+    String enclosingMethod = attribute != null ? attribute.getMethodName() : null;
+
+    // checking references in the enclosing class
+    for (StructMethod mt : enclosingCl.getMethods()) {
+      if (enclosingMethod != null && !enclosingMethod.equals(mt.getName())) {
+        continue;
+      }
+
       try {
         mt.expandData();
+
         InstructionSequence seq = mt.getInstructionSequence();
-  
-        if(seq != null) {
-          
+        if (seq != null) {
           int len = seq.length();
           for (int i = 0; i < len; i++) {
             Instruction instr = seq.getInstr(i);
-  
-            switch(instr.opcode) {
-            case opc_checkcast:
-            case opc_instanceof:
-              if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
-                ref_counter++;
-                ref_not_new = true;
-              }
-              break;
-            case opc_new:
-            case opc_anewarray:
-            case opc_multianewarray:
-              if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
-                ref_counter++;
-              }
-              break;
-            case opc_getstatic:
-            case opc_putstatic:
-              if(cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
-                ref_counter++;
-                ref_not_new = true;
-              }
+            switch (instr.opcode) {
+              case opc_checkcast:
+              case opc_instanceof:
+                if (cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+                  refCounter++;
+                  refNotNew = true;
+                }
+                break;
+              case opc_new:
+              case opc_anewarray:
+              case opc_multianewarray:
+                if (cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+                  refCounter++;
+                }
+                break;
+              case opc_getstatic:
+              case opc_putstatic:
+                if (cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
+                  refCounter++;
+                  refNotNew = true;
+                }
             }
           }
         }
 
         mt.releaseResources();
-      } catch(IOException ex) {
-        String message = "Could not read method while checking anonymous class definition: '"+enclosing_cl.qualifiedName+"', '"+
-                         InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor())+"'";
+      }
+      catch (IOException ex) {
+        String message = "Could not read method while checking anonymous class definition: '" + enclosingCl.qualifiedName + "', '" +
+                         InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor()) + "'";
         DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
         return false;
       }
-      
-      if(ref_counter > 1 || ref_not_new) {
-        String message = "Inconsistent references to the class '"+cl.qualifiedName+"' which is supposed to be anonymous";
+
+      if (refCounter > 1 || refNotNew) {
+        String message = "Inconsistent references to the class '" + cl.qualifiedName + "' which is supposed to be anonymous";
         DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
         return false;
       }
     }
-    
+
     return true;
   }
 
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 612b425..5448e79 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -33,6 +33,7 @@ public interface IFernflowerPreferences {
   String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
   String BYTECODE_SOURCE_MAPPING = "bsm";
   String IGNORE_INVALID_BYTECODE = "iib";
+  String VERIFY_ANONYMOUS_CLASSES = "vac";
 
   String LOG_LEVEL = "log";
   String MAX_PROCESSING_METHOD = "mpm";
@@ -78,6 +79,7 @@ public interface IFernflowerPreferences {
     defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
     defaults.put(BYTECODE_SOURCE_MAPPING, "0");
     defaults.put(IGNORE_INVALID_BYTECODE, "0");
+    defaults.put(VERIFY_ANONYMOUS_CLASSES, "0");
 
     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
     defaults.put(MAX_PROCESSING_METHOD, "0");
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 7482741..f2b28b9 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -24,7 +24,8 @@ public class SingleClassesTest {
     fixture = new DecompilerTestFixture();
     fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
                   IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
-                  IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1");
+                  IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1",
+                  IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1");
   }
 
   @After

From c7bdab8b0033608c69a2362ee9465680406f0d09 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 28 Sep 2018 18:18:36 +0200
Subject: [PATCH 217/252] Cleanup (warnings)

---
 .../java/decompiler/main/rels/NestedClassProcessor.java     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 8ea5285..587f1d9 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -641,11 +641,7 @@ public class NestedClassProcessor {
   private static void mergeListSignatures(List<VarFieldPair> first, List<VarFieldPair> second, boolean both) {
     int i = 1;
 
-    while (true) {
-      if (first.size() <= i || second.size() <= i) {
-        break;
-      }
-
+    while (first.size() > i && second.size() > i) {
       VarFieldPair fObj = first.get(first.size() - i);
       VarFieldPair sObj = second.get(second.size() - i);
 

From 32674967dee503c5edfd49f20ac5709fafac09d9 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 1 Oct 2018 15:43:04 +0700
Subject: [PATCH 218/252] 'Switch' statements with single case converted to
 'if', other warnings fixed

---
 .../modules/decompiler/ExitHelper.java        | 45 +++++++++----------
 .../modules/decompiler/MergeHelper.java       | 13 +++---
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
index 81c61d0..3b9847f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
@@ -80,32 +80,31 @@ public class ExitHelper {
         }
       }
 
-      switch (stat.type) {
-        case Statement.TYPE_IF:
-          IfStatement ifst = (IfStatement)stat;
-          if (ifst.getIfstat() == null) {
-            StatEdge ifedge = ifst.getIfEdge();
-            dest = isExitEdge(ifedge);
-            if (dest != null) {
-              BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
-                DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-              bstat.setExprents(DecHelper.copyExprentList(dest.getExprents()));
+      if (stat.type == Statement.TYPE_IF) {
+        IfStatement ifst = (IfStatement)stat;
+        if (ifst.getIfstat() == null) {
+          StatEdge ifedge = ifst.getIfEdge();
+          dest = isExitEdge(ifedge);
+          if (dest != null) {
+            BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
+              DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
+            bstat.setExprents(DecHelper.copyExprentList(dest.getExprents()));
 
-              ifst.getFirst().removeSuccessor(ifedge);
-              StatEdge newedge = new StatEdge(StatEdge.TYPE_REGULAR, ifst.getFirst(), bstat);
-              ifst.getFirst().addSuccessor(newedge);
-              ifst.setIfEdge(newedge);
-              ifst.setIfstat(bstat);
-              ifst.getStats().addWithKey(bstat, bstat.id);
-              bstat.setParent(ifst);
+            ifst.getFirst().removeSuccessor(ifedge);
+            StatEdge newedge = new StatEdge(StatEdge.TYPE_REGULAR, ifst.getFirst(), bstat);
+            ifst.getFirst().addSuccessor(newedge);
+            ifst.setIfEdge(newedge);
+            ifst.setIfstat(bstat);
+            ifst.getStats().addWithKey(bstat, bstat.id);
+            bstat.setParent(ifst);
 
-              StatEdge oldexitedge = dest.getAllSuccessorEdges().get(0);
-              StatEdge newexitedge = new StatEdge(StatEdge.TYPE_BREAK, bstat, oldexitedge.getDestination());
-              bstat.addSuccessor(newexitedge);
-              oldexitedge.closure.addLabeledEdge(newexitedge);
-              ret = 1;
-            }
+            StatEdge oldexitedge = dest.getAllSuccessorEdges().get(0);
+            StatEdge newexitedge = new StatEdge(StatEdge.TYPE_BREAK, bstat, oldexitedge.getDestination());
+            bstat.addSuccessor(newexitedge);
+            oldexitedge.closure.addLabeledEdge(newexitedge);
+            ret = 1;
           }
+        }
       }
     }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
index 779aeb8..ed9f368 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -376,14 +376,13 @@ public class MergeHelper {
       return stat;
     }
 
-    switch (stat.type) {
-      case Statement.TYPE_SEQUENCE:
-        for (int i = stat.getStats().size() - 1; i >= 0; i--) {
-          Statement tmp = getLastDirectData(stat.getStats().get(i));
-          if (tmp == null || !tmp.getExprents().isEmpty()) {
-            return tmp;
-          }
+    if (stat.type == Statement.TYPE_SEQUENCE) {
+      for (int i = stat.getStats().size() - 1; i >= 0; i--) {
+        Statement tmp = getLastDirectData(stat.getStats().get(i));
+        if (tmp == null || !tmp.getExprents().isEmpty()) {
+          return tmp;
         }
+      }
     }
     return null;
   }

From 9891772deca8a341a43d89063c000fb6455079cd Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 1 Oct 2018 13:42:18 +0300
Subject: [PATCH 219/252] Use bounded wildcards in API in static methods to
 make it more conventional and flexible

---
 src/org/jetbrains/java/decompiler/main/ClassWriter.java     | 2 +-
 .../java/decompiler/modules/decompiler/DecHelper.java       | 6 +++---
 .../java/decompiler/modules/decompiler/ExprProcessor.java   | 2 +-
 .../java/decompiler/modules/decompiler/IfHelper.java        | 4 ++--
 .../modules/decompiler/StrongConnectivityHelper.java        | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 216b914..c782a48 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1065,7 +1065,7 @@ public class ClassWriter {
     return null;
   }
 
-  public static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<List<GenericType>> bounds) {
+  public static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<? extends List<GenericType>> bounds) {
     buffer.append('<');
 
     for (int i = 0; i < parameters.size(); i++) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
index 8cfcdf7..1549734 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
@@ -12,7 +12,7 @@ import java.util.Set;
 
 public class DecHelper {
 
-  public static boolean checkStatementExceptions(List<Statement> lst) {
+  public static boolean checkStatementExceptions(List<? extends Statement> lst) {
 
     Set<Statement> all = new HashSet<>(lst);
 
@@ -55,7 +55,7 @@ public class DecHelper {
     return true;
   }
 
-  public static boolean isChoiceStatement(Statement head, List<Statement> lst) {
+  public static boolean isChoiceStatement(Statement head, List<? super Statement> lst) {
 
     Statement post = null;
 
@@ -189,7 +189,7 @@ public class DecHelper {
     return setHandlers;
   }
 
-  public static List<Exprent> copyExprentList(List<Exprent> lst) {
+  public static List<Exprent> copyExprentList(List<? extends Exprent> lst) {
     List<Exprent> ret = new ArrayList<>();
     for (Exprent expr : lst) {
       ret.add(expr.copy());
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index c52ac08..aadd0b1 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -794,7 +794,7 @@ public class ExprProcessor implements CodeConstants {
     return res;
   }
 
-  public static TextBuffer listToJava(List<Exprent> lst, int indent, BytecodeMappingTracer tracer) {
+  public static TextBuffer listToJava(List<? extends Exprent> lst, int indent, BytecodeMappingTracer tracer) {
     if (lst == null || lst.isEmpty()) {
       return new TextBuffer();
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index 719a017..0e55d27 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -20,7 +20,7 @@ public class IfHelper {
     return res;
   }
 
-  private static boolean mergeAllIfsRec(Statement stat, Set<Integer> setReorderedIfs) {
+  private static boolean mergeAllIfsRec(Statement stat, Set<? super Integer> setReorderedIfs) {
     boolean res = false;
 
     if (stat.getExprents() == null) {
@@ -47,7 +47,7 @@ public class IfHelper {
     return res;
   }
 
-  public static boolean mergeIfs(Statement statement, Set<Integer> setReorderedIfs) {
+  public static boolean mergeIfs(Statement statement, Set<? super Integer> setReorderedIfs) {
     if (statement.type != Statement.TYPE_IF && statement.type != Statement.TYPE_SEQUENCE) {
       return false;
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
index 80f6d02..4e81646 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
@@ -85,7 +85,7 @@ public class StrongConnectivityHelper {
     }
   }
 
-  public static boolean isExitComponent(List<Statement> lst) {
+  public static boolean isExitComponent(List<? extends Statement> lst) {
     Set<Statement> set = new HashSet<>();
     for (Statement stat : lst) {
       set.addAll(stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD));
@@ -95,7 +95,7 @@ public class StrongConnectivityHelper {
     return (set.size() == 0);
   }
 
-  public static List<Statement> getExitReps(List<List<Statement>> lst) {
+  public static List<Statement> getExitReps(List<? extends List<Statement>> lst) {
     List<Statement> res = new ArrayList<>();
 
     for (List<Statement> comp : lst) {

From 5650f57ad2b52acd043a41dac3bb905ee1c2fff7 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 2 Oct 2018 14:21:33 +0300
Subject: [PATCH 220/252] Use bounded wildcards in API in constructors/final
 methods to make it more conventional and flexible

---
 .../modules/decompiler/exps/AnnotationExprent.java          | 6 +++---
 .../decompiler/modules/decompiler/exps/AssertExprent.java   | 4 ++--
 .../modules/decompiler/exps/InvocationExprent.java          | 2 +-
 .../modules/decompiler/stats/GeneralStatement.java          | 2 +-
 .../modules/decompiler/stats/SequenceStatement.java         | 2 +-
 .../java/decompiler/util/FastSparseSetFactory.java          | 2 +-
 src/org/jetbrains/java/decompiler/util/ListStack.java       | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
index 13491fc..c9c9c7f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
@@ -17,10 +17,10 @@ public class AnnotationExprent extends Exprent {
   public static final int ANNOTATION_SINGLE_ELEMENT = 3;
 
   private final String className;
-  private final List<String> parNames;
-  private final List<Exprent> parValues;
+  private final List<? extends String> parNames;
+  private final List<? extends Exprent> parValues;
 
-  public AnnotationExprent(String className, List<String> parNames, List<Exprent> parValues) {
+  public AnnotationExprent(String className, List<? extends String> parNames, List<? extends Exprent> parValues) {
     super(EXPRENT_ANNOTATION);
     this.className = className;
     this.parNames = parNames;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
index 0ae9fee..0dcb63d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
@@ -10,9 +10,9 @@ import java.util.List;
 
 public class AssertExprent extends Exprent {
 
-  private final List<Exprent> parameters;
+  private final List<? extends Exprent> parameters;
 
-  public AssertExprent(List<Exprent> parameters) {
+  public AssertExprent(List<? extends Exprent> parameters) {
     super(EXPRENT_ASSERT);
     this.parameters = parameters;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 8472cef..1abaf32 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -66,7 +66,7 @@ public class InvocationExprent extends Exprent {
   public InvocationExprent(int opcode,
                            LinkConstant cn,
                            List<PooledConstant> bootstrapArguments,
-                           ListStack<Exprent> stack,
+                           ListStack<? extends Exprent> stack,
                            Set<Integer> bytecodeOffsets) {
     this();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
index 56ada55..0891a47 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
@@ -18,7 +18,7 @@ public class GeneralStatement extends Statement {
     type = Statement.TYPE_GENERAL;
   }
 
-  public GeneralStatement(Statement head, Collection<Statement> statements, Statement post) {
+  public GeneralStatement(Statement head, Collection<? extends Statement> statements, Statement post) {
 
     this();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
index 7acad0c..8aa6adc 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
@@ -22,7 +22,7 @@ public class SequenceStatement extends Statement {
     type = Statement.TYPE_SEQUENCE;
   }
 
-  public SequenceStatement(List<Statement> lst) {
+  public SequenceStatement(List<? extends Statement> lst) {
 
     this();
 
diff --git a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
index 08bf156..b955139 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
@@ -14,7 +14,7 @@ public class FastSparseSetFactory<E> {
 
   private int lastMask;
 
-  public FastSparseSetFactory(Collection<E> set) {
+  public FastSparseSetFactory(Collection<? extends E> set) {
 
     int block = -1;
     int mask = -1;
diff --git a/src/org/jetbrains/java/decompiler/util/ListStack.java b/src/org/jetbrains/java/decompiler/util/ListStack.java
index d5ae774..ac0dad9 100644
--- a/src/org/jetbrains/java/decompiler/util/ListStack.java
+++ b/src/org/jetbrains/java/decompiler/util/ListStack.java
@@ -10,7 +10,7 @@ public class ListStack<T> extends ArrayList<T> {
     super();
   }
 
-  public ListStack(ArrayList<T> list) {
+  public ListStack(ArrayList<? extends T> list) {
     super(list);
   }
 

From c3ff7141ab962d2cc1621594e12d5fef79eb3a9b Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Wed, 3 Oct 2018 17:19:32 +0200
Subject: [PATCH 221/252] Preventing duplicate field access

---
 .../decompiler/SimplifyExprentsHelper.java    |  44 +++++++++++-
 .../DominatorTreeExceptionFilter.java         |   5 +-
 .../modules/decompiler/exps/FieldExprent.java |   2 +-
 .../classes/pkg/TestFieldSingleAccess.class   | Bin 0 -> 588 bytes
 testData/results/TestFieldSingleAccess.dec    |  40 +++++++++++
 .../results/TestMethodReferenceSameName.dec   |  12 ++--
 testData/src/pkg/TestFieldSingleAccess.jasm   |  67 ++++++++++++++++++
 7 files changed, 159 insertions(+), 11 deletions(-)
 create mode 100644 testData/classes/pkg/TestFieldSingleAccess.class
 create mode 100644 testData/results/TestFieldSingleAccess.dec
 create mode 100644 testData/src/pkg/TestFieldSingleAccess.jasm

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index 0bade66..f23fc78 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -178,7 +178,7 @@ public class SimplifyExprentsHelper {
       }
 
       // expr++ and expr--
-      if (isIPPorIMM(current, next)) {
+      if (isIPPorIMM(current, next) || isIPPorIMM2(current, next)) {
         list.remove(index + 1);
         res = true;
         continue;
@@ -458,6 +458,48 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
+  private static boolean isIPPorIMM2(Exprent first, Exprent second) {
+
+    if (first.type != Exprent.EXPRENT_ASSIGNMENT || second.type != Exprent.EXPRENT_ASSIGNMENT) {
+      return false;
+    }
+      
+    AssignmentExprent af = (AssignmentExprent)first;
+    AssignmentExprent as = (AssignmentExprent)second;
+    
+    if(as.getRight().type != Exprent.EXPRENT_FUNCTION) {
+      return false;
+    }
+    
+    FunctionExprent func = (FunctionExprent)as.getRight();
+    
+    if(func.getFuncType() != FunctionExprent.FUNCTION_ADD && func.getFuncType() != FunctionExprent.FUNCTION_SUB) {
+      return false;
+    }
+
+    Exprent econd = func.getLstOperands().get(0);
+    Exprent econst = func.getLstOperands().get(1);
+
+    if(econst.type != Exprent.EXPRENT_CONST && econd.type == Exprent.EXPRENT_CONST && func.getFuncType() == FunctionExprent.FUNCTION_ADD) {
+      econd = econst;
+      econst = func.getLstOperands().get(0);
+    }
+
+    if(econst.type == Exprent.EXPRENT_CONST && ((ConstExprent)econst).hasValueOne()) {
+      if(af.getLeft().equals(econd) && af.getRight().equals(as.getLeft()) && (af.getLeft().getExprentUse() & Exprent.MULTIPLE_USES) != 0) {
+        int type = func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_IPP : FunctionExprent.FUNCTION_IMM;
+        
+        FunctionExprent ret = new FunctionExprent(type, af.getRight(), func.bytecode);
+        ret.setImplicitType(VarType.VARTYPE_INT);
+        
+        af.setRight(ret);
+        return true;
+      }
+    }
+    
+    return false;
+  }
+  
   private static boolean isMonitorExit(Exprent first) {
     if (first.type == Exprent.EXPRENT_MONITOR) {
       MonitorExprent expr = (MonitorExprent)first;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
index 89babeb..d8b587f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
@@ -134,8 +134,9 @@ public class DominatorTreeExceptionFilter {
               exit = childid;
             }
             else {
-              // exit = map.containsKey(handler)?-1:mapChild.get(handler); FIXME: Eclipse bug?
-              exit = map.containsKey(handler) ? -1 : mapChild.get(handler);
+              // after replacing 'new Integer(-1)' with '-1' Eclipse throws a NullPointerException on the following line
+              // could be a bug in Eclipse or some obscure specification glitch, FIXME: needs further investigation
+              exit = map.containsKey(handler) ? new Integer(-1) : mapChild.get(handler);
             }
 
             if (exit != null) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 264347e..642a86b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -54,7 +54,7 @@ public class FieldExprent extends Exprent {
 
   @Override
   public int getExprentUse() {
-    return instance == null ? Exprent.MULTIPLE_USES : instance.getExprentUse() & Exprent.MULTIPLE_USES;
+    return 0; // multiple references to a field considered dangerous in a multithreaded environment, thus no Exprent.MULTIPLE_USES set here
   }
 
   @Override
diff --git a/testData/classes/pkg/TestFieldSingleAccess.class b/testData/classes/pkg/TestFieldSingleAccess.class
new file mode 100644
index 0000000000000000000000000000000000000000..edc30abd1f133b25e84ae96652ce8b99d37245b6
GIT binary patch
literal 588
zcmZutT}vB56g{)~m}I-ws7b4-U$rg7SPX%_MFbH9L9wzy@JZHn8aHlt!|rJ5FY2=*
z3O-n<;6s0s585*Zzn~1<J9F<j_nf(ZZ!azZe8EQ>;}|nxx`_99S418YHYym9C<|n2
zvs(h$+OkO_UGK<igkIEXwD*(vhqoIlfofZ&dL>Zdo*P7+P%ZhsO4IqSmwp$>F9cDb
z7X@<P48p-HNKTCp^~1OzZhTFGNV_^w9vPL|+LO%2ZddubWyEbaK1_VI5*W?W6U6<Q
zYDM0Ft3Cf<-Rrgcw#Iq~wD~`45>o=QXGFt@HlFFNMp|`L(xQ!i^`*O(gEuHi6dk<A
zsKlTH2XFZ~O`YZoTYcvSUyvB)3Jrv5Io?xfa>*60U+{1MZyDaW8paQN4c&KuT>Tum
zV-`$l=CS<=76Cx1ev0h&HS7~)cFrISlK)}kxIt1TA1RxpWZ0<QQ`Y{FQEHySn!Eai
q!us6R=ikRfNOH<VmFdak{;&$HJ3cLmyrgX*QN2Ny%^^Z8*#7|kUw5ql

literal 0
HcmV?d00001

diff --git a/testData/results/TestFieldSingleAccess.dec b/testData/results/TestFieldSingleAccess.dec
new file mode 100644
index 0000000..268c866
--- /dev/null
+++ b/testData/results/TestFieldSingleAccess.dec
@@ -0,0 +1,40 @@
+package pkg;
+
+public final class TestFieldSingleAccess {
+   public Integer field;
+
+   public final void test() {
+      Integer var10000 = this.field;
+      if (var10000 != null) {
+         System.out.println(var10000);
+      }
+
+   }
+
+   public final void test1() {
+      synchronized(this.field) {
+         System.out.println('1');
+      }
+   }
+}
+
+class 'pkg/TestFieldSingleAccess' {
+   method 'test ()V' {
+      1      6
+      5      7
+      8      8
+      c      8
+      f      11
+   }
+
+   method 'test1 ()V' {
+      1      14
+      6      14
+      7      15
+      a      15
+      c      15
+      19      17
+   }
+}
+
+Lines mapping:
diff --git a/testData/results/TestMethodReferenceSameName.dec b/testData/results/TestMethodReferenceSameName.dec
index 3449a8c..2592d18 100644
--- a/testData/results/TestMethodReferenceSameName.dec
+++ b/testData/results/TestMethodReferenceSameName.dec
@@ -3,7 +3,6 @@ public class TestMethodReferenceSameName {
 
    private void foo() {
       TestMethodReferenceSameName.R1 var10000 = this.r;// 5
-      this.r.getClass();
       (var10000::foo).run();
    }// 6
 
@@ -16,19 +15,18 @@ public class TestMethodReferenceSameName {
 class 'TestMethodReferenceSameName' {
    method 'foo ()V' {
       1      4
-      5      5
-      e      6
-      13      7
+      e      5
+      13      6
    }
 }
 
 class 'TestMethodReferenceSameName$R1' {
    method 'foo ()V' {
-      0      11
+      0      10
    }
 }
 
 Lines mapping:
 5 <-> 5
-6 <-> 8
-9 <-> 12
+6 <-> 7
+9 <-> 11
diff --git a/testData/src/pkg/TestFieldSingleAccess.jasm b/testData/src/pkg/TestFieldSingleAccess.jasm
new file mode 100644
index 0000000..57b203c
--- /dev/null
+++ b/testData/src/pkg/TestFieldSingleAccess.jasm
@@ -0,0 +1,67 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public final class TestFieldSingleAccess
+	version 52:0
+{
+
+public Field field:"Ljava/lang/Integer;";
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public final Method test:"()V"
+	stack 2 locals 1
+{
+		aload_0;
+		getfield	Field field:"Ljava/lang/Integer;";
+		dup;
+		ifnull	L17;
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		swap;
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/Object;)V";
+	L17:	stack_frame_type same;
+		return;
+}
+
+public final Method test1:"()V"
+	stack 2 locals 3
+{
+		aload_0;
+		getfield	Field field:"Ljava/lang/Integer;";
+		dup;
+		astore_1;
+		monitorenter;
+		try t0;
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		bipush	49;
+		invokevirtual	Method java/io/PrintStream.println:"(C)V";
+		aload_1;
+		monitorexit;
+		endtry t0;
+		goto	L25;
+		catch t0 #0;
+		catch t1 #0;
+		try t1;
+		stack_frame_type full;
+		locals_map class TestFieldSingleAccess, class java/lang/Object;
+		stack_map class java/lang/Throwable;
+		astore_2;
+		aload_1;
+		monitorexit;
+		endtry t1;
+		aload_2;
+		athrow;
+	L25:	stack_frame_type chop1;
+		return;
+}
+
+} // end Class TestFieldSingleAccess

From 95cefbcfd2988a95eabd52fbc518e6cce4041938 Mon Sep 17 00:00:00 2001
From: upnotes <upnotes@example.com>
Date: Wed, 3 Oct 2018 17:21:01 +0200
Subject: [PATCH 222/252] Handling some cases of obfuscated exception ranges

---
 .../main/rels/MethodProcessorRunnable.java    |   4 +
 .../deobfuscator/ExceptionDeobfuscator.java   | 146 ++++++++-
 .../java/decompiler/SingleClassesTest.java    |   2 +
 .../pkg/TestNamedSuspendFun2Kt$foo2$1.class   | Bin 0 -> 1285 bytes
 .../classes/pkg/TestNamedSuspendFun2Kt.class  | Bin 0 -> 2266 bytes
 testData/results/TestNamedSuspendFun2Kt.dec   | 301 ++++++++++++++++++
 testData/src/pkg/TestNamedSuspendFun2.kt      |  14 +
 7 files changed, 462 insertions(+), 5 deletions(-)
 create mode 100644 testData/classes/pkg/TestNamedSuspendFun2Kt$foo2$1.class
 create mode 100644 testData/classes/pkg/TestNamedSuspendFun2Kt.class
 create mode 100644 testData/results/TestNamedSuspendFun2Kt.dec
 create mode 100644 testData/src/pkg/TestNamedSuspendFun2.kt

diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 32cdbc3..637260c 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -107,6 +107,10 @@ public class MethodProcessorRunnable implements Runnable {
 
     if (ExceptionDeobfuscator.hasObfuscatedExceptions(graph)) {
       DecompilerContext.getLogger().writeMessage("Heavily obfuscated exception ranges found!", IFernflowerLogger.Severity.WARN);
+      if(!ExceptionDeobfuscator.handleMultipleEntryExceptionRanges(graph)) {
+        DecompilerContext.getLogger().writeMessage("Found multiple entry exception ranges which could not be splitted", IFernflowerLogger.Severity.WARN);
+      }
+      ExceptionDeobfuscator.insertDummyExceptionHandlerBlocks(graph, cl.getBytecodeVersion());
     }
 
     RootStatement root = DomHelper.parseGraph(graph);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index 676f448..7f7c9aa 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -8,6 +8,8 @@ import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
 import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG;
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine;
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraph;
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode;
@@ -233,7 +235,7 @@ public class ExceptionDeobfuscator {
 
       if (rangeList.contains(handler)) {  // TODO: better removing strategy
 
-        List<BasicBlock> lstRemBlocks = getReachableBlocksRestricted(range, engine);
+        List<BasicBlock> lstRemBlocks = getReachableBlocksRestricted(range.getHandler(), range, engine);
 
         if (lstRemBlocks.size() < rangeList.size() || rangeList.size() == 1) {
           for (BasicBlock block : lstRemBlocks) {
@@ -249,22 +251,21 @@ public class ExceptionDeobfuscator {
     }
   }
 
-  private static List<BasicBlock> getReachableBlocksRestricted(ExceptionRangeCFG range, GenericDominatorEngine engine) {
+  private static List<BasicBlock> getReachableBlocksRestricted(BasicBlock start, ExceptionRangeCFG range, GenericDominatorEngine engine) {
 
     List<BasicBlock> lstRes = new ArrayList<>();
 
     LinkedList<BasicBlock> stack = new LinkedList<>();
     Set<BasicBlock> setVisited = new HashSet<>();
 
-    BasicBlock handler = range.getHandler();
-    stack.addFirst(handler);
+    stack.addFirst(start);
 
     while (!stack.isEmpty()) {
       BasicBlock block = stack.removeFirst();
 
       setVisited.add(block);
 
-      if (range.getProtectedRange().contains(block) && engine.isDominator(block, handler)) {
+      if (range.getProtectedRange().contains(block) && engine.isDominator(block, start)) {
         lstRes.add(block);
 
         List<BasicBlock> lstSuccs = new ArrayList<>(block.getSuccs());
@@ -308,4 +309,139 @@ public class ExceptionDeobfuscator {
 
     return false;
   }
+
+  public static boolean handleMultipleEntryExceptionRanges(ControlFlowGraph graph) {
+
+    GenericDominatorEngine engine = new GenericDominatorEngine(new IGraph() {
+      public List<? extends IGraphNode> getReversePostOrderList() {
+        return graph.getReversePostOrder();
+      }
+
+      public Set<? extends IGraphNode> getRoots() {
+        return new HashSet<>(Collections.singletonList(graph.getFirst()));
+      }
+    });
+
+    engine.initialize();
+    
+    boolean found = false;
+    
+    while(true) {
+      found = false;
+      boolean splitted = false;
+      
+      for(ExceptionRangeCFG range : graph.getExceptions()) {
+        Set<BasicBlock> setEntries = getRangeEntries(range);
+        
+        if(setEntries.size() > 1) { // multiple-entry protected range
+          found = true;
+          
+          if(splitExceptionRange(range, setEntries, graph, engine)) {
+            splitted = true;
+            break;
+          }
+        }
+      }
+      
+      if(!splitted) {
+        break;
+      }
+    }
+    
+    return !found;
+  }
+
+  private static Set<BasicBlock> getRangeEntries(ExceptionRangeCFG range) {
+
+    Set<BasicBlock> setEntries = new HashSet<>();
+    Set<BasicBlock> setRange= new HashSet<>(range.getProtectedRange());
+    
+    for(BasicBlock block : range.getProtectedRange()) {
+      Set<BasicBlock> setPreds = new HashSet<>(block.getPreds());
+      setPreds.removeAll(setRange);
+
+      if (!setPreds.isEmpty()) {
+        setEntries.add(block);
+      }
+    }
+
+    return setEntries;
+  }
+  
+  private static boolean splitExceptionRange(ExceptionRangeCFG range, Set<BasicBlock> setEntries, ControlFlowGraph graph, GenericDominatorEngine engine) {
+
+    for(BasicBlock entry : setEntries) {
+      List<BasicBlock> lstSubrangeBlocks = getReachableBlocksRestricted(entry, range, engine);
+      if(!lstSubrangeBlocks.isEmpty() && lstSubrangeBlocks.size() < range.getProtectedRange().size()) {
+        // add new range
+        ExceptionRangeCFG subRange = new ExceptionRangeCFG(lstSubrangeBlocks, range.getHandler(), range.getExceptionTypes());
+        graph.getExceptions().add(subRange);
+        // shrink the original range
+        range.getProtectedRange().removeAll(lstSubrangeBlocks);
+        return true;
+      } else {
+        // should not happen
+        DecompilerContext.getLogger().writeMessage("Inconsistency found while splitting protected range", IFernflowerLogger.Severity.WARN);
+      }
+    }
+
+    return false;
+  }
+
+  public static void insertDummyExceptionHandlerBlocks(ControlFlowGraph graph, int bytecode_version) {
+
+    Map<BasicBlock, Set<ExceptionRangeCFG>> mapRanges = new HashMap<>();
+    for (ExceptionRangeCFG range : graph.getExceptions()) {
+      mapRanges.computeIfAbsent(range.getHandler(), k -> new HashSet<>()).add(range);
+    }
+    
+    for (Entry<BasicBlock, Set<ExceptionRangeCFG>> ent : mapRanges.entrySet()) {
+      BasicBlock handler = ent.getKey();
+      Set<ExceptionRangeCFG> ranges = ent.getValue();
+      
+      if(ranges.size() == 1) {
+        continue;
+      }
+      
+      for(ExceptionRangeCFG range : ranges) {
+        
+        // add some dummy instructions to prevent optimizing away the empty block  
+        SimpleInstructionSequence seq = new SimpleInstructionSequence();
+        seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
+        seq.addInstruction(Instruction.create(CodeConstants.opc_pop, false, CodeConstants.GROUP_GENERAL, bytecode_version, null), -1);
+
+        BasicBlock dummyBlock = new BasicBlock(++graph.last_id);
+        dummyBlock.setSeq(seq);
+
+        graph.getBlocks().addWithKey(dummyBlock, dummyBlock.id);
+        
+        // only exception predecessors from this range considered
+        List<BasicBlock> lstPredExceptions = new ArrayList<>(handler.getPredExceptions());
+        lstPredExceptions.retainAll(range.getProtectedRange());
+        
+        // replace predecessors
+        for (BasicBlock pred : lstPredExceptions) {
+          pred.replaceSuccessor(handler, dummyBlock);
+        }
+
+        // replace handler
+        range.setHandler(dummyBlock);
+        // add common exception edges
+        Set<BasicBlock> commonHandlers = new HashSet<>(handler.getSuccExceptions());
+        for(BasicBlock pred : lstPredExceptions) {
+          commonHandlers.retainAll(pred.getSuccExceptions());
+        }
+        // TODO: more sanity checks?
+        for(BasicBlock commonHandler : commonHandlers) {
+          ExceptionRangeCFG commonRange = graph.getExceptionRange(commonHandler, handler);
+          
+          dummyBlock.addSuccessorException(commonHandler);
+          commonRange.getProtectedRange().add(dummyBlock);
+        }
+        
+        dummyBlock.addSuccessor(handler);
+      }
+    }
+  }
+  
 }
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index f2b28b9..a84907e 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -113,6 +113,7 @@ public class SingleClassesTest {
   @Test public void testPrivateEmptyConstructor() { doTest("pkg/TestPrivateEmptyConstructor"); }
   @Test public void testSynchronizedUnprotected() { doTest("pkg/TestSynchronizedUnprotected"); }
   @Test public void testInterfaceSuper() { doTest("pkg/TestInterfaceSuper"); }
+  @Test public void testFieldSingleAccess() { doTest("pkg/TestFieldSingleAccess"); }
 
   // TODO: fix all below
   //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
@@ -125,6 +126,7 @@ public class SingleClassesTest {
   @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
   @Test public void testPrivateClasses() { doTest("pkg/PrivateClasses"); }
   @Test public void testSuspendLambda() { doTest("pkg/TestSuspendLambdaKt"); }
+  @Test public void testNamedSuspendFun2Kt() { doTest("pkg/TestNamedSuspendFun2Kt"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestNamedSuspendFun2Kt$foo2$1.class b/testData/classes/pkg/TestNamedSuspendFun2Kt$foo2$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..af894aa4864ac73cf37419aa819cb105056645d1
GIT binary patch
literal 1285
zcmah|-%k@k5dQXhrKJ{WE58vzsn{0fN=5tu7!8qdv7!;u7oM)|TCTnBk=wh*$3FSj
z_@IeI;)5aj<{xF8Ek(gL+O#vXGt-&bZ@&HU^UGHN1w3Y$+2hjRv6{TP8^}X0s#}35
zJonRYT(^*3j({;34cB*UVN_ht4SZX0Y1CUy!xldGgyk5Ut{`t<`L-*}=Ajcoh+)VU
zEw{nDMHv<{#k$q9495~R<7K(dEB;!x*Ts-7x?atwbHD6awvdJ;gzI-|OJgT+9INc`
zHHP_rrMbS!q%6H^`4&T}w^1B}hz&x+C5A8+<qiWg;~2ta<sA;S2_c5D{_sSQqT&i8
zhLudQ7ohW)^t)#qBN&b03dX38e_%_7*<$}*-Br+S20ShU$7hJvxL-V-Ih4to<dDA|
zddAF_D0kf!woeP5|NnTUIA$>ygO2MA$+O$M;J&5cqsCgZ6;g00L3nB9&JpUU5o`@*
z(9X5DHi_yo!|F*p5j$zev;+yICp5C7behs9Se_N)32iEx(o<Sq&xf|Zy?gTgn4PrM
zzX?&oJzhCSDu%hUq0Vve0>ljC{m@%#5LzKKohMmTQr~o|ToJ;pSWe0EY(=L%B^ah(
z2Sns1H$}^qHo2bup&s$_@8~Pbqh~{J;6hq#*A2W1-?CN3;b)@axY8Ci0`tJF(!ER}
zxVPz8QgYh)WVdLkry=shLY;8c6Hrto3yPc_z0%e9I({8VgfT$tSf%I&X^r$~Zt)25
zT<#MRsbu>IiQF;9KTv?-KFP7uBurqEPLz%*D#q}D>;cjd(hunuq5UEXBodg$RkBr&
zBxza`!m9dvGE{g5*Sg^p)m9@6<ff_bM-`_JQLHDv_!&1&<2oKuj)uEfBdx2KfpxOf
zOsW=W(hZW^be^XP)BChn-0XZ8aO>=pF_A^i#3F7h>&`xy#1f2sge68K@)FAu1u}jC
DV{I&u

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestNamedSuspendFun2Kt.class b/testData/classes/pkg/TestNamedSuspendFun2Kt.class
new file mode 100644
index 0000000000000000000000000000000000000000..83f3b7536be54f5b4df62787a306ccaa00c12df5
GIT binary patch
literal 2266
zcmah~&2v*#6#v~MZPG`8wm@qsA4P&`OCKr7htOKVkV+s;k(6SsiZ96}Jo@?`^WIBg
z;YY`XYj+N^(;1m@BMUw{G9v+9IIi6LN4UT>@psd-gr*}i@11+jz31be-#Pc*KcD~d
zD}Y0g0$o$m^RvdhEauAIb!ivJ%l4sjei%Za{hG00BrL-&B_{LNWP!6mfzTDlIV5nn
zKQrg}mT4ynj_Z_t)0SQ$>DXk-hHpCd$UtVT{fIy;<G7{7HR<PF!?eAGVcU*h)AthD
zvSk^0OHys`|EW2?(xleT^*0|=JB%F+qfH=El77a>OG_ZwKah@M1ELx<Yz!_E0<L?j
z>!JSiz;qPt=uirs0<EK_ZTe%}&8u^z;Z|%@hFyfHX!wReXEOj%yoR1OYHb%7XvWX9
zeV3@11uv0aWmPqHuu{w<IeB67;#4}Dx}3Y1JD<v)PMsFm+P@CcQS8EQ4Li{%&_Yxd
z0D|eij=d^;Okj6Ce6Cz5NY9&e#|_geyE0ZE!+1lWP2McX>#Cdr+ZxiDy6QSNYPE`@
z9|LWOV~_~v4L6D*v}y=If2o18<@vmH!$=TvW;tzGWf{dmRg7V<or3Aua1@7^cXxzx
zM#;yP!Fo$z%ZpxGjUC1bfsPjogiMxHkWqo~f{HMCg}AY-4Lh$ZjYKhqcQm|>lZ2wd
zhh@o<VddD9GPRO>81D)s3WjC%`A%Qlm0o#X#{2T}isQ<@xM?pqbChqG{?)$K(+~k`
zv#q}&bWRnwG@_bpE5<b>@g9qEQ(#wfCp4a<FwQd1mE$%ceM9vZ`#&(h5L8{P$Oek}
zng}HZ=y{G)H%*e_L4j0dQPcPb+9O&Z64>6+URm587#3%qetq({B~e*?`h9DlUCjsA
znST0JAVjks<&4$h!RcP_>>Zf%+5JhU$eX1z;}EfF!!=c(OerF;Im3Hmxfkj)8wqt`
zZo;@;m)mk?$u@j8qQKc#ox4%J0p69$j;(+5^j;|Qa+;TEd%^Tf?&j2stB3c}+ST)h
z%UjWx?n`P~&MCVEIc}<CqG{WfZqhP5PkI79br;i3?%C%7gjf~U1wCj%E2R%9e9l_6
z5Y6L*PoUjG-(Uq=R)2s^otwY7g${kD#ugu7%N;}?L7N$Ti0-U@54{sh*mEL8Zr@Mz
z`ftrQYBBbZKh6IJ{~!4OH8k@C@mtU;h~LBh$Cse%q5Igkgab1@p&!xR6S})rWvGJT
z2Y7R|_d6Wc_1^n9s<$+l?4SulA02J7yL1PJuD3SmuIrv^$1=LU|2~fE;Rfa1%Z`s%
zFp_EZz5nr@YAUpZQ+FRBIn$YXh%=7~poIlIW1?T;c5Qq{IFua3ENPUz`YnzijlJYP
z;>;K}Qx4Eh*@iIB5`0Ga8<yoZBKVp7A85nh9REQ?M0l8Dd`sed{Ra7dd`us|qbv5D
zx(Gw7;s9F0I7dE2krc=(+NtO%{(Gv}Qd1EW>MDv=Yr!fy)-_j)$uLH`tLUmJkZ(4x
za+7O=ugo<>LzVkktA|gRNdTAeDaTf#6Xs~}5A*U+$+1^?nbVTJ%BMul0xdyR0W!;I
zDm!4)t9=ELr(yszC~(whrf~!x#3E^ma)z-cX89B#Tl*$)enomejSI*rGNs7HSqKl)
RxHOB9hanFicxd&|@*nHr6l4GZ

literal 0
HcmV?d00001

diff --git a/testData/results/TestNamedSuspendFun2Kt.dec b/testData/results/TestNamedSuspendFun2Kt.dec
new file mode 100644
index 0000000..8c4d7c5
--- /dev/null
+++ b/testData/results/TestNamedSuspendFun2Kt.dec
@@ -0,0 +1,301 @@
+import kotlin.Metadata;
+import kotlin.SuccessOrFailure.Failure;
+import kotlin.coroutines.Continuation;
+import kotlin.coroutines.intrinsics.IntrinsicsKt;
+import kotlin.coroutines.jvm.internal.ContinuationImpl;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@Metadata(
+   mv = {1, 1, 11},
+   bv = {1, 0, 2},
+   k = 2,
+   xi = 2,
+   d1 = {"\u0000\n\n\u0000\n\u0002\u0010\b\n\u0002\b\u0002\u001a\u0011\u0010\u0000\u001a\u00020\u0001H\u0086@ø\u0001\u0000¢\u0006\u0002\u0010\u0002\u001a\u0011\u0010\u0003\u001a\u00020\u0001H\u0086@ø\u0001\u0000¢\u0006\u0002\u0010\u0002\u0082\u0002\u0004\n\u0002\b\u0019"},
+   d2 = {"bar", "", "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;", "foo2"}
+)
+public final class TestNamedSuspendFun2Kt {
+   @Nullable
+   public static final Object foo2(@NotNull Continuation<? super Integer> var0) {
+      @Metadata(
+         mv = {1, 1, 11},
+         bv = {1, 0, 2},
+         k = 3,
+         xi = 2,
+         d1 = {"\u0000\u0010\n\u0000\n\u0002\u0010\u0000\n\u0000\n\u0002\u0018\u0002\n\u0002\u0010\b\u0010\u0000\u001a\u0004\u0018\u00010\u00012\f\u0010\u0002\u001a\b\u0012\u0004\u0012\u00020\u00040\u0003H\u0086@ø\u0001\u0000"},
+         d2 = {"foo2", "", "continuation", "Lkotlin/coroutines/Continuation;", ""}
+      )
+      final class NamelessClass_1 extends ContinuationImpl {
+         int label;
+         int I$0;
+         Object L$0;
+
+         @Nullable
+         public final Object invokeSuspend(@NotNull Object result) {
+            this.data = result;
+            this.label |= -2147483648;
+            return TestNamedSuspendFun2Kt.foo2(this);
+         }
+
+         NamelessClass_1(Continuation var1) {
+            super(var1);
+         }
+      }
+
+      NamelessClass_1 var3;
+      label463: {
+         if (var0 instanceof NamelessClass_1) {
+            var3 = (NamelessClass_1)var0;
+            if ((var3.getLabel() & -2147483648) != 0) {
+               var3.setLabel(var3.getLabel() - -2147483648);
+               break label463;
+            }
+         }
+
+         var3 = new NamelessClass_1(var0);
+      }
+
+      Object var4;
+      int x;
+      label491: {
+         Throwable var1;
+         Throwable var10000;
+         label472: {
+            Object var2 = var3.data;
+            var4 = IntrinsicsKt.getCOROUTINE_SUSPENDED();// 2
+            boolean var10001;
+            Object var22;
+            switch(var3.label) {
+            case 0:
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+               break;
+            case 1:
+               try {
+                  if (var2 instanceof Failure) {
+                     throw ((Failure)var2).exception;
+                  }
+
+                  var22 = var2;
+               } catch (Throwable var19) {
+                  var10000 = var19;
+                  var10001 = false;
+                  break label472;
+               }
+
+               try {
+                  x = ((Number)var22).intValue();// 6
+                  if (x == 0) {
+                     break label491;
+                  }
+               } catch (Throwable var17) {
+                  var10000 = var17;
+                  var10001 = false;
+                  break label472;
+               }
+
+               var3.label = 3;
+               if (bar(var3) == var4) {
+                  return var4;
+               }
+               break;
+            case 2:
+               x = var3.I$0;
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+
+               return 1;// 11
+            case 3:
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+               break;
+            case 4:
+               var1 = (Throwable)var3.L$0;
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+
+               throw var1;// 9
+            default:
+               throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
+            }
+
+            do {
+               try {
+                  var3.label = 1;// 5
+                  var22 = bar(var3);
+               } catch (Throwable var18) {
+                  var10000 = var18;
+                  var10001 = false;
+                  break label472;
+               }
+
+               if (var22 == var4) {
+                  return var4;
+               }
+
+               try {
+                  x = ((Number)var22).intValue();
+                  if (x == 0) {
+                     break label491;
+                  }
+               } catch (Throwable var20) {
+                  var10000 = var20;
+                  var10001 = false;
+                  break label472;
+               }
+
+               var3.label = 3;
+            } while(bar(var3) != var4);
+
+            return var4;
+         }
+
+         var1 = var10000;
+         var3.L$0 = var1;
+         var3.label = 4;
+         if (bar(var3) == var4) {// 8
+            return var4;
+         }
+
+         throw var1;
+      }
+
+      var3.I$0 = x;
+      var3.label = 2;
+      if (bar(var3) == var4) {
+         return var4;
+      } else {
+         return 1;
+      }
+   }
+
+   @Nullable
+   public static final Object bar(@NotNull Continuation<? super Integer> var0) {
+      return 0;// 14
+   }
+}
+
+class 'TestNamedSuspendFun2Kt$foo2$1' {
+   method 'invokeSuspend (Ljava/lang/Object;)Ljava/lang/Object;' {
+      2      34
+      a      35
+      d      35
+      11      36
+      14      36
+   }
+
+   method '<init> (Lkotlin/coroutines/Continuation;)V' {
+      2      40
+      5      41
+   }
+}
+
+class 'TestNamedSuspendFun2Kt' {
+   method 'foo2 (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
+      1      46
+      4      46
+      8      47
+      b      47
+      d      48
+      10      48
+      12      48
+      13      48
+      18      49
+      1b      49
+      1d      49
+      1e      49
+      21      50
+      2c      54
+      2e      63
+      31      63
+      32      64
+      35      64
+      38      67
+      3b      67
+      5e      69
+      61      69
+      64      70
+      67      70
+      6a      70
+      6f      127
+      70      127
+      73      128
+      79      135
+      7e      136
+      81      75
+      84      75
+      87      76
+      8a      76
+      8d      76
+      90      87
+      93      87
+      96      87
+      98      88
+      9e      166
+      a2      167
+      a3      167
+      a6      168
+      ac      168
+      b1      169
+      b3      103
+      b6      103
+      b9      104
+      bc      104
+      bf      105
+      c2      105
+      c5      105
+      c9      108
+      ce      97
+      cf      97
+      d2      98
+      d8      98
+      dd      99
+      e0      110
+      e3      110
+      e6      111
+      e9      111
+      ec      111
+      f3      156
+      f7      157
+      fb      158
+      fc      158
+      ff      159
+      105      159
+      10a      160
+      10c      115
+      10f      115
+      112      115
+      115      116
+      118      116
+      11b      117
+      11e      117
+      121      117
+      126      120
+      12a      108
+      12b      108
+      133      122
+      138      122
+   }
+
+   method 'bar (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
+      0      177
+      1      177
+      4      177
+   }
+}
+
+Lines mapping:
+2 <-> 65
+5 <-> 128
+6 <-> 88
+8 <-> 160
+9 <-> 121
+11 <-> 109
+14 <-> 178
+Not mapped:
+3
+4
diff --git a/testData/src/pkg/TestNamedSuspendFun2.kt b/testData/src/pkg/TestNamedSuspendFun2.kt
new file mode 100644
index 0000000..670a91f
--- /dev/null
+++ b/testData/src/pkg/TestNamedSuspendFun2.kt
@@ -0,0 +1,14 @@
+
+suspend fun foo2(): Int {
+    while (true) {
+        try {
+            val x = bar()
+            if (x == 0) break
+        } finally {
+            bar()
+        }
+    }
+    return 1
+}
+
+suspend fun bar(): Int = 0

From 7e155e71f2e410a17f1d3223a4a047bd13b81d4e Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 4 Oct 2018 11:41:55 +0200
Subject: [PATCH 223/252] remove redundant suppressions

---
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java      | 1 -
 .../java/decompiler/main/rels/NestedClassProcessor.java         | 2 --
 .../decompiler/modules/decompiler/vars/VarTypeProcessor.java    | 2 --
 .../java/decompiler/modules/renamer/IdentifierConverter.java    | 1 -
 src/org/jetbrains/java/decompiler/struct/StructContext.java     | 1 -
 5 files changed, 7 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index d79c8f9..47609fa 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -189,7 +189,6 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       }
 
       FileOutputStream fileStream = new FileOutputStream(file);
-      @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
       ZipOutputStream zipStream = manifest != null ? new JarOutputStream(fileStream, manifest) : new ZipOutputStream(fileStream);
       mapArchiveStreams.put(file.getPath(), zipStream);
     }
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 587f1d9..1b91f44 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -740,7 +740,6 @@ public class NestedClassProcessor {
     Statement first = findFirstBlock(statement, setStats);
 
     List<Exprent> lst;
-    //noinspection Duplicates
     if (first == null) {
       lst = statement.getVarDefinitions();
     }
@@ -780,7 +779,6 @@ public class NestedClassProcessor {
 
         stack.clear();
 
-        //noinspection Duplicates
         switch (st.type) {
           case Statement.TYPE_SEQUENCE:
             stack.addAll(0, st.getStats());
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
index 6339f9a..3c19d2c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
@@ -173,7 +173,6 @@ public class VarTypeProcessor {
           pair = new VarVersionPair(((ConstExprent)exprent).id, -1);
         }
         else if (exprent.type == Exprent.EXPRENT_VAR) {
-          //noinspection ConstantConditions
           pair = new VarVersionPair((VarExprent)exprent);
         }
 
@@ -192,7 +191,6 @@ public class VarTypeProcessor {
 
           mapExprentMinTypes.put(pair, newMinType);
           if (exprent.type == Exprent.EXPRENT_CONST) {
-            //noinspection ConstantConditions
             ((ConstExprent)exprent).setConstType(newMinType);
           }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
index 33b166d..ba09aa1 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
@@ -322,7 +322,6 @@ public class IdentifierConverter implements NewClassNameBuilder {
           nodes.put(clStr.qualifiedName, node = new ClassWrapperNode(clStr));
         }
 
-        //noinspection ConstantConditions
         if (child != null) {
           node.addSubclass(child);
         }
diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
index 40c1193..6d07096 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
@@ -123,7 +123,6 @@ public class StructContext {
   }
 
   private void addArchive(String path, File file, int type, boolean isOwn) throws IOException {
-    //noinspection IOResourceOpenedButNotSafelyClosed
     try (ZipFile archive = type == ContextUnit.TYPE_JAR ? new JarFile(file) : new ZipFile(file)) {
       Enumeration<? extends ZipEntry> entries = archive.entries();
       while (entries.hasMoreElements()) {

From 6de5e9717c2cc8398c115ba3583e0b5c8ea50421 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 8 Oct 2018 15:09:10 +0700
Subject: [PATCH 224/252] Standard Charset object used; other warnings fixed

---
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 47609fa..684249e 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -172,7 +172,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   @Override
   public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
     File file = new File(getAbsolutePath(path), entryName);
-    try (Writer out = new OutputStreamWriter(new FileOutputStream(file), "UTF8")) {
+    try (Writer out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
       out.write(content);
     }
     catch (IOException ex) {

From 7656bbdd681612e9b0d02337263fb3f08549f549 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 19 Oct 2018 21:14:52 +0200
Subject: [PATCH 225/252] [tests] extends Java decompiler test data; drops
 duplicated test

---
 .../java/decompiler/SingleClassesTest.java    |   1 -
 .../classes/pkg/TestInnerLocal$1Inner.class   | Bin 400 -> 569 bytes
 .../classes/pkg/TestInnerLocal$2Inner.class   | Bin 461 -> 648 bytes
 .../classes/pkg/TestInnerLocal$Inner1.class   | Bin 416 -> 603 bytes
 ...InnerLocal$Inner1Static$Inner2Static.class | Bin 430 -> 622 bytes
 .../pkg/TestInnerLocal$Inner1Static.class     | Bin 430 -> 609 bytes
 testData/classes/pkg/TestInnerLocal.class     | Bin 795 -> 906 bytes
 .../pkg/TestInnerLocalPkg$1Inner.class        | Bin 417 -> 0 bytes
 .../pkg/TestInnerLocalPkg$2Inner.class        | Bin 492 -> 0 bytes
 .../pkg/TestInnerLocalPkg$Inner1.class        | Bin 447 -> 0 bytes
 ...erLocalPkg$Inner1Static$Inner2Static.class | Bin 454 -> 0 bytes
 .../pkg/TestInnerLocalPkg$Inner1Static.class  | Bin 454 -> 0 bytes
 testData/classes/pkg/TestInnerLocalPkg.class  | Bin 847 -> 0 bytes
 .../pkg/TestInnerSignature$Inner.class        | Bin 610 -> 941 bytes
 .../pkg/TestInnerSignature$InnerStatic.class  | Bin 637 -> 962 bytes
 testData/classes/pkg/TestInnerSignature.class | Bin 683 -> 988 bytes
 testData/results/TestInnerLocal.dec           | 152 +++++++++---------
 testData/results/TestInnerLocalPkg.dec        | 135 ----------------
 testData/results/TestInnerSignature.dec       |  94 +++++------
 testData/src/pkg/TestInnerLocal.java          |  26 +--
 testData/src/pkg/TestInnerLocalPkg.java       |  65 --------
 testData/src/pkg/TestInnerSignature.java      |  22 +--
 22 files changed, 135 insertions(+), 360 deletions(-)
 delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$1Inner.class
 delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$2Inner.class
 delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$Inner1.class
 delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class
 delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class
 delete mode 100644 testData/classes/pkg/TestInnerLocalPkg.class
 delete mode 100644 testData/results/TestInnerLocalPkg.dec
 delete mode 100644 testData/src/pkg/TestInnerLocalPkg.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index f2b28b9..607c9a5 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -66,7 +66,6 @@ public class SingleClassesTest {
   @Test public void testAnonymousClass() { doTest("pkg/TestAnonymousClass"); }
   @Test public void testThrowException() { doTest("pkg/TestThrowException"); }
   @Test public void testInnerLocal() { doTest("pkg/TestInnerLocal"); }
-  @Test public void testInnerLocalPkg() { doTest("pkg/TestInnerLocalPkg"); }
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
   @Test public void testAnonymousSignature() { doTest("pkg/TestAnonymousSignature"); }
   @Test public void testLocalsSignature() { doTest("pkg/TestLocalsSignature"); }
diff --git a/testData/classes/pkg/TestInnerLocal$1Inner.class b/testData/classes/pkg/TestInnerLocal$1Inner.class
index 61aecb2cd131bd3b320f5a681ec63ca71c2dff03..5169762dc193628f86661f804dba8bc3de6c33da 100644
GIT binary patch
delta 359
zcmZ`!!AiqG6r4?>F)>z+T1~1R#8W+lg5aSiMG8Vdk=lc|ZCvWsWK)v0N58>*iU$!r
z_yOV%c@bag!ILb^&ag9Y_C1=fR`~J#_730>yDltjIxw+iBd`%x;Z^9zdBW2HFC-tP
zqF)1prEg_feFoR9cyc$2`l8flN{M3T-S5nJmtpVnUTK+$fh;BEE_lH+p+#}5RIa&}
zxhff&@t99}lyWtSPQ|1U3D@GLTV+SRmWOTZc(7}j!#qRqZym$R-<<Q|SR|UkukF>>
z$%6rhR_wu`1Gw!Mu=c?-j3-hCT*3ye4QjHmKwbxnq?*5OcvvPyx%v~JCgL_DvP#5+
WPiSBb>vUV#pjd;LOYil_CEy3tjY|{&

delta 197
zcmXX=I|{-;6r7ijA?q5yn`mmQSP5DSS_zh>mLTau1lPt}7;+K|5iLA`hYG#~c`zT|
zz|70Knc=s3e*i2n5wOs6VWRI~;6N2&TvW@IFA-oY;nZNGMNs=xU$%Lko_D8Xl1=B0
zCfI+L4R5kU>r|HqQsk9aTE_&Jn<5x|fQX);X!d|{XGai>9=8LEhxnWg*tOXkkmxX5
O{O@AKN^rhT4uK!|a2`tl

diff --git a/testData/classes/pkg/TestInnerLocal$2Inner.class b/testData/classes/pkg/TestInnerLocal$2Inner.class
index 87289e1956769d2d3031fe0e3bbfea11e958c39f..9f50cadf09fbf54850e2e019c1ba627f6323f4e1 100644
GIT binary patch
literal 648
zcmZuv%T60H6g^G`0%1yqgz_jYFR>s25md1QAyqsiq_k88vUes{FibpX#zFiR3xw1K
zAJC6N9J@%g3X7S0?(-a9`_J?5CjdKG9Y=sqWsG3Kq0c3JDPd7S+zC`$SMpXi6KQ(Q
zGn;AC+Z7nKmpWhD7MO0`T=$yiDz_)bsH~O7GI9AmZM5ANsIR|QFg&u}76=Z~t`exU
zv{63>{f^4cWhY^z>c_Tark(#944edk5zi|SdV7$_JXZ`ayhFS8)z?to>aT&Zy06+g
z*PQrMX0orW%Dx$sT4{A^IAZ1>m51skQ?azF%kJ`7I>=&mtev*n|7YKF%i<Z1Oq`@S
zm-SuQ%d}g<Qix@&gc!qkh_XYYC<)9DukTf+K=iiw)6SKOEjKY-PCb_E|H~s#T(7su
z6!0#A0wPBPM3EzAgm+5z31&ii7qms%N@L>zqVb4AWAg#Ud*Awj|4E;&v2~jGBR_Ds
rZ$SlBdTjQig-4F8fEqE+#@9hmWSdhmgIU@DbC|~zQJMLGHUeG%;kuE{

delta 247
zcmW-byGq1h5Ju0R%f^J5jhE<pBe*I^RMIFG$~M{v0UIm3-zCU~5WxhW!8YuZSS$+`
zK7imu_#)zLnmK2_nSpt?f6Vy%@AC^dXV1lA&BJDWVUfdz!&Vy~#$oo5*Uep3<*(Vx
zSeI9d-u0xKG$X~)an=^2>7}|DZ2Ro6>$8OG<1MU*qlnty=uBaE_X@w`O{wcTuN7gT
z-*j5)>N&lCD)Moo2&Qv&`zV|8R*Hcs>?bEPR5Hg%PG^`O5-FCY2Hkicm!bH9bb+J>
SeL|td3abpnJlVH|oA3|6CMbIV

diff --git a/testData/classes/pkg/TestInnerLocal$Inner1.class b/testData/classes/pkg/TestInnerLocal$Inner1.class
index 145dc8921152824e2511bb4ca158d8be4c02c3e1..adf59a89b28701b86732f7ba41a8b8c8d2724605 100644
GIT binary patch
literal 603
zcmZuu%Sr=55Uk0=HE}g@<2!1i<e*WEf;UAFMGzJhAGuF9L!7vo4Z9QZw>$*FgCF2W
zi9MsB5)V6F-91&++w=bM`UYShl^imd&m)TkgBBf>9V|1jCkD^&@<-kXx#~1-bSzcp
zfMHDE%cQo;Fyr?hI*nVA=yRn+>_-6)P5)3TsgD>oH~zaYD!JKY$ecuN!BFs}5*LGB
zOT@Rl6;j2svP~XKlYbX8W(0DwzIzO=1t%d-5<&IyKfblEyENbW^+0La6HS>&lDy(E
z?+Gp9W2GX^wTu)=%>5ekRP<vJa4p)z&fi3XI1p#j3|IR5^E+l+F2<2_k;jUQF*puZ
z85Tzu^*s+m@n^-Ct*!_(Lwduk#2Y1{N-vb9XG@`I#DQYb*inTZj65f(<5G4<F-@^h
z-x`9|Uy!PA50QSh)JZz0Y`a3#D&aNyK*&;1fJYgTtu(X9n59r6>=>sR0x8Vea}LuK
L^Hj}XiRQv5n9PSw

delta 228
zcmcc3vVd9s)W2Q(7#J8#7^FBESQrGj7+4tuK`bG51`&1!@rm*(@&Y~~sl_Fpd3mWt
zKKaRsIo6B}Y&MyBnI(3N45}JF6SM3lTQF*cO7JkSF|e~UNHQ{rqH0h9>oo*wgE4r(
z4CkE0;^Nd|Mh1bb#Ii*FoW#6zegCAa)Z`LI24)S-Fh&Nx$;%lH*%=vlfKJq(e4kND
rpOJwV$mU~U29mlAoD6zEwmt(BkYoUo{0w41nu~!E=mTK}Q3eJ8IHD}j

diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class
index b2262f5d6be86dd25b5045a82610851c045a9288..cf258df43ff97ee96f7bcc31a4077b5023730da3 100644
GIT binary patch
delta 321
zcmX9(!AiqG6r4?BV`8H=YSh#!c(IMO0rA#@2;wOR5zT$AOI=NqlB}NmiQo_T1%d|=
zJa`sA#;Z5+#qeO>%wyi{zGwa0@V|cFKL8wH(}n@hf{s-aYbMr9|DxkY*@!1G&n3T1
z#CZh_hPsx8iFWxJHU`o3b{v*Z-NPZn_Ss#k<V3`>kmNk&IiCn6@}o4(6jw4!3kEN`
z;rBdDcsdS`#WWWquEf=_oa{IoP0XOd(62Lt@~35+=rC;6gSNw<cY85|TMZufS?@uE
zMc+SxMg`cx8(6UW3hjlI2Ago6P6GOL-5z-dm?P!YZZy#%MSIo5pj_f6BeFz9!}33_
SV1c?z+JR4TvlQrH5!N4*dp!C8

delta 168
zcmWNKJqp555QM)?qR+&bnD`&D6q09QW2N3g^hj1V;hn$>2o@q(2$p&nk034sJ2UXH
z^9?S3@%cTTz=}ykKqtf}F?0?6y4X7_^LP-`plKKhW&JAa)6yL!iv_=|4u-KXb!VAL
z;@(p2gizmEJQYOtj@ZQw@2X9R^d>q1YhBwYyH&2O-6JMf&o!kC$!IB;(j)u>`9&0&

diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static.class
index f82d0eaadde560b79db1d24526dac28bd8608039..a2449252b95102f761a2e46f754f57e4791e7b63 100644
GIT binary patch
delta 314
zcmXw!%SyvQ6o&tki)n(^8g10nYZq3l5D|A-h#;=A5RvZ3cBrFiQqs|tFA-e(3W5s}
zT=)RKg=^nIJgv&WKi>!EoSE}vep=zj_uD&wL#%nQ5V$b0=wR7FScV(aDC1t!Px7uv
zJEBnHGL;wOAXxfJjR>2`@TMO<5H*fsLi7AK(`q0)YNWX8OcY`uwJeUaEZ0J-JmZ!i
zxfXXKN=4R>PUNtVU7=+!E+1R9m1(%}9IO)7|L2xpb$jnm_HBPc2efl<V21yF3WE>e
zwO>K)-4__oYzC^FRo(^I;<Z{lb{n&7!EZHcm}BF<@q-}v%nmWkGZ<KyWF1p{`|Ku`
LV50(usRH*0vzs}`

delta 162
zcmWlS%?ZLl5Jul5tD9Y7)M)%k5WEN)uj<7zY{9F=gmhp5f(H>q1g~~sBjSXCnfJl)
zzOT82`RDg|0UM?sL*EgST85Ua%I7kw_Q!fAi+CL4@Ro^CRPUlbNhZq%&I(EWl+{7#
tsHh~+0bkyca(yGXY7!FNiOQQQ!&YrO{p)HD=+V}jDuoPa5n+`g+#j`T6oLQ%

diff --git a/testData/classes/pkg/TestInnerLocal.class b/testData/classes/pkg/TestInnerLocal.class
index cc89241c2027be4d769d1d5ca14edaceb3a05bdf..bd2bf75d16c87e34acf61611ae1cc6cead951a80 100644
GIT binary patch
delta 427
zcmZvY!Ae3w6o&sZcAXrpg{h^MTHQ*ohDZ{KE$+4uS|mZ6;3k*4Bo=y~qD3IHXwg%&
z3R?64?Rt*hAv$*qS|kJKoH_IT{~6A6{6V@O-*4{#+Gr>&qa;yYL`6YhQ({ZOit@IC
zjPi~`0=p7>3dtx}C2CXmqLuF54ZPvGHx9h3q2G@JVIjN;CWK7y{`R`r_b1`;XylI#
z*_}R}oaX=c?UrF8E%Pa?z#)|9a0Y9gg<cp82#tu)HgzoHsV^yS*9r3m%!Gurk!b45
zTGf0|f6`IA3E~4-&MWAJ3xOQRxM{|)%5`c6U=4Y`B~Z`@!YwAD_$7lSlz54RBG-g0
q6TW^Fhn<;Ej<*SRNwPZ2`U(ngnEmsu|N087Gbym4zr=pbM&buD8&UKC

delta 254
zcmWlTJx;?w5QV>4J6XI)k&xnmy@_!EJ5D4TglM2J9R(c~9EJl>5p7A8Bcwt~kpm#k
zzy-JiVpb!)H+u8)-kbdx_FsRyJ#fv^F~VD>2h1FX%5v%$M6Mk+@|h#!+;ZVKjNDk-
zb^pBnevmvAQl|^ShkKbxr|840R65v5k#<6^Ql1E-@FTZL(>;dT+_iH=3kIuCWUGxZ
zQH%lLh?Fa}JPz-s_l2q@V>}g8-8<1<-|F5|_%%1`9WN&u85#}P>TE$x$BL!?D^xd>
K;U&3D=4Ag!lOAmV

diff --git a/testData/classes/pkg/TestInnerLocalPkg$1Inner.class b/testData/classes/pkg/TestInnerLocalPkg$1Inner.class
deleted file mode 100644
index eedffa20d12fcd09587129c47507995b0a431940..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 417
zcmZutO-sW-5Pg%Tjg8UPYHJG~Ja}j$7zA&Mm!crV4@l{KlP)oB+(@z&|CR?4Jop3r
zQQ{;D9x4m-wQt_Mna{8H4*(|^*f7y<qJ}LC9SdCoJrg?qTs#Rc6)N@uohK?jB{a?w
zmFROqcewgJni9-$Hj{*wpD1~=d<bPe5n;*|JII!KBrlUP=}lyzuauIxpG6|QTf|4@
zFz&lhQJNJz>{{ykY-XY7U>AJ{R%z;J5cVDyvA05Sa9r^b>c8Hp{5TawAqztLZ=2h2
zE+fr5{7b}8&FTUzbQ1ljAk>DVDfan9CZCKErIIQl7PiKfCTA`Tet_-1f!xDa7%vsZ
iX1mF~;7v^Q89U%?opS>YHrSi|-@*<@HglE8ZQvVdKU!n}

diff --git a/testData/classes/pkg/TestInnerLocalPkg$2Inner.class b/testData/classes/pkg/TestInnerLocalPkg$2Inner.class
deleted file mode 100644
index 5a1dcc4781e9ab6efe9d2a011613318ef7baa77a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 492
zcmZ`#%TB^j5Iw`IQY%yx@PUbmm;e%Mj601RqKQd;BoOwc+(4n;n)YJ+Ef>VZg&*KY
z8K>361-O|rGk509x##oi{R6-m_VUPJLq`^yaaPt)(XdUR7edLNIM0sdJ91=oRp`ml
zIU%RUUQ|CJRPCqf$m)qm-AE}yJ8&KUVVaCwc+yjsgm&YfnMLAepOEPULqRCoo)mYp
z$AJiY&cNr6-VJ7<E3Un`s4Sd3j%D)Rm2~|eVwtx>jf0_v9Rs_l8CXHyfF5T#XoT8Q
z;q}wxAB5~L8VPoMCyGQwF#pWBA54U+2<4?jtXHusKOzX}MzfE7_BP9gr(nh!0Mm?B
zafhvDX{#I!t}LENGZtG%b5QFIsaAWA^lLJ>#<7q*AMk3O^Fyu*+)bg##NZ?AC}E2;
Koe49HRp1-R18sx=

diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1.class
deleted file mode 100644
index 9d548f11d7c6c7f69253492d20f9ce1f15b47aec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 447
zcmZ`#!AiqG5Ph4Zjg7I1)wU`gJoHdwF)esgyc7f>sL<kl6PLJcOe9Ig-||od4}O3j
zCC&!KL+fSc&FtGZZ|3X!;}gIc4jM4vTBu=Lp_YkV6I}-O%FqgC{Du1oPh)>l<}!`X
z8S3SuEP6wRZty&h{i!I*>ogU4kVQPXn^%+znac8#VbK4FvnqUi&tQzR2f^S3G8H$A
zr%>cm9wyYWCfOp7#FbP<XJzE6vT0)j4I38rY}8?z*k?Fg>#$e(9nmVkz^=eJ;YA?|
z2KR66+i)hLl0ok)gYC6?IHJSV=$aZ_H5zbTWrjL*M{=}D(Wc5LhECb>PL^QaJ2Y>w
hg#K0$w<tENXP>?f36F^0q^<@B9m*ET7}!A@_yGqFV;KMd

diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class
deleted file mode 100644
index 54d59e36bd87cc1e43e3370614d4ab0386032f76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmaiw!AiqG5QhJ0YGYz-YqV95iib9WLGfnor634Jg_hnoaS3VTwj^8ewLFO6!3Xf6
z#7Rn3s2~fw^UeJK4l^I0Z|?xkv2UY{O$!F9Ch8`32=qj7`(yDa{6wh8ALukz(FLK>
ziB+t-ghp$%+#V6iz3IIq)cUcKH}i);rb7`VoUsSfc^b;AIEUs?X8Kwwnf9llNbV-l
zN#4wXiH3tUR7~s={MjV(SCmJE?{uJrj>83<Er8(st}U^bh%A%Y62HaupZRWsu?#iA
zXthTs_6Udnx8@!EDZ&A7vdo($)bmk_h<LJf&R9$yN_+s@dj)yNFDN}18k_Gbdw~x7
bFIn4V-3D_B4qSd+j%sLPi~lk>+J^N7=k#fu

diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class
deleted file mode 100644
index 262b686c30da2d1cca9da82d1ee68d954ca1d39d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmah_!AiqG5Ph4(rirnw(Nw*Oc&HH!im0G?DF{MPA;tS9E+K82NU{}w%Yz6W`~W{n
zoJ68X1zFggH~Zeqn|c3ueFJca4HFuc4XChntm<$WtjjDD#eN{UOri!3Q(l&$)X{G;
z2MvKeGT8o@KX5PQS?mR}NV52pp>>vIi9Ba;2J_!Lw+z}azY`2yKgq<^Y#NGU#KV*_
zW{}T{NL(Zp=#NAxYfpY2@$_aA?^Vq#EMm=q0aM31!`A&I_U4$|zh~+FxV#R>B9aW=
z|GKXt-}9=2%DeNY4x6+|jW)~BtE|-#Bc~Q+mI%2}=m4hs0_N^MLwTw>9lATD1&&C6
aOxhFTbqOm}sYS0%k%|>8pbed(HjGaLyJ?94

diff --git a/testData/classes/pkg/TestInnerLocalPkg.class b/testData/classes/pkg/TestInnerLocalPkg.class
deleted file mode 100644
index 7535849415a902d2493e0be9fb679db723b44f00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 847
zcmah{+fKqj5Iqaj(u$%eUQt9*3mA#UH;peOCMI}EFcKdNZm^2QK=r?TGLgg&@S}`p
zTfrD>+)Z~bd*<xSblyK+-vI2PU}7ALIx=xAnTTLnN7jU<<cbMh$yE~u)^y}ej4HXV
zV?!Wu?7FhMQ}b-kX%5Uv+wS#bPhcdt70`TzjswSayhDMgRk#$0RXW#FAX#->dHQ(Y
zklhQr(WYm@lRYmWJ(1o`=UTv2uAx!uJa(J%$Wh>#3*Pt-R69+(eSX*4zO|q11g0=8
zka@Ukm46}fJ6{>a6s>}83ao}hgCYhcmj4Ik{fON`M9`z5`A0&#evrz<`ZMVu6M=MS
z4s4sMyWF<jR{5-PE1MpnR`uIi^SX}P+E=aLvZ|pZ`(be8FvbB<D+;0d$}>$XM=2<^
z;tRwx75)vLYJ@;ojH6{>b_lO9T&-*$k*ien1+jV`ny-ye(|s*o|0YV20$3zrh9pZ^
z<`$S664rRH-Y@lGToo0g`GavZa3(^@XE@-%Cdb)gF$Juk$X#OY^YllsfC<VXQ5wrn
VB2MHOCh0TyrF={vbs};wJ^?^txtIU|

diff --git a/testData/classes/pkg/TestInnerSignature$Inner.class b/testData/classes/pkg/TestInnerSignature$Inner.class
index d335f61d6f41d82b1c10e3899465101d5982de53..3303ccb4d4ac8aa7e7c60223f6aea8a47a3b6f1d 100644
GIT binary patch
literal 941
zcma)5U2hUW6g>k=x3pWKw52W9YAaRP*5ZS2HccwV#Dw@&!uvocI29JMEGGUZUwj}Y
zKKKLtQO0wpLe!SThrM&|-E;4pduQgy&u`xWJi$>G3)o+RkNbkkVh+SS@KNzmRZv=?
z(74neb*-nPZtZpZ(sYui3fXhpjdU`OjY7J4#)xVQdM2nNs7|zyytkwBV}-58@I$xO
zG^6BY6q$IIESwV?+2mB=ZDk(mx`6+QR9gyOeQ-gAxrU9*t8u?=;-+r*7%4Oc9o=i`
z*oyx<=!sl~jMJzPxV7HXqmf~FcaFTWqp_3X-!(rCr**4yGEX=-PK={EJ)RZ`Dzl(8
zu>WoxCAM!`c4R5^jgEESBqlzKqCuh)JBX;P_{TV&n_+A^Ix!biv~)fg#~t&+O3Rzq
z$A2s*8z7I>00o2r7Lg4Qh`EKVk3)r>n-A`)X@&g1cY{Y?5#hy~^RUP3<@5G={J0w^
zk|>2`T5de^SLjp2%+KZXqLWcxFp6D68te2vGdIJv6dq2X!mmh$M-!yOM-zDAwl_iM
z3;(9EL0fdpHCA0`?G4r_VjG*Z@)}$fdL??S=XO&LiO!TmqA=}{X!CHJICQ;~n7Knw
pG8fs+l)p0L=g7P2^$vE)Tb4o!cO{4Pd(Q4r5J=;@z(Z_7{Q}=H#<2hZ

delta 197
zcmW-bIS#@w5JkVuVjLL?2q9((kVQ&53c3g(LWe>Z(a}<H1C9~7=LTGWf&)-+2r5p2
zn9w{u{Xe6bn|Rlg=lA{qutX%$gtj0stZY<aTwx+G74XYs$L+klc(r|;m)BEU#l<Eq
zvb5Ny$-#Ws!U+^wkP50o2T~wpaLtOj#$(##T(hn@^P}Lf>1JkLJX$mK$sII^b4d8K
b8K8#{8WAi?Ikg;vzqvF6N*O)oVFvaCYE2nX

diff --git a/testData/classes/pkg/TestInnerSignature$InnerStatic.class b/testData/classes/pkg/TestInnerSignature$InnerStatic.class
index 2bd775bc27a377081b540e9fd09e821d9a4dd787..7d51b40b09a60a800a144072ed46783fa3aa9f47 100644
GIT binary patch
literal 962
zcma)4+int36kUg*P++7L>(sl2qSEogi!Ul6p%@brqD>*ZAEqaGD$J0X!Nh;@Cww3#
zKKKEClyMz~A_|Fpn0?m1uf1pg{Pq0@faf^MBZGq+woo>rV#Hw<53+bDAf!O4b1py0
z`bhf2`uoAT^5Rzlxvn1iGM<J?!0NSV5d(vc4e|_X6J;9O*Kt$eMQy#vWh_U1fpj}K
zW0#$d_SL)Tc%Z_b9E@lwbplV0`ZCl;Ul`Nz2OS9%-uk`@yRnQl+1PWfJ(5wR=&W`o
zABXjxisB^dVwCDi64^U{*Z(}Z=uy8!euGQlHn@f+OWC!hYDTJ@PW@PqRbNM%)K6q6
z$0}A~%l89AIq=ESSy|9)H3^j`V|B)2Cymz272o2Y9B;6-H`to%sRH?KFbzHRMw`9v
zuW#m=IRP6xcw{4sZ5st6u3$Th8prwnIt6zBy&@h-%`C&&oQ*OMF~bwJ_^~H=bVMoS
zDcOFh+tkTqsTYZOF4$$}Rr<a#C(U=y{RZJao+0HvnZa_O&XE2}yM+>^!*0NRMjo(F
z8AViZ4Tt;yH_68y_NlSbf{#IlNosC094y=*{u6)GgwNyi<dnqQ%lIPWlbLSeHoXNi
bs=yseLo0FJ#XV{%Qgis4GFzzPI&!}O!W-3j

delta 186
zcmXYqOAY}+6h%*!Pj%BI8tvPD=>Y@3#H>v)FqSm?umM{TsRdXE0|P^wumEcys>S5o
zlbhW4?&_Tk9-r$Cn9<9Srec$#8lx7Yu4pRSr{J7(`q3hcmSMCC2RnTc2e0FxupF{6
za#)J4prtpmb9(xEFKfcpN4Zs!f_X64FWFuTT;rZO4MUQQuo;tQLXoL)kj4^!D^dP6
N9xam@gxNLlvA+rs7cl?;

diff --git a/testData/classes/pkg/TestInnerSignature.class b/testData/classes/pkg/TestInnerSignature.class
index e2f948978059ff410185daba9e079b7247c94fee..18b96efd6263d2fc8b90f987e01b0ee9e97846c4 100644
GIT binary patch
delta 504
zcmZ`#Jx>Bb5Pf^cd3>v24pbBb^#Dz1>`qMp6JtVQ^g_Sl22bH2$6;b4f53*&+FRIK
zS@;9&?ffSu#<}w=7G{$-Z)V@@yq$aHRn?#0AD;khVKa;=6hct2>cN@^>nd~=MHQv7
zo@M3n{@p0i=(TvK$sLQIbcE>vL%=<=1`O#&|Ds(n#lStVZQ&eSZJWD8M;Hv+-?pp%
zcWdFFo^7*gm^H(!8@tpVEq<l7x>0H}<d257Yjs7_8d&7ukUP99T;Wu0yXSJ(>e*yR
zYn<~-Ug>bVUD*?TN3^&rPL1)~b!sDuC}L5}c#uGh#GduZ4bzpp&mLG#$@uJraaD#!
zOS+xxNZFB$6mgB#0|XI3h)x)BM3AIM(^M@}6_~?37ASg*hJpEvCPMNVjfIRw;=lR~
yWuN-#AN}l)K1up`l>`!&uuL%`6EI{6;oT8R$YI5gdGZDNoCKA;27Q+bxnv*VJ6#h1

delta 202
zcmXYqOAf(M6o&tMsH=4=(k9h<w56oX&1&M2h>=NS9adlu&0U0nh`E6USc9z)=O!lK
z|HwJ{-|}kZukYgtV1cQF1_m}P3=Lv~L?V?KNsOyJ5m~jnxN26eigI0)n__;{cX9S7
z3JR`5$H0Rt;OQ;pBGxBLMaT^GjrNid@X%6!C^-mp*#|sfSm$ITL>m!&^jHDnT>HC-
TJJa;}3OqrO{MqE>u(lw6e{mPa

diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
index 6ca3a7e..af4fb30 100644
--- a/testData/results/TestInnerLocal.dec
+++ b/testData/results/TestInnerLocal.dec
@@ -1,133 +1,135 @@
+package pkg;
+
 public class TestInnerLocal {
    public static void testStaticMethod() {
       class Inner {
          final String x;
 
-         public Inner(String var1) {
-            this.x = var1;// 22
-         }// 23
+         public Inner(@Deprecated String x) {
+            this.x = x;// 8
+         }// 9
       }
 
-      new Inner("test");// 25
-      new TestInnerLocal.Inner1Static("test");// 26
-      new TestInnerLocal.Inner1Static.Inner2Static("test");// 27
-   }// 28
+      new Inner("test");// 11
+      new TestInnerLocal.Inner1Static("test");// 12
+      new TestInnerLocal.Inner1Static.Inner2Static("test");// 13
+   }// 14
 
    public void testMethod() {
       class Inner {
          final String x;
 
-         public Inner(String var2) {
-            this.x = var2;// 34
-         }// 35
+         public Inner(@Deprecated String x) {
+            this.x = x;// 20
+         }// 21
       }
 
-      new Inner("test");// 37
-      new TestInnerLocal.Inner1Static("test");// 38
-      new TestInnerLocal.Inner1("test");// 39
-      new TestInnerLocal.Inner1Static.Inner2Static("test");// 40
-   }// 41
+      new Inner("test");// 23
+      new TestInnerLocal.Inner1Static("test");// 24
+      new TestInnerLocal.Inner1("test");// 25
+      new TestInnerLocal.Inner1Static.Inner2Static("test");// 26
+   }// 27
 
    static class Inner1Static {
       final String x;
 
-      public Inner1Static(String var1) {
-         this.x = var1;// 53
-      }// 54
+      public Inner1Static(@Deprecated String x) {
+         this.x = x;// 39
+      }// 40
 
       public static class Inner2Static {
          final String x;
 
-         public Inner2Static(String var1) {
-            this.x = var1;// 59
-         }// 60
+         public Inner2Static(@Deprecated String x) {
+            this.x = x;// 45
+         }// 46
       }
    }
 
    class Inner1 {
       final String x;
 
-      public Inner1(String var2) {
-         this.x = var2;// 46
-      }// 47
+      public Inner1(@Deprecated String x) {
+         this.x = x;// 32
+      }// 33
    }
 }
 
-class 'TestInnerLocal$1Inner' {
+class 'pkg/TestInnerLocal$1Inner' {
    method '<init> (Ljava/lang/String;)V' {
-      6      6
-      9      7
+      6      8
+      9      9
    }
 }
 
-class 'TestInnerLocal' {
+class 'pkg/TestInnerLocal' {
    method 'testStaticMethod ()V' {
-      4      10
-      e      11
-      18      12
-      1e      13
+      4      12
+      e      13
+      18      14
+      1e      15
    }
 
    method 'testMethod ()V' {
-      5      24
-      f      25
-      1a      26
-      24      27
-      2a      28
+      5      26
+      f      27
+      1a      28
+      24      29
+      2a      30
    }
 }
 
-class 'TestInnerLocal$2Inner' {
-   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-      b      20
-      e      21
+class 'pkg/TestInnerLocal$2Inner' {
+   method '<init> (Lpkg/TestInnerLocal;Ljava/lang/String;)V' {
+      b      22
+      e      23
    }
 }
 
-class 'TestInnerLocal$Inner1Static' {
+class 'pkg/TestInnerLocal$Inner1Static' {
    method '<init> (Ljava/lang/String;)V' {
-      6      34
-      9      35
+      6      36
+      9      37
    }
 }
 
-class 'TestInnerLocal$Inner1Static$Inner2Static' {
+class 'pkg/TestInnerLocal$Inner1Static$Inner2Static' {
    method '<init> (Ljava/lang/String;)V' {
-      6      41
-      9      42
+      6      43
+      9      44
    }
 }
 
-class 'TestInnerLocal$Inner1' {
-   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-      b      50
-      e      51
+class 'pkg/TestInnerLocal$Inner1' {
+   method '<init> (Lpkg/TestInnerLocal;Ljava/lang/String;)V' {
+      b      52
+      e      53
    }
 }
 
 Lines mapping:
-22 <-> 7
-23 <-> 8
-25 <-> 11
-26 <-> 12
-27 <-> 13
-28 <-> 14
-34 <-> 21
-35 <-> 22
-37 <-> 25
-38 <-> 26
-39 <-> 27
-40 <-> 28
-41 <-> 29
-46 <-> 51
-47 <-> 52
-53 <-> 35
-54 <-> 36
-59 <-> 42
-60 <-> 43
+8 <-> 9
+9 <-> 10
+11 <-> 13
+12 <-> 14
+13 <-> 15
+14 <-> 16
+20 <-> 23
+21 <-> 24
+23 <-> 27
+24 <-> 28
+25 <-> 29
+26 <-> 30
+27 <-> 31
+32 <-> 53
+33 <-> 54
+39 <-> 37
+40 <-> 38
+45 <-> 44
+46 <-> 45
 Not mapped:
-21
-33
-45
-52
-58
+7
+19
+31
+38
+44
diff --git a/testData/results/TestInnerLocalPkg.dec b/testData/results/TestInnerLocalPkg.dec
deleted file mode 100644
index 7cafa41..0000000
--- a/testData/results/TestInnerLocalPkg.dec
+++ /dev/null
@@ -1,135 +0,0 @@
-package pkg;
-
-public class TestInnerLocalPkg {
-   public static void testStaticMethod() {
-      class Inner {
-         final String x;
-
-         public Inner(String var1) {
-            this.x = var1;// 24
-         }// 25
-      }
-
-      new Inner("test");// 27
-      new TestInnerLocalPkg.Inner1Static("test");// 28
-      new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 29
-   }// 30
-
-   public void testMethod() {
-      class Inner {
-         final String x;
-
-         public Inner(String var2) {
-            this.x = var2;// 36
-         }// 37
-      }
-
-      new Inner("test");// 39
-      new TestInnerLocalPkg.Inner1Static("test");// 40
-      new TestInnerLocalPkg.Inner1("test");// 41
-      new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 42
-   }// 43
-
-   static class Inner1Static {
-      final String x;
-
-      public Inner1Static(String var1) {
-         this.x = var1;// 55
-      }// 56
-
-      public static class Inner2Static {
-         final String x;
-
-         public Inner2Static(String var1) {
-            this.x = var1;// 61
-         }// 62
-      }
-   }
-
-   class Inner1 {
-      final String x;
-
-      public Inner1(String var2) {
-         this.x = var2;// 48
-      }// 49
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$1Inner' {
-   method '<init> (Ljava/lang/String;)V' {
-      6      8
-      9      9
-   }
-}
-
-class 'pkg/TestInnerLocalPkg' {
-   method 'testStaticMethod ()V' {
-      4      12
-      e      13
-      18      14
-      1e      15
-   }
-
-   method 'testMethod ()V' {
-      5      26
-      f      27
-      1a      28
-      24      29
-      2a      30
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$2Inner' {
-   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
-      b      22
-      e      23
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$Inner1Static' {
-   method '<init> (Ljava/lang/String;)V' {
-      6      36
-      9      37
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
-   method '<init> (Ljava/lang/String;)V' {
-      6      43
-      9      44
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$Inner1' {
-   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
-      b      52
-      e      53
-   }
-}
-
-Lines mapping:
-24 <-> 9
-25 <-> 10
-27 <-> 13
-28 <-> 14
-29 <-> 15
-30 <-> 16
-36 <-> 23
-37 <-> 24
-39 <-> 27
-40 <-> 28
-41 <-> 29
-42 <-> 30
-43 <-> 31
-48 <-> 53
-49 <-> 54
-55 <-> 37
-56 <-> 38
-61 <-> 44
-62 <-> 45
-Not mapped:
-23
-35
-47
-54
-60
diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
index bb18d0d..b2e4d0f 100644
--- a/testData/results/TestInnerSignature.dec
+++ b/testData/results/TestInnerSignature.dec
@@ -1,24 +1,26 @@
+package pkg;
+
 public class TestInnerSignature<A, B, C> {
    A a;
    B b;
    C c;
 
-   public TestInnerSignature(A var1, B var2, C var3) {
-      this.a = var1;// 23
-      this.b = var2;// 24
-      this.c = var3;// 25
-   }// 26
+   public TestInnerSignature(A a, @Deprecated B b, C c) {
+      this.a = a;// 9
+      this.b = b;// 10
+      this.c = c;// 11
+   }// 12
 
    public static class InnerStatic<A, B, C> {
       A a;
       B b;
       C c;
 
-      public InnerStatic(A var1, B var2, C var3) {
-         this.a = var1;// 46
-         this.b = var2;// 47
-         this.c = var3;// 48
-      }// 49
+      public InnerStatic(A a, @Deprecated B b, C c) {
+         this.a = a;// 32
+         this.b = b;// 33
+         this.c = c;// 34
+      }// 35
    }
 
    public class Inner {
@@ -26,55 +28,55 @@ public class TestInnerSignature<A, B, C> {
       B b;
       C c;
 
-      public Inner(A var2, B var3, C var4) {
-         this.a = var2;// 34
-         this.b = var3;// 35
-         this.c = var4;// 36
-      }// 37
+      public Inner(A a, @Deprecated B b, C c) {
+         this.a = a;// 20
+         this.b = b;// 21
+         this.c = c;// 22
+      }// 23
    }
 }
 
-class 'TestInnerSignature' {
+class 'pkg/TestInnerSignature' {
    method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-      6      6
-      b      7
-      10      8
-      13      9
+      6      8
+      b      9
+      10      10
+      13      11
    }
 }
 
-class 'TestInnerSignature$InnerStatic' {
+class 'pkg/TestInnerSignature$InnerStatic' {
    method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-      6      17
-      b      18
-      10      19
-      13      20
+      6      19
+      b      20
+      10      21
+      13      22
    }
 }
 
-class 'TestInnerSignature$Inner' {
-   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-      b      29
-      10      30
-      16      31
-      19      32
+class 'pkg/TestInnerSignature$Inner' {
+   method '<init> (Lpkg/TestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
+      b      31
+      10      32
+      16      33
+      19      34
    }
 }
 
 Lines mapping:
-23 <-> 7
-24 <-> 8
-25 <-> 9
-26 <-> 10
-34 <-> 30
-35 <-> 31
-36 <-> 32
-37 <-> 33
-46 <-> 18
-47 <-> 19
-48 <-> 20
-49 <-> 21
+9 <-> 9
+10 <-> 10
+11 <-> 11
+12 <-> 12
+20 <-> 32
+21 <-> 33
+22 <-> 34
+23 <-> 35
+32 <-> 20
+33 <-> 21
+34 <-> 22
+35 <-> 23
 Not mapped:
-22
-33
-45
+8
+19
+31
diff --git a/testData/src/pkg/TestInnerLocal.java b/testData/src/pkg/TestInnerLocal.java
index f0e9565..1d961fd 100644
--- a/testData/src/pkg/TestInnerLocal.java
+++ b/testData/src/pkg/TestInnerLocal.java
@@ -1,24 +1,10 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package pkg;
 
 public class TestInnerLocal {
   public static void testStaticMethod() {
     class Inner {
       final String x;
-      public Inner(String x) {
+      public Inner(@Deprecated String x) {
         this.x = x;
       }
     }
@@ -30,7 +16,7 @@ public class TestInnerLocal {
   public void testMethod() {
     class Inner {
       final String x;
-      public Inner(String x) {
+      public Inner(@Deprecated String x) {
         this.x = x;
       }
     }
@@ -42,20 +28,20 @@ public class TestInnerLocal {
 
   class Inner1 {
     final String x;
-    public Inner1(String x) {
+    public Inner1(@Deprecated String x) {
       this.x = x;
     }
   }
 
   static class Inner1Static {
     final String x;
-    public Inner1Static(String x) {
+    public Inner1Static(@Deprecated String x) {
       this.x = x;
     }
 
     public static class Inner2Static {
       final String x;
-      public Inner2Static(String x) {
+      public Inner2Static(@Deprecated String x) {
         this.x = x;
       }
     }
diff --git a/testData/src/pkg/TestInnerLocalPkg.java b/testData/src/pkg/TestInnerLocalPkg.java
deleted file mode 100644
index cc3b2b4..0000000
--- a/testData/src/pkg/TestInnerLocalPkg.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package pkg;
-
-public class TestInnerLocalPkg {
-  public static void testStaticMethod() {
-    class Inner {
-      final String x;
-      public Inner(String x) {
-        this.x = x;
-      }
-    }
-    new Inner("test");
-    new Inner1Static("test");
-    new Inner1Static.Inner2Static("test");
-  }
-
-  public void testMethod() {
-    class Inner {
-      final String x;
-      public Inner(String x) {
-        this.x = x;
-      }
-    }
-    new Inner("test");
-    new Inner1Static("test");
-    new Inner1("test");
-    new Inner1Static.Inner2Static("test");
-  }
-
-  class Inner1 {
-    final String x;
-    public Inner1(String x) {
-      this.x = x;
-    }
-  }
-
-  static class Inner1Static {
-    final String x;
-    public Inner1Static(String x) {
-      this.x = x;
-    }
-
-    public static class Inner2Static {
-      final String x;
-      public Inner2Static(String x) {
-        this.x = x;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/testData/src/pkg/TestInnerSignature.java b/testData/src/pkg/TestInnerSignature.java
index d69f0b3..4da4162 100644
--- a/testData/src/pkg/TestInnerSignature.java
+++ b/testData/src/pkg/TestInnerSignature.java
@@ -1,25 +1,11 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package pkg;
 
 public class TestInnerSignature<A,B,C> {
   A a;
   B b;
   C c;
 
-  public TestInnerSignature(A a,B b,C c) {
+  public TestInnerSignature(A a, @Deprecated B b,C c) {
     this.a = a;
     this.b = b;
     this.c = c;
@@ -30,7 +16,7 @@ public class TestInnerSignature<A,B,C> {
     B b;
     C c;
 
-    public Inner(A a, B b, C c) {
+    public Inner(A a, @Deprecated B b, C c) {
       this.a = a;
       this.b = b;
       this.c = c;
@@ -42,7 +28,7 @@ public class TestInnerSignature<A,B,C> {
     B b;
     C c;
 
-    public InnerStatic(A a, B b, C c) {
+    public InnerStatic(A a, @Deprecated B b, C c) {
       this.a = a;
       this.b = b;
       this.c = c;

From 5424600265ba853c489301a5f91e50a4bf31ed30 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 23 Oct 2018 21:04:22 +0200
Subject: [PATCH 226/252] [tests] updates Java decompiler test data (follow-up
 to PR #880)

---
 testData/obfuscated/bd.java | 3142 ++++++++++++++++++++++++++++++++++-
 testData/obfuscated/h.java  |    4 +-
 testData/obfuscated/v.java  |   48 +-
 3 files changed, 3189 insertions(+), 5 deletions(-)

diff --git a/testData/obfuscated/bd.java b/testData/obfuscated/bd.java
index 5368353..11810ac 100644
--- a/testData/obfuscated/bd.java
+++ b/testData/obfuscated/bd.java
@@ -342,6 +342,3146 @@ public class bd {
    }
 
    static {
-      // $FF: Couldn't be decompiled
+      String[] var10000 = new String[106];
+      char[] var10003 = "ￖ\"".toCharArray();
+      int var10005 = var10003.length;
+      char[] var10004 = var10003;
+      int var12 = var10005;
+
+      int var2;
+      char var10007;
+      byte var10008;
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "aq".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[1] = (new String(var10004)).intern();
+      var10003 = "\u0005c(\u001f_X~+G\u0007\u001000\u0007\u0007\\k%B^K34\u001f@Oa7\u001dY\u001ak.\u001fE\u001dj5N^@?5\u000eBJ6(O\u0006\u001dq5\u0018\u0004\u001efv\u001eEJa0G\tE~#\u0002\u0004^k;\u0018\tIn%@_N08\u0011AOe.\u0014T]09\u0001I\u001ej&\u001a@".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[2] = (new String(var10004)).intern();
+      var10003 = "\u000537\u000e\\[b&\u0006Z_cr\u001f\u0006B?-\rK\u001a0p\u0011_AwpFEFvr\u0007D\u0011w3\u0014RPm'\u0018Y\u0011vq\u0015[Ba'AH\u001a?%\u0001\u0004Ca3\r\u0003O?;D[Gh6CV\u001cw3\u0010\u0000YwxC@L}9\u0005C]}4\u0015\u0005^38\u0010\\".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[3] = (new String(var10004)).intern();
+      var10003 = "\u000533\u000f\u0004Y0q\u0015WZe7\u000fKYb6NDL\u007f7\u001bPId,NYD0s\u0010@Djw\u0016UM3+\u0019\b\u001b?v@UL`t\u0019^\u001a?&FE\u001db1\u0016V\u001f10\u000f\u0000Nm.ER]q8@R\u001e37A\u0005\u001dfy\u0000@\u0018b)\u000fEJa \u001c".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[4] = (new String(var10004)).intern();
+      var10003 = "￥￡".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[5] = (new String(var10004)).intern();
+      var10003 = "\u00053w\u0015X\u001e4#\rSK`2\u0003]Cr&\u001fI_b)\u001eDPbxDTO1;OEZq$\u001e\u0006Ojv@T\u0011mx\u001d\u0000\u001cp.\u0007\u0005Ed&\u0006F\u001enp\r\t\u001c?&\u0015XJ?'OT^ev\u0015\u0002F60\u0010RBk&\u0007F_32\u0005W\u001fb8F@".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[6] = (new String(var10004)).intern();
+      var10003 = "\u001ev5\u0006P\u001b>&\u0007H@7-GCI>)\u0007S\u001ej;\u0010UMm AYO2#\u000fZ\u001e7s\u001cS\u0010oq\u001fVFu\"DWG?'OZ\u0011`&\u0013\t]fw\u001aH\u0019o$DWG~&@^P7rDK\u0018q$FPL}2A\u0001No \u0018PLjv\u000e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[7] = (new String(var10004)).intern();
+      var10003 = "\u00054r\u0007YI4,\u0018RZ~(\u0001K\u00187x\u001aC]e8\u000e\u0004\u00117/FRMmuNK\u0010k'\u001cP\u0019fp\u001ePK5)@\t_os\u001f\u0003J~/@P\u001cm7\u001fG\u0010`+\u0015\u0005\u0010tx\u0011IPk/\u001f\u0004@isC\t\u001c0rCY\u001auqC\u0000\u0010n7\u001aT".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[8] = (new String(var10004)).intern();
+      var10003 = "L3t\u0019ZB30\u0014\bNs6\u0010\u0002Z1$\u001aVI09\u000eU]30F\u0004\\qvN\\_o9BK\u001f\u007fw\u0006DFb-N\u0002[5'B[[00\rZNb O\u0006\u001ew2\u0002[Ltp\u0013\u0003G~qO_Qe)\u001eSLh0\u001a\\\u001bs9\u0013B\u0010ds\u0012".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[9] = (new String(var10004)).intern();
+      var10003 = "￡ﾚ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[10] = (new String(var10004)).intern();
+      var10003 = "\ufff0\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[11] = (new String(var10004)).intern();
+      var10003 = "ﾯ>".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[12] = (new String(var10004)).intern();
+      var10003 = "\u00052+\u0019\u0000Jrp\u001a]^k6\u0010CJa8\u0015DXbyFY\u0018bx\u001a\u0007O0v\u0005CD0y\u0014[Np1\u0004XKm8\u0012\u0007Ri2\u0018\u0000Rax\u001bH\u0010`#\u0003\u0006Pp6\u001e\u0001Aa%DYG0#\u0001KJmy\u0002WX6p\u0018E\u0010`5\u001c\u0002C}r\u001b\u0002".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[13] = (new String(var10004)).intern();
+      var10003 = "\u0005dv\u0000GGl(\u001aE\u00192-\u0014U\u0011t8\u0013\b\u0019c-\u001e]Eq$\u000fV\u001av/CX\u001ev'\u001e\\Q}3\u0012ZCmv\u0002X\u0019b6\u0018RFc)\u0007\u0007\u001c`7\u0003XKiy\u0006BYo0\u0016\u0004@c4\u0010\u0001BhrE\u0004[i\"\u0012C[au\u0000SPsw\u001aW".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[14] = (new String(var10004)).intern();
+      var10003 = "\uffc1\ufff4".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[15] = (new String(var10004)).intern();
+      var10003 = "It#\u001c\tOa1\u001b[Km4\u0001\u0004Eq6\u0003@\u001bi.\u0005C_n;\u0015[Dfr\u0001\u0005Ri*\u0013\u0004B0*\u0002]Js,\u000fFP25A_D>;\u0012SDju\u0010^\u0011e7GY_k-\u0001Z\u001d>9\rI^?4\u0004DK}4\u001e_Z6#\u0012EX0u\u000e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[16] = (new String(var10004)).intern();
+      var10003 = "\u00051+OT_d$\u0016F\u0019n*\u0006\u0005\u001ae(\u000f_J~wG\u0000\u001ee1@R]>u\u0019\u0004RpwNUJ2t\u0007\u0001Ol,\u0004RAp4\u0006GZ79\u0011F\u0011n7\u0001\u0005^cvB\u0007Ou$\u0002EQ}q\u0007ZOw&\u0007ICo3\u0014[\u001ft,EB\u001bnx\u0002S".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[17] = (new String(var10004)).intern();
+      var10003 = "ￃﾾ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[18] = (new String(var10004)).intern();
+      var10003 = "Ah,\r\u0006Qq+\u0018]Gn9\u001eG\u00111p\u0004XBr0O\u0001Fj+CK\\rsCU\u001f4p\u001cSD7r\u0005KL2vDYYi/\u0012\u0002B0s\u0005VYuv\u0000VZ2%\u0007TI3'\u0006V\u001b31\u001aW\u00183+\u0011W\u0011v;\u0002\u0000Jc-\u0015\u0007\u001dn3B".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[19] = (new String(var10004)).intern();
+      var10003 = "�\u001e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[20] = (new String(var10004)).intern();
+      var10003 = "\u0005mq\u0014SOt-\u001a\u0003[~p\u001dPD}*\u001e\u0001Fl'\u001aA\u001b58\u0006KOrv\u000fUF\u007f'\u0010_Mj,\u001d\t\u001bs-\u0006\u0004\u001ej3\u0005E_v2\u0002\b\u0011\u007f \u0010@Etw\u0007\\Oet\u001c\u0003\u001dl \u0002CA30\u001a\u0002\\u(EUEn C\u0004\u001f?;O\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[21] = (new String(var10004)).intern();
+      var10003 = "C2/\u0013\u0007Dq1\u0019WY09FWYo7NE\\b3\u001dEXlx\u0003W\u001frw\u001a\u0005Yn/\u0015ZJm.@\u0007\u001fr4E\t\u001e4(\u0013\t\u0010k2\u001fVM0%\u0005PF0(@F\u001f12\u001bPKp9\u001eHYu\"O\u0002\u001c~;@\u0006Rk AW]uy\u0006".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[22] = (new String(var10004)).intern();
+      var10003 = "Jￚ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[23] = (new String(var10004)).intern();
+      var10003 = "\u001eq%\u001b\u0004F06N\u0005\\?5FT_n3\u0007\u0003@a%NZ\u001d\u007f1\u0002\u0007IlxN\u0000@>pBILj+\u0018GGu;@R^pp\u0000SC2*\u0004\u0003\\3#\u0007WAa9\r\u0007\u0018m/\u0006\u0000A?+DF\u001bn)\u000fW[74\u001bR\u0011qt\u0015W]\u007fx\u001e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[24] = (new String(var10004)).intern();
+      var10003 = "ﾫﾾ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[25] = (new String(var10004)).intern();
+      var10003 = "\u00050%\u001aU\u001f`+EDFm\"\u001cDXc,\u001aTN\u007f#\u0004\u0001A~ \u0014YAq9\u001dC\u00105r\u0015SNb-E\t]`)\u0002@^>;\u0006XZkr\u0005\\^0\"E^_6)\u0013\u0004X>$\u0001@Eu/\u0003A_r$DIJ\u007f+\u0003\u0001AhrE\u0000E5w\u0014T".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[26] = (new String(var10004)).intern();
+      var10003 = "\u000533O\bBa%O[\u0011q'\u0015Z@r(D\t\u001b61\u0013PA?*\u0014_\\d5\u0015HAqu\rFE\u007f4\u001cS^24\u0007\u0003\u00112q\u0014@\u0011l(\u001b\u0007\u001cs5\u0001\bI?$BINs\"\u0010SXv+NZ]d/\u0019EFr$\u000eEKws\u001bB\u001c4 \u0014A".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[27] = (new String(var10004)).intern();
+      var10003 = "No*\u0006GG4q\u001b\t\u00116t\u0019RD}p\u0019FO>'GFQ4/\u001bCP`)\u0002[Dk7B\u0003I1uCZD>9\u0003K\u0019i%G@O`.\u001cY\u0011n-\u0004V\u001dpu\u0018WY?+\u0005GG~7\u0002A]c*OFCm,\u0012\u0006\u001c7y\u0006\u0003N40\u0005".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[28] = (new String(var10004)).intern();
+      var10003 = "\u001abp\u0019X\u0018a$OT\u001bq)\u0006\u0001Art\u0001FX6 \u0001BX~p\u0014PDd;\u0001XPp5C@Bfy\u000fW\u0018m)\u0000\u0002E`-\u0018WNmx\u0014\\Gu+\u0002S\u001a`&\u0014\u0005\u001bbw\u0010\u0004\u0010a*\u001f\tN5#@ILe(\u0014BOt.\u0018IRi(\u001f".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[29] = (new String(var10004)).intern();
+      var10003 = "\u0005?uCSPk&\u0003V\u001fbr\u0019R[nt\u0010CYv%AIMtw\u0005H\u00101)\u0012\u0005\u0019tq\u0000YEp$\u0004\b\u0019jx\u0012I\u001aos\u0010\u0006\u001e3x\u0012PDq'FZCt2\u0019CZi&DX_? \u0014S[p9@\tDaw\u0003AIa-\u001eYFqu\u0010".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[30] = (new String(var10004)).intern();
+      var10003 = "\u0005j4N@Ct*GI\u0010c-\u0014UCat\u001eI_5;\u0016^\u001ee2OS\u001eq \u0002XB3,\u0019T\u001cwt\u0002]B7s\u0015\tM?%\u0014[A0.\u0005\u0003Aq%\u001eXQ22@CPa1\u0010\t\u001cl'\u001d\bNu(\u0014SOh7G\u0003X0/\u0003FMh7\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[31] = (new String(var10004)).intern();
+      var10003 = "\u0005`7\u0018ZYo A\u0005X2'\u0007^_s8GR\\>(D@]tr@\u0007@>0\u0018DK2+\u000fBC5q\u0007\u0007\u001epq\u001c\\P30\u0006IEp#\u0001G\u00112-\r\u0001\u001ajw\u001dIL1wNIE~3BXZ?#O@Os0EA\u001em(\u000f\u0005\u00105tN\u0004".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[32] = (new String(var10004)).intern();
+      var10003 = "ﾖx".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[33] = (new String(var10004)).intern();
+      var10003 = "5ﾸ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[34] = (new String(var10004)).intern();
+      var10003 = "K3sDG\u001av(\u0015\\Mi*\u0014\u0000\\0,\u001dF^s(E\u0005Qp.DK\u001d}5\u000e\u0007Rey\u0006KGe%\u001cHM03CARr(\u0012S@f/\u000fK\u001106@\u0003_i%\u000e\\Rt6\u0004U\u001ab,\u0019\\Xi$@\t\u00115-\u0016\t]31N]\u001d\u007f9\r".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[35] = (new String(var10004)).intern();
+      var10003 = "\u0005?t\u0014\u0004\u001fl+\u000f@Gk*\u0005EKa0\u0013T\u001dr*G\bXes\u001e\u0000P}-C^@u6\u001cH\u00116&NG\u0019v+AV\u001c}6\u000f[Cq\"\u001f\t\\68\u0013\t^\u007f%\u0015\u0006Ge'\u0015RErp\u0005ZZ7+\u001cFJm%\u001d\u0003Q67ADIaxO^".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[36] = (new String(var10004)).intern();
+      var10003 = "\u001a06\u001cFE0.F[Zq%GHCtq\u0007\u0002\u0011~+\u0006TDf*\u0010\u0001C>#B\u0000^ps\u000fKMc.\u0011DO2r\u0019A_ap\u0011AMw0G\u0000Am5A@A>1\u0016@Ot,\u0002]Lu8\u000e\u0000Rv-\u0019P\u0019h4\u000e^\\4'BVZ\u007fu\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[37] = (new String(var10004)).intern();
+      var10003 = "k￣".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[38] = (new String(var10004)).intern();
+      var10003 = "\uffc1ﾡ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[39] = (new String(var10004)).intern();
+      var10003 = "[79\u0019R\u001fd;E\u0004F\u007f @YX06\rWC0x\u001bW_t\"\u0005X\u0011o8\u001fFX6uA\u0004]v\"\u001e\u0004Me3\u001eAM~/DDB41\u0004\u0005@c0EXXh.\u0012B]uw\u0002AA44\u000e_\u0018e(\u0003EF3p\u0006BB41\u0015K\u001048".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[40] = (new String(var10004)).intern();
+      var10003 = "\u0005>p\u001fPA7+\u001fK\u001c0*\u0010\u0000\u0011k \u0014H\\cxNWNs*\u0000C\u001c6.@]]m,OBZv0\u0007\u0002Fsu\u001fWF3rOXE?x\u000e\u0005Pj,F\\C0p\u0002[O42\u001a\u0001Qm0BU\u001f`8\u0018\\E}1E\u0000\u0010lv\r\t\u00100;\u0015\u0004".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[41] = (new String(var10004)).intern();
+      var10003 = "\u0005o3\u0018FA37\u0012AM6w\u001cXCk+\u0013\u0000^my\u0015UOnw\u0003SYj1\u0010AZ5'\u0014X\u001ap5\u001dFEmr\u0003]@qvF\u0002Z~xOXR72E\u0001\\v/AH\u001bv$CC@v+\u0015BB08\u0007\u0004Qi;\u0013W\u001ddw\u0000S\u0010j;\u0000B".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[42] = (new String(var10004)).intern();
+      var10003 = "\u0005>pB\u0004Q1w\u0019WI?\"\u0012\u0005On+\u0007IJf)\u0013FYe,\u0014\u0003Ad%\u0013KL2'\u001f@C0#\u0012\u0000[sy\u0018W[t'\u0012ZR0r\u0011A\u0018ew\u0011AGp)\u001aTL}vC__up\u001f\u0001M>\"A\u0004P},GKBu3D\t\u001928\u0011\u0005".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[43] = (new String(var10004)).intern();
+      var10003 = "Mep\u0005BNh)FT\u0018d6NIKa4\u0003W\u001d`(\u0004[Pb7\u001dWLd*\u0004FKo.\u001aZOh1\u0013[Zt*FK_m;\u001e\u0000\u001fe6\u0003\u0000C\u007f&\u000eUG2p\u0016UR3vO\u0006Dd3\u0005[Yl$DC^~t\u0003\bQb2\u000fCD?5\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[44] = (new String(var10004)).intern();
+      var10003 = "\u001c2,\u0003@EqqOP\u0010mt\u0003WQ}8\u0014\u0001L4*\u0004AK50\u0012XI}w\u0015\t@0)FH^q\"\u0018V\u0019r#N\u0003R7q\u000fV]ft\u0004H\u001d?$\u0014\\J~/\u0005\u0002G0v\u0006RIw'\u001d_\u001c7.\u001e\u0003Y>9\u001aTYh7\rC_m8\u001d".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[45] = (new String(var10004)).intern();
+      var10003 = "\u000506DG\u001dk\"\u000f\u0000Fl \u0011[\u001d>$N^@ht\u0000]Gv\"\u0006[Ev;\u0013HMr\"\u0003\bA71\u0012_Ci*\u001fE\u001e}.\u001dVC6r\u0007K\u0011?\"G\u0007I?tA_\u001awq\u0013RRtu\u0001\u0002D02DFL>3\u0015F\u001d3t\u0014P\u001fh9\u001f\\".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[46] = (new String(var10004)).intern();
+      var10003 = "Je8\u0000^\u0018fp\u0000[F5uAT\u001auqN^Il3OKDm6\u001bEZu+\u001e\tB7v\u0010\bEuw\u0010\u0006\u001cmw\u000e\u0006Kru\u001c\u0001N\u007f(@W\\6.\u0011G\u0018hv\u001aCJw(\u000eT@f'\u0007WOu4C\u0003Njq\u001d\t\\h;\u0004W\u001da\"A".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[47] = (new String(var10004)).intern();
+      var10003 = "?\uffc8".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[48] = (new String(var10004)).intern();
+      var10003 = "L￡".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[49] = (new String(var10004)).intern();
+      var10003 = "Id)GI\u001b5&\u0006TY1y\u000fPDh7\u001a@R29\u0016[Ae*\u000fWL7t\u0013T\u001fp6E\u0005\u0019ayG\u0006\u001abq\u0001]Kv.\u001fTF5/\u0003\u0001Rb4\u0011FDv\"ES^}q\u0016TOr2\u0019\u0006\\v(\u0002F]}(\u001aFQ>+\u001dXPl)\u0004".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[50] = (new String(var10004)).intern();
+      var10003 = "mc".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[51] = (new String(var10004)).intern();
+      var10003 = "ￂ￥".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[52] = (new String(var10004)).intern();
+      var10003 = "\u0005o9\u0005\u0000_h4\u0016RK1y\u000e@_\u007f0\u0006\u0007\u0019n+OHN~*A\u0004Ap/\u001cUZ\u007f.EICc4\u0019IXa2\u0000WL};\u0019BCa0\u0001\u0006\u001a\u007fp\u0010A\\?v\u0001\u0001Frw\u0010I\u001fmuF\u0004\u001d`%\u0007G^j)\u0003\u0001E\u007f+\u0002EBi5N\u0006".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[53] = (new String(var10004)).intern();
+      var10003 = "@68\u001cE_3(D\u0001\u0010k%\u0002\u0001\u001erq\u000eVA~0EHKw0\u0018@Af9\u000eFPep\u0007_\u0010h0\u0005\\Inr\u0014\u0007^b0\u0013\\\u001c54\u0006\u0005\u001e~%\u001eU@nx\u000e[\u001de'\u0013@]w#D\u0005\u0010jx\u001fK\u001bi;\u0007AR24\u0011\u0006OvtD".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[54] = (new String(var10004)).intern();
+      var10003 = "9-".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[55] = (new String(var10004)).intern();
+      var10003 = "N77\u0014\u0003Na#E\u0006FmuA\\\u0011?v\u0004DYu\"\u0011KK>+\u000e\u0007\\iv\u0015K\u001fsp\u0007[E07\u0019POu.\u0003EBvvF[\u00113w\u0005\\Lr#DTC\u007f1\u0007\u0005Qv/\u0014\u0002Kr%\u0014P\u0019pv\u0002FG60DS\u001d`1E\u0003\u001a7q@".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[56] = (new String(var10004)).intern();
+      var10003 = "\u0017\uffdf".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[57] = (new String(var10004)).intern();
+      var10003 = "|ﾇ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[58] = (new String(var10004)).intern();
+      var10003 = "\b\u0002".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[59] = (new String(var10004)).intern();
+      var10003 = "ￍﾭ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[60] = (new String(var10004)).intern();
+      var10003 = "A3%\u0001^\u001eo9\u001aX^k0CDIt7\u0006^C6p\u0012KQks\u000e_]r(D]Ko#\u0014G_a8\u0016CO7.AV]57\u0015\b\u0018?;\u000e_\u00184rEI\u001bh5\u0005IL02\u001aSMs(FYAkt\u0010PMo&EB\u001921\u0000^C?(E".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[61] = (new String(var10004)).intern();
+      var10003 = "\u0005et\u001d\t\u001a}%E\u0005\u001eoq\rE\u001fwp\u0006_I3)\u0010\u0001N`1\u0007U_4w\u0004X\u001b72\u0007PA~v\u0006EDwv\u001fR@>7\u001dXLv$\u0003C\u0019dx\u0012\u0007\u001dw-\u0015\\@1#\u0002EQj2GWM\u007f9\u0006E@k7\u0005\u0004]l4\u0019K\u001ctw\r\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[62] = (new String(var10004)).intern();
+      var10003 = "Lrx\u0010W]o \u0000@P~6\u0011\u0000[j3\u001cCZ\u007f%\u0007FZt \u001b\u0005\\>(A\t\\~tNH\u001ft/\u0015REp6\u0002FMq9FIDu*\u0015P\u001cl#@[O?5\u0003\u0004\\e(\u001dR\u001dl8\u0005UJs7\u0018FFe;\u001cDD?8\u0006\u0007Cl%\u001f".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[63] = (new String(var10004)).intern();
+      var10003 = "\u0011k6GA[30\r_B>y\u001aEDtu\u001aCK73\u001fTEj/\u0001]Fs4\u001b^G~(CD\u001cv*BD\u001ab1\u001bB\u0019dx\u0010\bE3rCXLw;\u0013H_k%\u0000H\u0011p;\u0015\u0005Jf(\u0019IK6q\u001bS\u001bktFW^e\"\u0007EXh&\u001f".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[64] = (new String(var10004)).intern();
+      var10003 = "￡￫".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[65] = (new String(var10004)).intern();
+      var10003 = "\u0014\t".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[66] = (new String(var10004)).intern();
+      var10003 = "],".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[67] = (new String(var10004)).intern();
+      var10003 = "L09\u0004PE76DEF\u007fr\u0019^\u001a3+\u001f\u0000\u001bm+\u000fYOr(E\bMay\u000eZ_qs\u001dSK3;A\\Ptt\u0001RZi-N^Zt\"D[Kr6\u0002\u0003\u001bm6G[^a#\u000eSF\u007f#\u0012VN}2DSM32\rC]1;\u0007H\u001dhu\u000e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[68] = (new String(var10004)).intern();
+      var10003 = "ﾈﾯ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[69] = (new String(var10004)).intern();
+      var10003 = "ﾧ(".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[70] = (new String(var10004)).intern();
+      var10003 = "ﾺ3".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[71] = (new String(var10004)).intern();
+      var10003 = "Ii&\u0018\u0001Ywp\u0004CYdv\u0006\u0004^n1\u000eU\u001ajw\u0000[\\tuNS\u001app\r\u0003^l4@]G1vBGLs8\u0014DN7u\u001e_\u0018tp\u0000\\Oq-GS\u0019n.\u000f\u0006Xk\"\u0011Z\u0018>w\u001a[\u0010hr@IE~5\u0001\u0007\u001brw\u001eBD75\u0011".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[72] = (new String(var10004)).intern();
+      var10003 = "ￏￅ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[73] = (new String(var10004)).intern();
+      var10003 = "I75OZMr.\u000eB^f-\u0015\u0004]m'\u0015\u0001Ei0\u0018_E01EKQw-\u0002\tG`1\u0007\u0001\u001ah/\u0007^NauB_\u0018d#FXBhv\u0011CEsu\u001aSE18@AF0#C\u0002@70\u0007[Al&\u001cT\u001fwv\u0010Z_os\u0018ZC}yE".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[74] = (new String(var10004)).intern();
+      var10003 = "\u0005b/N\b\u0018q.\u001d\u0002\u0019e.C\\]r$OBP>2A\b\u001de#\u001fT\u001b59\u0002G\\2p\u001d\bN`/\u0016\u0000Pp8\u0018PBo0\u000e\u0006Xa'\rE^d2\u0013R\u001cr&CC\u001ckv\u0004IAd6\u001dCAl-\u0015VNs8\u001a\u0007P`(\u0015\u0000Nj&\u001b^".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[75] = (new String(var10004)).intern();
+      var10003 = "Lk8\u0001@\u001eby\r^Ao,\u000fV\u001ewq\u0015EJ3&@\u0003Yq\"FP\u0010t\"\u0018F^0qAVO~+\u0000VY`s\u000fI\u001ei3OKMrs\u0006^Lj5\u0002\\\\f\"\u000e\u0000Kc0\u0004\u0001McxOKM?p\u000e@^w&\u0002Y\u001bdyGGDcq\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[76] = (new String(var10004)).intern();
+      var10003 = "$\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[77] = (new String(var10004)).intern();
+      var10003 = "\u00054,\u001cD\u0018m,\u001dX\u0018dy\u0010[P7.\u0012P[n8\u000f@Gj4\u0019\u0002\\o0\u0005]Y49\u0016\t\u0018o&\u001dR\u0019q(\u0011K\u001er7GX\u001bd/\u001bT\u00185x\u0010PKl.F[D6/\u0011\u0003O>)\u001e\u0006\u0011cyNZPc,\u000e^\u001fj*G_Xd \u0011G".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[78] = (new String(var10004)).intern();
+      var10003 = "\u0019j;\u000e\u0006\u001cq2\u001e\u0004Q?q\u0000A\u001eu FU\u001csw\u0007R\u001ff4\u0014\u0004\u0011r$\u000eW\u0010a)\u0018C[\u007fxG^B0%ED]59OSRkrA\u0001Jh0\u0012Z\u0010u;\u0019A\u001cqs\u0000\\\u001f50\u0014\u0005\\v/\u0000\u0007\u001ampC\u0002Is&\u0013\u0005X>5\u0016".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[79] = (new String(var10004)).intern();
+      var10003 = "\u000511\u0019]\u0019l)@X^ku\u000eAQv(\u0003]Ylp\u001fSN?\"C\t_b#DII`s\u0014DMdp\u0012R\u001bh*\u001b\u0000G>\"\u0018KGr-\u001a_Gnv\u0014W\u001af*\u001e\u0000\\j/\u0002V^04\u0005IO~.@D\u0010`.CH\u00182/\u0005XL53\r\t".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[80] = (new String(var10004)).intern();
+      var10003 = "~x".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[81] = (new String(var10004)).intern();
+      var10003 = "\u001c1'\u0019YQj/\u0002A\u001b2 D\u0000Q`6\u000fP\u001bf/\r\u0004Cf3CZ^2.OVN5vAPMt \u001fX\u001e},\u0015\u0003\u001en4\u001e\u0004El1\u0014B\u0010r(\u0005FLsqCKAr.@\tNl1\u0013XDsx\u0010Z\\71@\tL0wFRY3v\u0002".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[82] = (new String(var10004)).intern();
+      var10003 = "\u00053*\u0012\u0004Rn+\u0018IM\u007f*\u0003\u0001Lsu\u0004T\u001fnp\u001b\u0006N} \u0016HPw4C\bAaw\u0018\u0003Asp\u0010\u0006\u0010}r\u001f_C24\u000fAN3qD\u0000Nms\u0006\u0001Rv\"@@Z4(\u001d\u0002\u00185;\u0003\u0000X7.A\u0005L63\u001a[Ke%\u0010Y\u001dd.GG".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[83] = (new String(var10004)).intern();
+      var10003 = "\u0005n6\u000fR\u00196q\u0007^]a \u0000_K4q\u0015[Ybu\u0015V\u0019s\"\u0010WM67\u0005KPf0\u001dVKuu\u001cZI\u007f7EB\u001a7+\u001bK^50OPGa+\u0003SPd$GWJm%\u0019VJdv\u0019\u0003@0r\u001c@\u00184vD^\u0011k3\u0012[@6#\u0015\u0006".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[84] = (new String(var10004)).intern();
+      var10003 = "ￎ,".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[85] = (new String(var10004)).intern();
+      var10003 = "\u00055-\u001bDMp6\u0011B\u001c4)B_@k0\u0002\u0000\u001f`pDD\u001am \u0015\u0002Qjp\u0015XDe-\u001dP\u001ch2\u0005\u0006M18\u0004][u&\u0001I\u001bf*\u0000BBe6\u000e^Zo\"\u001bH^7\"\u0004]La5A[Ks)\u0016_J0r\u0018@\u0019?3\u000eW@`5\u0015[".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[86] = (new String(var10004)).intern();
+      var10003 = " ﾡ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[87] = (new String(var10004)).intern();
+      var10003 = "\u0005a'\u0013]Ed(\u0006VBv/\u0011GL61\u0001K]s5D\b\u001ba8\u000f\\D1s\u0007WDr(BC\u001er'\u0012YOp(\u0011GA1x\u0015\u0001[1.G\\Dj&\rBNk*\u0007YJb/\u0006]Ir.\u0013@Jq0\u0015\u0007\u001avp\u001bD^56G@_3)\u0005\t".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[88] = (new String(var10004)).intern();
+      var10003 = "\u0005d(\u0002B\u001ft3AI\\k0\u0019PO?.\u0019PRb.\u0003TIep\u001b\\GvrGCMwt\u0016XAty\u0006\u0003\u0011}s\u0006[Ao-\u001f\b\u001ahx\u0006WLl2\u0000@_w&\u000f\u0004Mu$\u001f^E>/\u0007Y\u0018v9\u0003R]f,\u0004\u0003@u)\u0013\bOm'DB".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[89] = (new String(var10004)).intern();
+      var10003 = "ﾘﾒ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[90] = (new String(var10004)).intern();
+      var10003 = "@`#\u0018\u0004Qa6\u0018\\Btq\u001a\u0001\u0010a3\u0013I\u001b1&E\bAqy\u0000]\u0010h7\u0005WG07\u000f\u0005Yj,\u000eX\u001c4-\u0012H\u001da5\u0001AI74@R@~\"\u0013TO>,\u0000R\u001cc-\u001bIK5#\u001e\u0006\u001ctq\u0006YD6&O\\_\u007f)\u0004\\Aa7\u001d".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[91] = (new String(var10004)).intern();
+      var10003 = "\u0005dr\u0004\u0006\u001cjw\u001fS\u00113/\u0007G\u001834\u001eIE53\u0018P[>;\u0016\u0003Qe9\u001a\u0007Idy\u001eYA?/E\u0006Ci,A^Cur\u000e@\u0010w9\u0019WI44\rH\u001afqG\u0007]wwO\u0003Gq0\u0011SYs%\u0019\u0005^60\u001c]_0s\u001cD\u001d2y\u0011D".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[92] = (new String(var10004)).intern();
+      var10003 = "\u0005rx\u0001\t\\}1CP@w;\u001bED4\"\u0013_Z}y\u001b\u0003^6;\u0007B\u001e2%\u0001SA\u007fx\u001e\u0003\u001b`q\u001cU]l&\u001aYGvpDD]l6\u0004\u0006A}0BEAop\u0004GJ~9\u0019_Dn9\u001aPP56\u0018C\\aw\u0014KKv;\u0012G\u001edr\u0003".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[93] = (new String(var10004)).intern();
+      var10003 = "\u00052(CV\u001cmr\u001c\u0001Rt7\u001cKE0(\u0015[Qk5\u0001BIb7A\u0002Dwv\u001fS\u00106r\r]Bc0\u0001UR58EDQ3x\u000ePD> A[Ks/OFJt2B^Ol E\u0006F5y\u0019\u0005@kvEKC60\rI\u0010lu\u001fDI71O\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[94] = (new String(var10004)).intern();
+      var10003 = "M?\"\u0018\b\u001f4'\u0013PZn4\u0012]\u001dm'\u0011@\u0011e'O\u0001Oc.\u001a\u0000M>.G\u0000\\3y\u0013IPc3\u001d\u0007Me4@\tBd+\u0002H\u0018f&D\u0006A4x\u0018T\u001df4B\u0006B7u\u0019^\u0019\u007f3\r\tN?/\u001d\u0000_l\"\u0014T\u001ft'\u0000V\u0019p%\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[95] = (new String(var10004)).intern();
+      var10003 = "\u0005`8\u0001]Iw7\u001c\u0001\u001ed'\u001e]M4$\u0005WR>$\u0018BMq5\u0018\u0002Ft2\u000fW^k&\u0000RZ?;NWK1;E^\u0018cx\u0013HYw9\u000eVC}+\u0010[Dd8\u001eWD\u007f#\u001fAI?yB\u0000O\u007f.FG\u001a3&\u000eSI>#\u000eBYt2\u0015_".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[96] = (new String(var10004)).intern();
+      var10003 = "\u00056x\u0010\\\u001cl*\u001cC\u0019q8\u0007W[m.GE[\u007f&\u0012\u0005G}$\u001fTN}q\u001dYFf \u0011]\u001f20\u0010CAbw\u001d\u0001@1p\u0007\b\u001fi0BFCe)\u0015\u0005\u0010dq\u0019KX6t\u001f\u0005Po-A[L1t\u000fCZnv\u001d\u0003O`tC\bJ7&\u001c\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[97] = (new String(var10004)).intern();
+      var10003 = "\ufffb\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[98] = (new String(var10004)).intern();
+      var10003 = "\u0005cp\rURr)\u001cKG1w\u0015WRo8GWZu)\u001eR@j2\u0007AM}-BKOm4\u0003\u0001Zj-\u0015E\u001cft\u000e\u0006Ghy\u000eI_7.\u001aC^\u007f\"\u001e]_?5B^Ot3\u0013FKh3\u0018ZKp \u0003P\\3;AR\u001fm'\u0002TJ0'\u0007\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[99] = (new String(var10004)).intern();
+      var10003 = "ￚￊ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[100] = (new String(var10004)).intern();
+      var10003 = "\\￪".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[101] = (new String(var10004)).intern();
+      var10003 = "\u0005e6\u001a^B\u007f3\u0011\u0001\u001at%\u0014EZbu\u001c\u0000\u0010cy\u0016RQdw\u001c\u0007Q1/\u001b\u0005P02\rANc-\u0011^Jnq\u0004X^1t\u0010KAn$B\u0000\u001db+\u0012CR}1BPK42\u0011\u0002\u0018h7\u0002\u0003@o.ABQwr\u0006ZC7&\u0002Z\u001f\u007f2\u0004V".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[102] = (new String(var10004)).intern();
+      var10003 = "\u0019m&\u0001\u0006\u001bd0CZEs+\u0010\u0007P7*\u0005\u0004^atD]D1v\u0003\\^3p\u0010\u0004Ma9\u0011AAo;\u0019S\u001bo)\u0012I\\i7\u000eIYw1\u0016AEr*\u0001\tOv&GAJk.AAXcq\u000fT\u001fe(\u0018\u0006Xj9\u001eIK`4\u0001AOf&\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[103] = (new String(var10004)).intern();
+      var10003 = "ﾧ\"".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[104] = (new String(var10004)).intern();
+      var10003 = "K`7\rEDo%\u000f^D`;\u0000\u0006]ku\u0005YJk#GB\u001cf/\u0015COe+EKMr.BY_~4\u0011\u0001\\m.\u001e\u0001K\u007f'\u0018S\u001b~7\u0012KIit\u0011G\\br\u0015_B6*\u001aDKj+\u001eG_w1\u0012\u0005\u001ao-\u0016FE\u007f\"\u0004[Ir,\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[105] = (new String(var10004)).intern();
+      i = var10000;
+      char[] var6 = "{O\u0000Z\u0004\u00195".toCharArray();
+      int var10002 = var6.length;
+      char[] var10001 = var6;
+      int var7 = var10002;
+
+      char var15;
+      byte var16;
+      for(var2 = 0; var7 > var2; ++var2) {
+         var15 = var10001[var2];
+         switch(var2 % 5) {
+         case 0:
+            var16 = 40;
+            break;
+         case 1:
+            var16 = 7;
+            break;
+         case 2:
+            var16 = 65;
+            break;
+         case 3:
+            var16 = 119;
+            break;
+         default:
+            var16 = 49;
+         }
+
+         var10001[var2] = (char)(var15 ^ var16);
+      }
+
+      a = (new String(var10001)).intern();
+      var6 = "}S\u0007Z\t".toCharArray();
+      var10002 = var6.length;
+      var10001 = var6;
+      var7 = var10002;
+
+      for(var2 = 0; var7 > var2; ++var2) {
+         var15 = var10001[var2];
+         switch(var2 % 5) {
+         case 0:
+            var16 = 40;
+            break;
+         case 1:
+            var16 = 7;
+            break;
+         case 2:
+            var16 = 65;
+            break;
+         case 3:
+            var16 = 119;
+            break;
+         default:
+            var16 = 49;
+         }
+
+         var10001[var2] = (char)(var15 ^ var16);
+      }
+
+      j = (new String(var10001)).intern();
+      f = "\b";
+
+      label2227: {
+         String var10;
+         boolean var11;
+         try {
+            var10 = "Bf7\u0016\u001f[b\"\u0002CAs8Y|Mt2\u0016VMC(\u0010T[s";
+         } catch (Exception var5) {
+            var11 = false;
+            break label2227;
+         }
+
+         var6 = var10.toCharArray();
+         var10002 = var6.length;
+         var10001 = var6;
+         var7 = var10002;
+
+         for(var2 = 0; var7 > var2; ++var2) {
+            var15 = var10001[var2];
+            switch(var2 % 5) {
+            case 0:
+               var16 = 40;
+               break;
+            case 1:
+               var16 = 7;
+               break;
+            case 2:
+               var16 = 65;
+               break;
+            case 3:
+               var16 = 119;
+               break;
+            default:
+               var16 = 49;
+            }
+
+            var10001[var2] = (char)(var15 ^ var16);
+         }
+
+         var10 = (new String(var10001)).intern();
+
+         try {
+            Class.forName(var10);
+            var10 = "Bf7\u0016\u001fEf5\u001f\u001fjn&>_\\b&\u0012C";
+         } catch (Exception var4) {
+            var11 = false;
+            break label2227;
+         }
+
+         var6 = var10.toCharArray();
+         var10002 = var6.length;
+         var10001 = var6;
+         var7 = var10002;
+
+         for(var2 = 0; var7 > var2; ++var2) {
+            var15 = var10001[var2];
+            switch(var2 % 5) {
+            case 0:
+               var16 = 40;
+               break;
+            case 1:
+               var16 = 7;
+               break;
+            case 2:
+               var16 = 65;
+               break;
+            case 3:
+               var16 = 119;
+               break;
+            default:
+               var16 = 49;
+            }
+
+            var10001[var2] = (char)(var15 ^ var16);
+         }
+
+         var10 = (new String(var10001)).intern();
+
+         try {
+            Class.forName(var10);
+            "".getBytes(j);
+            b = MessageDigest.getInstance(a);
+            c = new Hashtable();
+            d = new Hashtable();
+            d.put(Byte.TYPE, "B");
+            d.put(Boolean.TYPE, "Z");
+            d.put(Short.TYPE, "S");
+            d.put(Character.TYPE, "C");
+            d.put(Integer.TYPE, "I");
+            d.put(Long.TYPE, "J");
+            d.put(Float.TYPE, "F");
+            d.put(Double.TYPE, "D");
+            g = new Hashtable();
+            h = new Hashtable();
+            a(c, b);
+            b(c, b);
+            c(c, b);
+            d(c, b);
+            e(c, b);
+            f(c, b);
+            g(c, b);
+            h(c, b);
+            i(c, b);
+            j(c, b);
+            return;
+         } catch (Exception var3) {
+            var11 = false;
+         }
+      }
+
    }
 }
diff --git a/testData/obfuscated/h.java b/testData/obfuscated/h.java
index 6bfb23d..aa4d38d 100644
--- a/testData/obfuscated/h.java
+++ b/testData/obfuscated/h.java
@@ -22,8 +22,8 @@ public class h {
             throw var8;
          }
 
-         AtomicLong var3 = this.a;
-         synchronized(this.a) {
+         AtomicLong var3;
+         synchronized(var3 = this.a) {
             AtomicLong var9 = this.a;
             if (!var5) {
                try {
diff --git a/testData/obfuscated/v.java b/testData/obfuscated/v.java
index 8705a52..d0831c5 100644
--- a/testData/obfuscated/v.java
+++ b/testData/obfuscated/v.java
@@ -1,4 +1,5 @@
 import java.lang.reflect.Field;
+import java.util.List;
 import java.util.logging.Level;
 
 public class v {
@@ -20,8 +21,51 @@ public class v {
       // $FF: Couldn't be decompiled
    }
 
-   private static void a(Field param0, Object param1) {
-      // $FF: Couldn't be decompiled
+   private static void a(Field var0, Object var1) {
+      int var3 = y.d;
+
+      Throwable var10000;
+      boolean var10001;
+      label43: {
+         try {
+            if (var3 != 0) {
+               return;
+            }
+
+            if (!List.class.isAssignableFrom(var0.getType())) {
+               break label43;
+            }
+         } catch (Throwable var7) {
+            throw var7;
+         }
+
+         Throwable var2;
+         try {
+            var0.set(var1, t.b(((x)var0.getAnnotation(x.class)).a()));
+            return;
+         } catch (Throwable var5) {
+            var2 = var5;
+         }
+
+         try {
+            t.a.log(Level.WARNING, var1.getClass() + "." + var0.getName() + a[1] + var2.getMessage(), var2);
+            if (var3 == 0) {
+               return;
+            }
+         } catch (Throwable var6) {
+            var10000 = var6;
+            var10001 = false;
+            throw var10000;
+         }
+      }
+
+      try {
+         t.a.warning(var1.getClass() + "." + var0.getName() + a[2]);
+      } catch (Throwable var4) {
+         var10000 = var4;
+         var10001 = false;
+         throw var10000;
+      }
    }
 
    private static void b(Field var0, Object var1) {

From f8ed069d76ad25ee42a77e2102a88cb43010e68a Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 23 Oct 2018 21:16:49 +0200
Subject: [PATCH 227/252] Cleanup (warnings; formatting)

---
 .../main/rels/MethodProcessorRunnable.java    |  2 +-
 .../decompiler/SimplifyExprentsHelper.java    | 56 +++++++-------
 .../deobfuscator/ExceptionDeobfuscator.java   | 75 ++++++++++---------
 3 files changed, 64 insertions(+), 69 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 637260c..726d747 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -107,7 +107,7 @@ public class MethodProcessorRunnable implements Runnable {
 
     if (ExceptionDeobfuscator.hasObfuscatedExceptions(graph)) {
       DecompilerContext.getLogger().writeMessage("Heavily obfuscated exception ranges found!", IFernflowerLogger.Severity.WARN);
-      if(!ExceptionDeobfuscator.handleMultipleEntryExceptionRanges(graph)) {
+      if (!ExceptionDeobfuscator.handleMultipleEntryExceptionRanges(graph)) {
         DecompilerContext.getLogger().writeMessage("Found multiple entry exception ranges which could not be splitted", IFernflowerLogger.Severity.WARN);
       }
       ExceptionDeobfuscator.insertDummyExceptionHandlerBlocks(graph, cl.getBytecodeVersion());
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index f23fc78..72c845f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -64,18 +64,11 @@ public class SimplifyExprentsHelper {
         for (Statement st : stat.getStats()) {
           res |= simplifyStackVarsStatement(st, setReorderedIfs, ssa, cl);
 
-          // collapse composed if's
-          if (changed = IfHelper.mergeIfs(st, setReorderedIfs)) {
-            break;
-          }
+          changed = IfHelper.mergeIfs(st, setReorderedIfs) ||  // collapse composed if's
+                    buildIff(st, ssa) ||  // collapse iff ?: statement
+                    processClass14 && collapseInlinedClass14(st);  // collapse inlined .class property in version 1.4 and before
 
-          // collapse iff ?: statement
-          if (changed = buildIff(st, ssa)) {
-            break;
-          }
-
-          // collapse inlined .class property in version 1.4 and before
-          if (processClass14 && (changed = collapseInlinedClass14(st))) {
+          if (changed) {
             break;
           }
         }
@@ -459,44 +452,45 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean isIPPorIMM2(Exprent first, Exprent second) {
-
     if (first.type != Exprent.EXPRENT_ASSIGNMENT || second.type != Exprent.EXPRENT_ASSIGNMENT) {
       return false;
     }
-      
+
     AssignmentExprent af = (AssignmentExprent)first;
     AssignmentExprent as = (AssignmentExprent)second;
-    
-    if(as.getRight().type != Exprent.EXPRENT_FUNCTION) {
+
+    if (as.getRight().type != Exprent.EXPRENT_FUNCTION) {
       return false;
     }
-    
+
     FunctionExprent func = (FunctionExprent)as.getRight();
-    
-    if(func.getFuncType() != FunctionExprent.FUNCTION_ADD && func.getFuncType() != FunctionExprent.FUNCTION_SUB) {
+
+    if (func.getFuncType() != FunctionExprent.FUNCTION_ADD && func.getFuncType() != FunctionExprent.FUNCTION_SUB) {
       return false;
     }
 
     Exprent econd = func.getLstOperands().get(0);
     Exprent econst = func.getLstOperands().get(1);
 
-    if(econst.type != Exprent.EXPRENT_CONST && econd.type == Exprent.EXPRENT_CONST && func.getFuncType() == FunctionExprent.FUNCTION_ADD) {
+    if (econst.type != Exprent.EXPRENT_CONST && econd.type == Exprent.EXPRENT_CONST && func.getFuncType() == FunctionExprent.FUNCTION_ADD) {
       econd = econst;
       econst = func.getLstOperands().get(0);
     }
 
-    if(econst.type == Exprent.EXPRENT_CONST && ((ConstExprent)econst).hasValueOne()) {
-      if(af.getLeft().equals(econd) && af.getRight().equals(as.getLeft()) && (af.getLeft().getExprentUse() & Exprent.MULTIPLE_USES) != 0) {
-        int type = func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_IPP : FunctionExprent.FUNCTION_IMM;
-        
-        FunctionExprent ret = new FunctionExprent(type, af.getRight(), func.bytecode);
-        ret.setImplicitType(VarType.VARTYPE_INT);
-        
-        af.setRight(ret);
-        return true;
-      }
+    if (econst.type == Exprent.EXPRENT_CONST &&
+        ((ConstExprent)econst).hasValueOne() &&
+        af.getLeft().equals(econd) &&
+        af.getRight().equals(as.getLeft()) &&
+        (af.getLeft().getExprentUse() & Exprent.MULTIPLE_USES) != 0) {
+      int type = func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_IPP : FunctionExprent.FUNCTION_IMM;
+
+      FunctionExprent ret = new FunctionExprent(type, af.getRight(), func.bytecode);
+      ret.setImplicitType(VarType.VARTYPE_INT);
+
+      af.setRight(ret);
+      return true;
     }
-    
+
     return false;
   }
   
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index 7f7c9aa..810291d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -311,52 +311,52 @@ public class ExceptionDeobfuscator {
   }
 
   public static boolean handleMultipleEntryExceptionRanges(ControlFlowGraph graph) {
-
     GenericDominatorEngine engine = new GenericDominatorEngine(new IGraph() {
+      @Override
       public List<? extends IGraphNode> getReversePostOrderList() {
         return graph.getReversePostOrder();
       }
 
+      @Override
       public Set<? extends IGraphNode> getRoots() {
         return new HashSet<>(Collections.singletonList(graph.getFirst()));
       }
     });
 
     engine.initialize();
-    
-    boolean found = false;
-    
-    while(true) {
+
+    boolean found;
+
+    while (true) {
       found = false;
       boolean splitted = false;
-      
-      for(ExceptionRangeCFG range : graph.getExceptions()) {
+
+      for (ExceptionRangeCFG range : graph.getExceptions()) {
         Set<BasicBlock> setEntries = getRangeEntries(range);
-        
-        if(setEntries.size() > 1) { // multiple-entry protected range
+
+        if (setEntries.size() > 1) { // multiple-entry protected range
           found = true;
-          
-          if(splitExceptionRange(range, setEntries, graph, engine)) {
+
+          if (splitExceptionRange(range, setEntries, graph, engine)) {
             splitted = true;
             break;
           }
         }
       }
-      
-      if(!splitted) {
+
+      if (!splitted) {
         break;
       }
     }
-    
+
     return !found;
   }
 
   private static Set<BasicBlock> getRangeEntries(ExceptionRangeCFG range) {
-
     Set<BasicBlock> setEntries = new HashSet<>();
-    Set<BasicBlock> setRange= new HashSet<>(range.getProtectedRange());
-    
-    for(BasicBlock block : range.getProtectedRange()) {
+    Set<BasicBlock> setRange = new HashSet<>(range.getProtectedRange());
+
+    for (BasicBlock block : range.getProtectedRange()) {
       Set<BasicBlock> setPreds = new HashSet<>(block.getPreds());
       setPreds.removeAll(setRange);
 
@@ -367,19 +367,22 @@ public class ExceptionDeobfuscator {
 
     return setEntries;
   }
-  
-  private static boolean splitExceptionRange(ExceptionRangeCFG range, Set<BasicBlock> setEntries, ControlFlowGraph graph, GenericDominatorEngine engine) {
 
-    for(BasicBlock entry : setEntries) {
+  private static boolean splitExceptionRange(ExceptionRangeCFG range,
+                                             Set<BasicBlock> setEntries,
+                                             ControlFlowGraph graph,
+                                             GenericDominatorEngine engine) {
+    for (BasicBlock entry : setEntries) {
       List<BasicBlock> lstSubrangeBlocks = getReachableBlocksRestricted(entry, range, engine);
-      if(!lstSubrangeBlocks.isEmpty() && lstSubrangeBlocks.size() < range.getProtectedRange().size()) {
+      if (!lstSubrangeBlocks.isEmpty() && lstSubrangeBlocks.size() < range.getProtectedRange().size()) {
         // add new range
         ExceptionRangeCFG subRange = new ExceptionRangeCFG(lstSubrangeBlocks, range.getHandler(), range.getExceptionTypes());
         graph.getExceptions().add(subRange);
         // shrink the original range
         range.getProtectedRange().removeAll(lstSubrangeBlocks);
         return true;
-      } else {
+      }
+      else {
         // should not happen
         DecompilerContext.getLogger().writeMessage("Inconsistency found while splitting protected range", IFernflowerLogger.Severity.WARN);
       }
@@ -389,22 +392,21 @@ public class ExceptionDeobfuscator {
   }
 
   public static void insertDummyExceptionHandlerBlocks(ControlFlowGraph graph, int bytecode_version) {
-
     Map<BasicBlock, Set<ExceptionRangeCFG>> mapRanges = new HashMap<>();
     for (ExceptionRangeCFG range : graph.getExceptions()) {
       mapRanges.computeIfAbsent(range.getHandler(), k -> new HashSet<>()).add(range);
     }
-    
+
     for (Entry<BasicBlock, Set<ExceptionRangeCFG>> ent : mapRanges.entrySet()) {
       BasicBlock handler = ent.getKey();
       Set<ExceptionRangeCFG> ranges = ent.getValue();
-      
-      if(ranges.size() == 1) {
+
+      if (ranges.size() == 1) {
         continue;
       }
-      
-      for(ExceptionRangeCFG range : ranges) {
-        
+
+      for (ExceptionRangeCFG range : ranges) {
+
         // add some dummy instructions to prevent optimizing away the empty block  
         SimpleInstructionSequence seq = new SimpleInstructionSequence();
         seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
@@ -414,11 +416,11 @@ public class ExceptionDeobfuscator {
         dummyBlock.setSeq(seq);
 
         graph.getBlocks().addWithKey(dummyBlock, dummyBlock.id);
-        
+
         // only exception predecessors from this range considered
         List<BasicBlock> lstPredExceptions = new ArrayList<>(handler.getPredExceptions());
         lstPredExceptions.retainAll(range.getProtectedRange());
-        
+
         // replace predecessors
         for (BasicBlock pred : lstPredExceptions) {
           pred.replaceSuccessor(handler, dummyBlock);
@@ -428,20 +430,19 @@ public class ExceptionDeobfuscator {
         range.setHandler(dummyBlock);
         // add common exception edges
         Set<BasicBlock> commonHandlers = new HashSet<>(handler.getSuccExceptions());
-        for(BasicBlock pred : lstPredExceptions) {
+        for (BasicBlock pred : lstPredExceptions) {
           commonHandlers.retainAll(pred.getSuccExceptions());
         }
         // TODO: more sanity checks?
-        for(BasicBlock commonHandler : commonHandlers) {
+        for (BasicBlock commonHandler : commonHandlers) {
           ExceptionRangeCFG commonRange = graph.getExceptionRange(commonHandler, handler);
-          
+
           dummyBlock.addSuccessorException(commonHandler);
           commonRange.getProtectedRange().add(dummyBlock);
         }
-        
+
         dummyBlock.addSuccessor(handler);
       }
     }
   }
-  
 }
\ No newline at end of file

From e9989d15e3c1ad1ae28e168f306becfd0abe101c Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 24 Oct 2018 21:16:56 +0200
Subject: [PATCH 228/252] Cleanup (warnings)

---
 .../java/decompiler/main/ClassWriter.java         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index c782a48..72fefe4 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -257,8 +257,7 @@ public class ClassWriter {
   }
 
   private static void addTracer(StructClass cls, StructMethod method, BytecodeMappingTracer tracer) {
-    StructLineNumberTableAttribute table =
-      (StructLineNumberTableAttribute)method.getAttribute(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
+    StructLineNumberTableAttribute table = method.getAttribute(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
     tracer.setLineNumberTable(table);
     String key = InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor());
     DecompilerContext.getBytecodeSourceMapper().addTracer(cls.qualifiedName, key, tracer);
@@ -439,8 +438,7 @@ public class ClassWriter {
       }
     }
     else if (fd.hasModifier(CodeConstants.ACC_FINAL) && fd.hasModifier(CodeConstants.ACC_STATIC)) {
-      StructConstantValueAttribute attr =
-        (StructConstantValueAttribute)fd.getAttribute(StructGeneralAttribute.ATTRIBUTE_CONSTANT_VALUE);
+      StructConstantValueAttribute attr = fd.getAttribute(StructGeneralAttribute.ATTRIBUTE_CONSTANT_VALUE);
       if (attr != null) {
         PrimitiveConstant constant = cl.getPool().getPrimitiveConstant(attr.getIndex());
         buffer.append(" = ");
@@ -696,8 +694,7 @@ public class ClassWriter {
 
         List<StructMethodParametersAttribute.Entry> methodParameters = null;
         if (DecompilerContext.getOption(IFernflowerPreferences.USE_METHOD_PARAMETERS)) {
-          StructMethodParametersAttribute attr =
-            (StructMethodParametersAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_METHOD_PARAMETERS);
+          StructMethodParametersAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_METHOD_PARAMETERS);
           if (attr != null) {
             methodParameters = attr.getEntries();
           }
@@ -956,7 +953,7 @@ public class ClassWriter {
   private static void appendAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType) {
     Set<String> filter = new HashSet<>();
 
-    for (StructGeneralAttribute.Key key : ANNOTATION_ATTRIBUTES) {
+    for (StructGeneralAttribute.Key<?> key : ANNOTATION_ATTRIBUTES) {
       StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttribute(key);
       if (attribute != null) {
         for (AnnotationExprent annotation : attribute.getAnnotations()) {
@@ -973,7 +970,7 @@ public class ClassWriter {
   private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, int param) {
     Set<String> filter = new HashSet<>();
 
-    for (StructGeneralAttribute.Key key : PARAMETER_ANNOTATION_ATTRIBUTES) {
+    for (StructGeneralAttribute.Key<?> key : PARAMETER_ANNOTATION_ATTRIBUTES) {
       StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttribute(key);
       if (attribute != null) {
         List<List<AnnotationExprent>> annotations = attribute.getParamAnnotations();
@@ -991,7 +988,7 @@ public class ClassWriter {
   }
 
   private static void appendTypeAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType, int index, Set<String> filter) {
-    for (StructGeneralAttribute.Key key : TYPE_ANNOTATION_ATTRIBUTES) {
+    for (StructGeneralAttribute.Key<?> key : TYPE_ANNOTATION_ATTRIBUTES) {
       StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)mb.getAttribute(key);
       if (attribute != null) {
         for (TypeAnnotation annotation : attribute.getAnnotations()) {

From f320e3abd4541e4164b8ab2e20b62d738eba2616 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Fri, 14 Dec 2018 17:56:47 +0300
Subject: [PATCH 229/252] IDEA-204223 Decompiler doesn't add mandatory
 narrowing cast on integer type

---
 .../modules/decompiler/ExprProcessor.java     |  20 +-
 .../decompiler/exps/InvocationExprent.java    |  19 +-
 .../modules/decompiler/exps/NewExprent.java   |   8 +-
 testData/classes/pkg/TestPrimitives.class     | Bin 6576 -> 6931 bytes
 testData/results/TestPrimitives.dec           | 922 +++++++++---------
 testData/src/pkg/TestPrimitives.java          |   6 +
 6 files changed, 499 insertions(+), 476 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index aadd0b1..2b97f00 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -855,7 +853,7 @@ public class ExprProcessor implements CodeConstants {
                                          int indent,
                                          boolean castNull,
                                          BytecodeMappingTracer tracer) {
-    return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, false, tracer);
+    return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, false, false, tracer);
   }
 
   public static boolean getCastedExprent(Exprent exprent,
@@ -865,7 +863,21 @@ public class ExprProcessor implements CodeConstants {
                                          boolean castNull,
                                          boolean castAlways,
                                          boolean castNarrowing,
+                                         boolean unbox,
                                          BytecodeMappingTracer tracer) {
+
+    if (unbox) {
+      // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
+      if (exprent.type == Exprent.EXPRENT_INVOCATION && ((InvocationExprent)exprent).isBoxingCall()) {
+        InvocationExprent invocationExprent = (InvocationExprent)exprent;
+        exprent = invocationExprent.getLstParameters().get(0);
+        int paramType = invocationExprent.getDescriptor().params[0].type;
+        if (exprent.type == Exprent.EXPRENT_CONST && ((ConstExprent)exprent).getConstType().type != paramType) {
+          leftType = new VarType(paramType);
+        }
+      }
+    }
+
     VarType rightType = exprent.getExprType();
 
     boolean cast =
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 1abaf32..3fe26b3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -214,7 +212,7 @@ public class InvocationExprent extends Exprent {
       if (isBoxingCall() && canIgnoreBoxing) {
         // process general "boxing" calls, e.g. 'Object[] data = { true }' or 'Byte b = 123'
         // here 'byte' and 'short' values do not need an explicit narrowing type cast
-        ExprProcessor.getCastedExprent(lstParameters.get(0), descriptor.params[0], buf, indent, false, false, false, tracer);
+        ExprProcessor.getCastedExprent(lstParameters.get(0), descriptor.params[0], buf, indent, false, false, false, false, tracer);
         return buf;
       }
 
@@ -351,9 +349,8 @@ public class InvocationExprent extends Exprent {
         TextBuffer buff = new TextBuffer();
         boolean ambiguous = setAmbiguousParameters.get(i);
 
-        Exprent param = unboxIfNeeded(lstParameters.get(i));
         // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
-        ExprProcessor.getCastedExprent(param, descriptor.params[i], buff, indent, true, ambiguous, true, tracer);
+        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, true, true, tracer);
 
         // the last "new Object[0]" in the vararg call is not printed
         if (buff.length() > 0) {
@@ -372,14 +369,6 @@ public class InvocationExprent extends Exprent {
     return buf;
   }
 
-  public static Exprent unboxIfNeeded(Exprent param) {
-    // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
-    if (param.type == Exprent.EXPRENT_INVOCATION && ((InvocationExprent)param).isBoxingCall()) {
-      param = ((InvocationExprent)param).lstParameters.get(0);
-    }
-    return param;
-  }
-
   private boolean isVarArgCall() {
     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
     if (cl != null) {
@@ -398,7 +387,7 @@ public class InvocationExprent extends Exprent {
     return false;
   }
 
-  private boolean isBoxingCall() {
+  public boolean isBoxingCall() {
     if (isStatic && "valueOf".equals(name) && lstParameters.size() == 1) {
       int paramType = lstParameters.get(0).getExprType().type;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 84ac1ac..d915a5d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -282,7 +280,7 @@ public class NewExprent extends Exprent {
           boolean firstParam = true;
           for (int i = start; i < parameters.size(); i++) {
             if (mask == null || mask.get(i) == null) {
-              Exprent expr = InvocationExprent.unboxIfNeeded(parameters.get(i));
+              Exprent expr = parameters.get(i);
               VarType leftType = constructor.getDescriptor().params[i];
 
               if (i == parameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL && probablySyntheticParameter(leftType.value)) {
@@ -293,7 +291,7 @@ public class NewExprent extends Exprent {
                 buf.append(", ");
               }
 
-              ExprProcessor.getCastedExprent(expr, leftType, buf, indent, true, false, true, tracer);
+              ExprProcessor.getCastedExprent(expr, leftType, buf, indent, true, false, true, true, tracer);
 
               firstParam = false;
             }
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
index 1dad0d2fa50e49c17bf63e6886a417c2e77226d6..9c52484fa274649d2daf063c8fe273930b552429 100644
GIT binary patch
literal 6931
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
Vm&!@5$&t1=_mfhTkc0og{{gu|k?{Zk

delta 2810
zcmZ{l3sjUv6vzLwyYBbx$B3}7fS`gRR!X9viK{2{=t)o7iNt4Oib{wA0WOxBtyWfQ
z=Hn~P6idZNNv2U|mgXaSnAy90^fG%`+SAM|qwbyEmQQ3khkNeK&hOs;%zXEbdCk@=
z|H1m5y8(0)X$JbDmd(>_wy=4o8U4h6GkLVtkyBk>!`?P$&e<)oGfoUptDfblIs?z)
zdG@v&xCt+?x5L1T*vZ~Y242Q4_IBHWRecP+f;~L+?=`Rw``LZfzyZ9*-s=Xs;tlrR
z)Nzmlzs2T|j<-4XVK(pRc$dS!$L4(w{{fp1Ir2wrKGyLG$3DX5D91j==D3DWIs9jA
zJ~#Z7<O|O9r3)wUm5!4dzW#sL9SwYgZ*_df3r?~5p3M(zPHQ;h=ri!#erL{wlX>S4
zAC2ePAKCn*<7XYe==fE~Zw9h)R>$u;&gu9=$9WxpYPi5#_=`4W!{2p_#Bqmt#+j;5
z!|f7xV7l2{Yvb2&QQ{xeOWcS1+51=G0nF0`Xdr~dd@Rs}jR$s#2eD8S4jwd<cnFI$
z;pBlPu^3A<q4U5cu@okIhQz~oM8M&ztSaP*2uT5#3)s76X7RYW^ovNWpoz@xJ$Ryp
z6j4~oUbGZ$RI?W&MXc~pl&+lvRGbv?B7uKuDMg}45{Q{xFs&e?q@b)Qqu->0%7O{L
z!b*wJm@7pq(OP0P9+!9mYc$bDie!-@5SKPSJtb{ox|yZ7zrL*$?L?|TWN?yypnr*F
zST6A>R!BU?s#c*|z+FD2C}U{hR9|joacQxycv|69PL<E5)Lf&twU5Ry^MF2BAC2i!
zv`2MaPgjXO4sGeqvejqa8UjNxjO_5bi!#aPA3@Xe(T=PW&7dIyI^1v}0S1z3lt!14
zj^@Zj3wRNQeu%~mv|<=ya0_BF2_94+4l@ytd(o0EBay@=VG~->2i+Qb&<2Mn(h;QK
z6y-UKRMaC)^hO6!fh*I+0$e3_p`$pBPBs^%8c9+l>4VL{DBMgV8}E@7oBLW!P=X^t
zHHOY`AcMZLE{e$~(ZG-(!`>JYNO8y;i*Xc%y#kC^><~=AMB;g_5Vz9S*(;*$Xv!<b
zWI70*n}QNL3f54nG}J^5vS`Sp7+L6vZWayRkOnW&WlDn=#kfsr@KTm?rNK*?E0hK=
zsi{;Nyrgg{T?Oc{$HJ%7cxfk9q(*?sM`<XF?$Dhtj&%V&=o+$B{x~)Egz|eR2A_f8
znp33To!B=jZ##O8*hZuc4N-bgl-^;Zj8jo&&^7ZtP!#i8x3p-;A-Yc(n$Mgy+=*F1
z+N!=Ek^RGvd`C>)1-~MXxvk^?A_s;c`A(UfjX8?!9%Cg35ji*v$=?8zcjF#KE{^Gt
z+;B=a5}DhWG?QaIVz_zwk{o%oa%kg~bmpLf;ctp_P~THIu8U2zoaIO=u~8P%9lB39
z-Di~|sZT0$^(ACJkz>M=K1EVfZGs#}WI-5`zerX~9k>Z{B9Vn*NdBssq;}l|If=;P
zFeFz7lhoT4S?{r)PzjNxVMwknCg~w)f-EPpA`HnD$|OA;irf;HswzEDWj-RS!jOR~
z7u>X&q&rSmk*LD#wKNLUnUm%~br|Y!G#}`2f;)YXygEqQqh{B_%#C*_4FPtRg|&xR
zdLV*q=OF8do{h$N=U7-rh^2Ssvb-HHMaKYhEo?(xdfI|)mtbC}J8lPJw>H}GJPYj%
zWu`ZgX|qd0{1seZfgLVva_!o{i)EH2w9nwRf&RaQI{s36icAX=6N<ks$m~r>>eNub
z%ZOQSS>N!+)L^~RqqVFp;`Lt20(yKS=yW~wq@~bFrPFhsO}p+-FM2NN&&OKo7VD@_
z*HEWfPZhF(?s21vpQ3vF%Ag)llt9%-&^Nt-y0Q%$&BVm4;hO?IopSZ1{M^r7Njng^
f9eJ0v=*{#9)T-ctM(+v*cj3ukqkoD5*s%FOzhbBb

diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
index 8809dcc..bc930a5 100644
--- a/testData/results/TestPrimitives.dec
+++ b/testData/results/TestPrimitives.dec
@@ -1,558 +1,571 @@
 package pkg;
 
+import java.util.HashMap;
+
 public class TestPrimitives {
    public void printAll() {
-      this.printBoolean(true);// 6
-      this.printByte((byte)123);// 7
-      this.printShort((short)257);// 8
-      this.printInt(123);// 9
-      this.printLong(123L);// 10
-      this.printFloat(1.23F);// 11
-      this.printDouble(1.23D);// 12
-      this.printChar('Z');// 13
-      this.printBooleanBoxed(true);// 15
-      this.printByteBoxed((byte)123);// 16
-      this.printShortBoxed((short)257);// 17
-      this.printIntBoxed(1);// 18
-      this.printIntBoxed(40000);// 19
-      this.printLongBoxed(123L);// 20
-      this.printFloatBoxed(1.23F);// 21
-      this.printDoubleBoxed(1.23D);// 22
-      this.printCharBoxed('Z');// 23
-      this.printBoolean(Boolean.valueOf("true"));// 25
-      this.printByte(Byte.valueOf("123"));// 26
-      this.printShort(Short.valueOf("257"));// 27
-      this.printInt(Integer.valueOf("123"));// 28
-      this.printLong(Long.valueOf("123"));// 29
-      this.printFloat(Float.valueOf("1.23"));// 30
-      this.printDouble(Double.valueOf("1.23"));// 31
-      this.printChar(new Character('Z'));// 32
-      this.printInt(this.getInteger());// 34
-      this.printChar(this.getCharacter());// 35
-      System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 37
-      System.out.printf("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt());// 38
-      new TestPrimitives(false, (byte)123, (short)257, 40000, 123L, 3.14F, 1.618D, 'A');// 40
-      new TestPrimitives('A', 1.618D, 3.14F, 123L, 40000, (short)257, (byte)123, false);// 41
-      new TestPrimitives(Boolean.valueOf("false"), Byte.valueOf("123"), Short.valueOf("257"), Integer.valueOf("40000"), Long.valueOf("123"), Float.valueOf("3.14"), Double.valueOf("1.618"), new Character('A'));// 42 43
-   }// 44
+      this.printBoolean(true);// 8
+      this.printByte((byte)123);// 9
+      this.printShort((short)257);// 10
+      this.printInt(123);// 11
+      this.printLong(123L);// 12
+      this.printFloat(1.23F);// 13
+      this.printDouble(1.23D);// 14
+      this.printChar('Z');// 15
+      this.printBooleanBoxed(true);// 17
+      this.printByteBoxed((byte)123);// 18
+      this.printShortBoxed((short)257);// 19
+      this.printIntBoxed(1);// 20
+      this.printIntBoxed(40000);// 21
+      this.printLongBoxed(123L);// 22
+      this.printFloatBoxed(1.23F);// 23
+      this.printDoubleBoxed(1.23D);// 24
+      this.printCharBoxed('Z');// 25
+      this.printBoolean(Boolean.valueOf("true"));// 27
+      this.printByte(Byte.valueOf("123"));// 28
+      this.printShort(Short.valueOf("257"));// 29
+      this.printInt(Integer.valueOf("123"));// 30
+      this.printLong(Long.valueOf("123"));// 31
+      this.printFloat(Float.valueOf("1.23"));// 32
+      this.printDouble(Double.valueOf("1.23"));// 33
+      this.printChar(new Character('Z'));// 34
+      this.printInt(this.getInteger());// 36
+      this.printChar(this.getCharacter());// 37
+      System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 39
+      System.out.printf("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt());// 40
+      new TestPrimitives(false, (byte)123, (short)257, 40000, 123L, 3.14F, 1.618D, 'A');// 42
+      new TestPrimitives('A', 1.618D, 3.14F, 123L, 40000, (short)257, (byte)123, false);// 43
+      new TestPrimitives(Boolean.valueOf("false"), Byte.valueOf("123"), Short.valueOf("257"), Integer.valueOf("40000"), Long.valueOf("123"), Float.valueOf("3.14"), Double.valueOf("1.618"), new Character('A'));// 44 45
+   }// 46
 
    private TestPrimitives(boolean bool, byte b, short s, int i, long l, float f, double d, char c) {
-      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 47
-   }// 48
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 49
+   }// 50
 
    private TestPrimitives(Character c, Double d, Float f, Long l, Integer i, Short s, Byte b, Boolean bool) {
-      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 51
-   }// 52
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 53
+   }// 54
 
    public void printBoolean(boolean b) {
-      System.out.printf("%b", b);// 55
-   }// 56
+      System.out.printf("%b", b);// 57
+   }// 58
 
    public void printByte(byte b) {
-      System.out.printf("%d", b);// 59
-   }// 60
+      System.out.printf("%d", b);// 61
+   }// 62
 
    public void printShort(short s) {
-      System.out.printf("%d", s);// 63
-   }// 64
+      System.out.printf("%d", s);// 65
+   }// 66
 
    public void printInt(int i) {
-      System.out.printf("%d", i);// 67
-   }// 68
+      System.out.printf("%d", i);// 69
+   }// 70
 
    public void printLong(long l) {
-      System.out.printf("%d", l);// 71
-   }// 72
+      System.out.printf("%d", l);// 73
+   }// 74
 
    public void printFloat(float f) {
-      System.out.printf("%f", f);// 75
-   }// 76
+      System.out.printf("%f", f);// 77
+   }// 78
 
    public void printDouble(double d) {
-      System.out.printf("%f", d);// 79
-   }// 80
+      System.out.printf("%f", d);// 81
+   }// 82
 
    public void printChar(char c) {
-      System.out.printf("%c", c);// 83
-   }// 84
+      System.out.printf("%c", c);// 85
+   }// 86
 
    public void printBooleanBoxed(Boolean b) {
-      System.out.printf("%b", b);// 88
-   }// 89
+      System.out.printf("%b", b);// 90
+   }// 91
 
    public void printByteBoxed(Byte b) {
-      System.out.printf("%d", b);// 92
-   }// 93
+      System.out.printf("%d", b);// 94
+   }// 95
 
    public void printShortBoxed(Short s) {
-      System.out.printf("%d", s);// 96
-   }// 97
+      System.out.printf("%d", s);// 98
+   }// 99
 
    public void printIntBoxed(Integer i) {
-      System.out.printf("%d", i);// 100
-   }// 101
+      System.out.printf("%d", i);// 102
+   }// 103
 
    public void printLongBoxed(Long l) {
-      System.out.printf("%d", l);// 104
-   }// 105
+      System.out.printf("%d", l);// 106
+   }// 107
 
    public void printFloatBoxed(Float f) {
-      System.out.printf("%f", f);// 108
-   }// 109
+      System.out.printf("%f", f);// 110
+   }// 111
 
    public void printDoubleBoxed(Double d) {
-      System.out.printf("%f", d);// 112
-   }// 113
+      System.out.printf("%f", d);// 114
+   }// 115
 
    public void printCharBoxed(Character c) {
-      System.out.printf("%c", c);// 116
-   }// 117
+      System.out.printf("%c", c);// 118
+   }// 119
 
    public boolean getBoolean() {
-      return false;// 121
+      return false;// 123
    }
 
    public byte getByte() {
-      return -128;// 125
+      return -128;// 127
    }
 
    public short getShort() {
-      return -32768;// 129
+      return -32768;// 131
    }
 
    public int getInt() {
-      return 42;// 133
+      return 42;// 135
    }
 
    public Integer getInteger() {
-      return 40000;// 137
+      return 40000;// 139
    }
 
    public Character getCharacter() {
-      return 'Z';// 141
+      return 'Z';// 143
    }
 
    public void printNarrowed() {
-      this.printByte((byte)this.getInt());// 145
-      this.printShort((short)this.getInt());// 146
-   }// 147
+      this.printByte((byte)this.getInt());// 147
+      this.printShort((short)this.getInt());// 148
+   }// 149
 
    public void constructor() {
-      new Byte((byte)1);// 150
-   }// 151
+      new Byte((byte)1);// 152
+   }// 153
 
    private boolean compare(char c) {
-      boolean res = c > -1;// 154
-      res = c > 0;// 155
-      res = c > 1;// 156
-      res = c > '\b';// 157
-      res = c > '\t';// 158
-      res = c > '\n';// 159
-      res = c > '\f';// 160
-      res = c > '\r';// 161
-      res = c > ' ';// 162
-      res = c > 'a';// 163
-      res = c > 'Z';// 164
-      res = c > 127;// 165
-      res = c > 255;// 166
-      return res;// 167
+      boolean res = c > -1;// 156
+      res = c > 0;// 157
+      res = c > 1;// 158
+      res = c > '\b';// 159
+      res = c > '\t';// 160
+      res = c > '\n';// 161
+      res = c > '\f';// 162
+      res = c > '\r';// 163
+      res = c > ' ';// 164
+      res = c > 'a';// 165
+      res = c > 'Z';// 166
+      res = c > 127;// 167
+      res = c > 255;// 168
+      return res;// 169
    }
 
    void testAutoBoxingCallRequired(boolean value) {
-      Boolean.valueOf(value).hashCode();// 171
-   }// 172
+      Boolean.valueOf(value).hashCode();// 173
+   }// 174
+
+   void testCastRequired() {
+      HashMap<String, Byte> map = new HashMap();// 177
+      map.put("test", (byte)0);// 178
+   }// 179
 }
 
 class 'pkg/TestPrimitives' {
    method 'printAll ()V' {
-      1      4
-      2      4
-      6      5
-      8      5
-      c      6
-      f      6
-      13      7
-      15      7
-      19      8
-      1c      8
-      20      9
-      22      9
-      26      10
-      29      10
-      2d      11
-      2f      11
-      33      12
-      37      12
-      3b      13
-      40      13
-      44      14
-      4a      14
-      4e      15
-      52      15
-      56      16
-      5b      16
-      5f      17
-      65      17
-      69      18
-      6e      18
-      72      19
-      78      19
-      7c      20
-      81      20
-      85      21
-      87      21
-      8a      21
-      8d      21
-      91      22
-      93      22
-      96      22
-      99      22
-      9d      23
-      9f      23
-      a2      23
-      a5      23
-      a9      24
-      ab      24
-      ae      24
-      b1      24
-      b5      25
-      b7      25
-      ba      25
-      bd      25
-      c1      26
-      c3      26
-      c6      26
-      c9      26
-      cd      27
-      cf      27
-      d2      27
-      d5      27
-      dd      28
-      e2      28
-      e5      28
-      ea      29
-      ed      29
-      f0      29
-      f5      30
-      f8      30
-      fb      30
-      fe      31
-      101      31
-      10a      31
-      10b      31
-      111      31
-      112      31
-      118      31
-      11b      31
-      121      31
-      123      31
-      129      31
-      12b      31
-      131      31
-      134      31
-      138      31
-      13c      32
-      13f      32
-      148      32
-      14b      32
-      152      32
-      155      32
-      15c      32
-      15f      32
-      166      32
-      169      32
-      16d      32
-      175      33
-      176      33
-      178      33
-      17b      33
-      17d      33
-      180      33
-      182      33
-      185      33
-      18f      34
-      194      34
-      19a      34
-      19f      34
-      1a5      34
-      1aa      34
-      1b0      34
-      1b5      34
-      1c1      35
-      1c3      35
-      1c6      35
-      1c9      35
-      1cb      35
-      1ce      35
-      1d1      35
-      1d3      35
-      1d6      35
-      1d9      35
-      1db      35
-      1de      35
-      1e1      35
-      1e3      35
-      1e6      35
-      1e9      35
-      1eb      35
-      1ee      35
-      1f1      35
-      1f3      35
-      1f6      35
-      1fd      35
-      202      35
-      209      36
+      1      6
+      2      6
+      6      7
+      8      7
+      c      8
+      f      8
+      13      9
+      15      9
+      19      10
+      1c      10
+      20      11
+      22      11
+      26      12
+      29      12
+      2d      13
+      2f      13
+      33      14
+      37      14
+      3b      15
+      40      15
+      44      16
+      4a      16
+      4e      17
+      52      17
+      56      18
+      5b      18
+      5f      19
+      65      19
+      69      20
+      6e      20
+      72      21
+      78      21
+      7c      22
+      81      22
+      85      23
+      87      23
+      8a      23
+      8d      23
+      91      24
+      93      24
+      96      24
+      99      24
+      9d      25
+      9f      25
+      a2      25
+      a5      25
+      a9      26
+      ab      26
+      ae      26
+      b1      26
+      b5      27
+      b7      27
+      ba      27
+      bd      27
+      c1      28
+      c3      28
+      c6      28
+      c9      28
+      cd      29
+      cf      29
+      d2      29
+      d5      29
+      dd      30
+      e2      30
+      e5      30
+      ea      31
+      ed      31
+      f0      31
+      f5      32
+      f8      32
+      fb      32
+      fe      33
+      101      33
+      10a      33
+      10b      33
+      111      33
+      112      33
+      118      33
+      11b      33
+      121      33
+      123      33
+      129      33
+      12b      33
+      131      33
+      134      33
+      138      33
+      13c      34
+      13f      34
+      148      34
+      14b      34
+      152      34
+      155      34
+      15c      34
+      15f      34
+      166      34
+      169      34
+      16d      34
+      175      35
+      176      35
+      178      35
+      17b      35
+      17d      35
+      180      35
+      182      35
+      185      35
+      18f      36
+      194      36
+      19a      36
+      19f      36
+      1a5      36
+      1aa      36
+      1b0      36
+      1b5      36
+      1c1      37
+      1c3      37
+      1c6      37
+      1c9      37
+      1cb      37
+      1ce      37
+      1d1      37
+      1d3      37
+      1d6      37
+      1d9      37
+      1db      37
+      1de      37
+      1e1      37
+      1e3      37
+      1e6      37
+      1e9      37
+      1eb      37
+      1ee      37
+      1f1      37
+      1f3      37
+      1f6      37
+      1fd      37
+      202      37
+      209      38
    }
 
    method '<init> (ZBSIJFDC)V' {
-      4      39
-      7      39
-      11      39
-      18      39
-      1f      39
-      27      39
-      2f      39
-      37      39
-      40      39
-      49      39
-      4d      39
-      51      40
+      4      41
+      7      41
+      11      41
+      18      41
+      1f      41
+      27      41
+      2f      41
+      37      41
+      40      41
+      49      41
+      4d      41
+      51      42
    }
 
    method '<init> (Ljava/lang/Character;Ljava/lang/Double;Ljava/lang/Float;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Short;Ljava/lang/Byte;Ljava/lang/Boolean;)V' {
-      4      43
-      7      43
-      35      43
-      39      44
+      4      45
+      7      45
+      35      45
+      39      46
    }
 
    method 'printBoolean (Z)V' {
-      0      47
-      3      47
-      c      47
-      10      47
-      14      48
+      0      49
+      3      49
+      c      49
+      10      49
+      14      50
    }
 
    method 'printByte (B)V' {
-      0      51
-      3      51
-      c      51
-      10      51
-      14      52
+      0      53
+      3      53
+      c      53
+      10      53
+      14      54
    }
 
    method 'printShort (S)V' {
-      0      55
-      3      55
-      c      55
-      10      55
-      14      56
+      0      57
+      3      57
+      c      57
+      10      57
+      14      58
    }
 
    method 'printInt (I)V' {
-      0      59
-      3      59
-      c      59
-      10      59
-      14      60
+      0      61
+      3      61
+      c      61
+      10      61
+      14      62
    }
 
    method 'printLong (J)V' {
-      0      63
-      3      63
-      c      63
-      10      63
-      14      64
+      0      65
+      3      65
+      c      65
+      10      65
+      14      66
    }
 
    method 'printFloat (F)V' {
-      0      67
-      3      67
-      c      67
-      10      67
-      14      68
+      0      69
+      3      69
+      c      69
+      10      69
+      14      70
    }
 
    method 'printDouble (D)V' {
-      0      71
-      3      71
-      c      71
-      10      71
-      14      72
+      0      73
+      3      73
+      c      73
+      10      73
+      14      74
    }
 
    method 'printChar (C)V' {
-      0      75
-      3      75
-      c      75
-      10      75
-      14      76
+      0      77
+      3      77
+      c      77
+      10      77
+      14      78
    }
 
    method 'printBooleanBoxed (Ljava/lang/Boolean;)V' {
-      0      79
-      3      79
-      d      79
-      11      80
+      0      81
+      3      81
+      d      81
+      11      82
    }
 
    method 'printByteBoxed (Ljava/lang/Byte;)V' {
-      0      83
-      3      83
-      d      83
-      11      84
+      0      85
+      3      85
+      d      85
+      11      86
    }
 
    method 'printShortBoxed (Ljava/lang/Short;)V' {
-      0      87
-      3      87
-      d      87
-      11      88
+      0      89
+      3      89
+      d      89
+      11      90
    }
 
    method 'printIntBoxed (Ljava/lang/Integer;)V' {
-      0      91
-      3      91
-      d      91
-      11      92
+      0      93
+      3      93
+      d      93
+      11      94
    }
 
    method 'printLongBoxed (Ljava/lang/Long;)V' {
-      0      95
-      3      95
-      d      95
-      11      96
+      0      97
+      3      97
+      d      97
+      11      98
    }
 
    method 'printFloatBoxed (Ljava/lang/Float;)V' {
-      0      99
-      3      99
-      d      99
-      11      100
+      0      101
+      3      101
+      d      101
+      11      102
    }
 
    method 'printDoubleBoxed (Ljava/lang/Double;)V' {
-      0      103
-      3      103
-      d      103
-      11      104
+      0      105
+      3      105
+      d      105
+      11      106
    }
 
    method 'printCharBoxed (Ljava/lang/Character;)V' {
-      0      107
-      3      107
-      d      107
-      11      108
+      0      109
+      3      109
+      d      109
+      11      110
    }
 
    method 'getBoolean ()Z' {
-      0      111
-      1      111
+      0      113
+      1      113
    }
 
    method 'getByte ()B' {
-      0      115
-      2      115
+      0      117
+      2      117
    }
 
    method 'getShort ()S' {
-      0      119
-      3      119
+      0      121
+      3      121
    }
 
    method 'getInt ()I' {
-      0      123
-      2      123
+      0      125
+      2      125
    }
 
    method 'getInteger ()Ljava/lang/Integer;' {
-      0      127
-      2      127
-      5      127
+      0      129
+      2      129
+      5      129
    }
 
    method 'getCharacter ()Ljava/lang/Character;' {
-      0      131
-      2      131
-      5      131
+      0      133
+      2      133
+      5      133
    }
 
    method 'printNarrowed ()V' {
-      2      135
-      5      135
-      6      135
-      b      136
-      e      136
-      f      136
-      12      137
+      2      137
+      5      137
+      6      137
+      b      138
+      e      138
+      f      138
+      12      139
    }
 
    method 'constructor ()V' {
-      4      140
-      9      141
+      4      142
+      9      143
    }
 
    method 'compare (C)Z' {
-      1      144
-      2      144
-      a      144
-      c      145
-      14      145
-      16      146
-      17      146
-      1f      146
-      21      147
-      23      147
-      2b      147
-      2d      148
-      2f      148
-      37      148
-      39      149
-      3b      149
-      43      149
-      45      150
-      47      150
-      4f      150
-      51      151
-      53      151
-      5b      151
-      5d      152
-      5f      152
-      67      152
-      69      153
-      6b      153
-      73      153
-      75      154
-      77      154
-      7f      154
-      81      155
-      83      155
-      8b      155
-      8d      156
-      90      156
-      98      156
-      9a      157
+      1      146
+      2      146
+      a      146
+      c      147
+      14      147
+      16      148
+      17      148
+      1f      148
+      21      149
+      23      149
+      2b      149
+      2d      150
+      2f      150
+      37      150
+      39      151
+      3b      151
+      43      151
+      45      152
+      47      152
+      4f      152
+      51      153
+      53      153
+      5b      153
+      5d      154
+      5f      154
+      67      154
+      69      155
+      6b      155
+      73      155
+      75      156
+      77      156
+      7f      156
+      81      157
+      83      157
+      8b      157
+      8d      158
+      90      158
+      98      158
+      9a      159
    }
 
    method 'testAutoBoxingCallRequired (Z)V' {
-      1      161
-      4      161
-      8      162
+      1      163
+      4      163
+      8      164
+   }
+
+   method 'testCastRequired ()V' {
+      7      167
+      9      168
+      b      168
+      f      168
+      13      169
    }
 }
 
 Lines mapping:
-6 <-> 5
-7 <-> 6
 8 <-> 7
 9 <-> 8
 10 <-> 9
 11 <-> 10
 12 <-> 11
 13 <-> 12
-15 <-> 13
-16 <-> 14
+14 <-> 13
+15 <-> 14
 17 <-> 15
 18 <-> 16
 19 <-> 17
@@ -560,72 +573,72 @@ Lines mapping:
 21 <-> 19
 22 <-> 20
 23 <-> 21
-25 <-> 22
-26 <-> 23
+24 <-> 22
+25 <-> 23
 27 <-> 24
 28 <-> 25
 29 <-> 26
 30 <-> 27
 31 <-> 28
 32 <-> 29
-34 <-> 30
-35 <-> 31
-37 <-> 32
-38 <-> 33
-40 <-> 34
-41 <-> 35
+33 <-> 30
+34 <-> 31
+36 <-> 32
+37 <-> 33
+39 <-> 34
+40 <-> 35
 42 <-> 36
-43 <-> 36
-44 <-> 37
-47 <-> 40
-48 <-> 41
-51 <-> 44
-52 <-> 45
-55 <-> 48
-56 <-> 49
-59 <-> 52
-60 <-> 53
-63 <-> 56
-64 <-> 57
-67 <-> 60
-68 <-> 61
-71 <-> 64
-72 <-> 65
-75 <-> 68
-76 <-> 69
-79 <-> 72
-80 <-> 73
-83 <-> 76
-84 <-> 77
-88 <-> 80
-89 <-> 81
-92 <-> 84
-93 <-> 85
-96 <-> 88
-97 <-> 89
-100 <-> 92
-101 <-> 93
-104 <-> 96
-105 <-> 97
-108 <-> 100
-109 <-> 101
-112 <-> 104
-113 <-> 105
-116 <-> 108
-117 <-> 109
-121 <-> 112
-125 <-> 116
-129 <-> 120
-133 <-> 124
-137 <-> 128
-141 <-> 132
-145 <-> 136
-146 <-> 137
+43 <-> 37
+44 <-> 38
+45 <-> 38
+46 <-> 39
+49 <-> 42
+50 <-> 43
+53 <-> 46
+54 <-> 47
+57 <-> 50
+58 <-> 51
+61 <-> 54
+62 <-> 55
+65 <-> 58
+66 <-> 59
+69 <-> 62
+70 <-> 63
+73 <-> 66
+74 <-> 67
+77 <-> 70
+78 <-> 71
+81 <-> 74
+82 <-> 75
+85 <-> 78
+86 <-> 79
+90 <-> 82
+91 <-> 83
+94 <-> 86
+95 <-> 87
+98 <-> 90
+99 <-> 91
+102 <-> 94
+103 <-> 95
+106 <-> 98
+107 <-> 99
+110 <-> 102
+111 <-> 103
+114 <-> 106
+115 <-> 107
+118 <-> 110
+119 <-> 111
+123 <-> 114
+127 <-> 118
+131 <-> 122
+135 <-> 126
+139 <-> 130
+143 <-> 134
 147 <-> 138
-150 <-> 141
-151 <-> 142
-154 <-> 145
-155 <-> 146
+148 <-> 139
+149 <-> 140
+152 <-> 143
+153 <-> 144
 156 <-> 147
 157 <-> 148
 158 <-> 149
@@ -638,8 +651,13 @@ Lines mapping:
 165 <-> 156
 166 <-> 157
 167 <-> 158
-171 <-> 162
-172 <-> 163
+168 <-> 159
+169 <-> 160
+173 <-> 164
+174 <-> 165
+177 <-> 168
+178 <-> 169
+179 <-> 170
 Not mapped:
-46
-50
+48
+52
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
index 55bd806..3630252 100644
--- a/testData/src/pkg/TestPrimitives.java
+++ b/testData/src/pkg/TestPrimitives.java
@@ -1,5 +1,7 @@
 package pkg;
 
+import java.util.*;
+
 public class TestPrimitives {
 
   public void printAll() {
@@ -171,4 +173,8 @@ public class TestPrimitives {
     Boolean.valueOf(value).hashCode();
   }
 
+  void testCastRequired() {
+    HashMap<String, Byte> map = new HashMap<String, Byte>();
+    map.put("test", (byte) 0);
+  }
 }

From 4e0e3917981c97716b47fcaff3d0ee33a22e3c1e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 17 Dec 2018 13:48:12 +0100
Subject: [PATCH 230/252] [IDEA-204272] Fix varargs params losing generic info

Regression introduced in commit 82a2939271c55732637cf921ba447af6caef796b
"java-decompiler: cleanups and fixes"
---
 .../struct/gen/generics/GenericType.java          | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
index 4b213a0..fa0256d 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -28,6 +28,17 @@ public class GenericType {
     this.value = value;
   }
 
+  public GenericType(GenericType other, int arrayDim) {
+    this.type = other.type;
+    this.value = other.value;
+
+    this.enclosingClasses.addAll(other.enclosingClasses);
+    this.arguments.addAll(other.arguments);
+    this.wildcards.addAll(other.wildcards);
+
+    this.arrayDim = arrayDim;
+  }
+
   public GenericType(String signature) {
     int type = 0;
     int arrayDim = 0;
@@ -197,7 +208,7 @@ public class GenericType {
 
   public GenericType decreaseArrayDim() {
     assert arrayDim > 0 : this;
-    return new GenericType(type, arrayDim - 1, value);
+    return new GenericType(this, arrayDim - 1);
   }
 
   public List<GenericType> getArguments() {

From e9cae6c72012a5062b68b883f04658f1ce3c071e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 17 Dec 2018 13:50:41 +0100
Subject: [PATCH 231/252] Cleanup (formatting)

---
 .../struct/gen/generics/GenericType.java           | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
index fa0256d..60bffdb 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -28,15 +28,11 @@ public class GenericType {
     this.value = value;
   }
 
-  public GenericType(GenericType other, int arrayDim) {
-    this.type = other.type;
-    this.value = other.value;
-
-    this.enclosingClasses.addAll(other.enclosingClasses);
-    this.arguments.addAll(other.arguments);
-    this.wildcards.addAll(other.wildcards);
-
-    this.arrayDim = arrayDim;
+  private GenericType(GenericType other, int arrayDim) {
+    this(other.type, arrayDim, other.value);
+    enclosingClasses.addAll(other.enclosingClasses);
+    arguments.addAll(other.arguments);
+    wildcards.addAll(other.wildcards);
   }
 
   public GenericType(String signature) {

From 17a9fb25265f523c011b7570e8a17739eaa1db3d Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 17 Dec 2018 13:53:04 +0100
Subject: [PATCH 232/252] [tests] generic vararg decompilation test case
 (IDEA-204272)

---
 .../java/decompiler/SingleClassesTest.java    |   1 +
 testData/classes/pkg/TestGenericArgs.class    | Bin 0 -> 816 bytes
 testData/results/TestGenericArgs.dec          |  55 ++++++++++++++++++
 testData/src/pkg/TestGenericArgs.java         |  15 +++++
 4 files changed, 71 insertions(+)
 create mode 100644 testData/classes/pkg/TestGenericArgs.class
 create mode 100644 testData/results/TestGenericArgs.dec
 create mode 100644 testData/src/pkg/TestGenericArgs.java

diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 6c1468a..927e10a 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -126,6 +126,7 @@ public class SingleClassesTest {
   @Test public void testPrivateClasses() { doTest("pkg/PrivateClasses"); }
   @Test public void testSuspendLambda() { doTest("pkg/TestSuspendLambdaKt"); }
   @Test public void testNamedSuspendFun2Kt() { doTest("pkg/TestNamedSuspendFun2Kt"); }
+  @Test public void testGenericArgs() { doTest("pkg/TestGenericArgs"); }
 
   private void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
diff --git a/testData/classes/pkg/TestGenericArgs.class b/testData/classes/pkg/TestGenericArgs.class
new file mode 100644
index 0000000000000000000000000000000000000000..6462ac041788b708549b9bc48ae9d96835416be1
GIT binary patch
literal 816
zcmaix%}&BV6ot<SrBKU{0xBjh+#x2`g)1Q>ghV$)7c^{K4LE5Av6yKg@fCa<S0*le
z03XVDr_?||(k^=E=ey_Ld*=J+^9#TgjxD5cXyV93jUm&Lz6{$8sruP~A>Exm3Wj1&
z`r>Z(JQT|1!wH?_J>d%_M}6sgdS9vc#(d753HLpxJK;gl)cLu-^n4!96d_K_y<UOt
zhhs4co9&Inmg_d#QFb9NGT^GCynvxve^^mimbu&_y+JRv?O3~`6n~|;gLsg}7O8*h
zn)AQT&bOp(bPx?@@I_UtKb@(OxRH^Ct_Z^0g{^wr3vH;4Gz^CF%aiA<-7}PymM`4I
zDR$^J^=E=!4+i}+v^$~5C>o6quy<N80zg;#Fa--)<S136wdj_Jbu3L72-?LPY~+*h
qOpF&O7L)Pp3SLTX#)|PhYGyxK-H!1x#Y!@+d)A|t$)9SpI`{=S`<P?^

literal 0
HcmV?d00001

diff --git a/testData/results/TestGenericArgs.dec b/testData/results/TestGenericArgs.dec
new file mode 100644
index 0000000..330ded5
--- /dev/null
+++ b/testData/results/TestGenericArgs.dec
@@ -0,0 +1,55 @@
+package pkg;
+
+public class TestGenericArgs {
+   private static <T> void genericSingle(Class<T> var0) {
+   }// 4
+
+   private static <T> void genericVarArgs(Class<T>... var0) {
+   }// 6
+
+   private static <T> void genericArray(Class<T>[] var0) {
+   }// 8
+
+   private static <T> void single(Class var0) {
+   }// 10
+
+   private static <T> void varArgs(Class... var0) {
+   }// 12
+
+   private static <T> void array(Class[] var0) {
+   }// 14
+}
+
+class 'pkg/TestGenericArgs' {
+   method 'genericSingle (Ljava/lang/Class;)V' {
+      0      4
+   }
+
+   method 'genericVarArgs ([Ljava/lang/Class;)V' {
+      0      7
+   }
+
+   method 'genericArray ([Ljava/lang/Class;)V' {
+      0      10
+   }
+
+   method 'single (Ljava/lang/Class;)V' {
+      0      13
+   }
+
+   method 'varArgs ([Ljava/lang/Class;)V' {
+      0      16
+   }
+
+   method 'array ([Ljava/lang/Class;)V' {
+      0      19
+   }
+}
+
+Lines mapping:
+4 <-> 5
+6 <-> 8
+8 <-> 11
+10 <-> 14
+12 <-> 17
+14 <-> 20
diff --git a/testData/src/pkg/TestGenericArgs.java b/testData/src/pkg/TestGenericArgs.java
new file mode 100644
index 0000000..e41d3ca
--- /dev/null
+++ b/testData/src/pkg/TestGenericArgs.java
@@ -0,0 +1,15 @@
+package pkg;
+
+public class TestGenericArgs {
+  private static <T> void genericSingle(Class<T> param) { }
+
+  private static <T> void genericVarArgs(Class<T>... param) { }
+
+  private static <T> void genericArray(Class<T>[] param) { }
+
+  private static <T> void single(Class param) { }
+
+  private static <T> void varArgs(Class... param) { }
+
+  private static <T> void array(Class[] param) { }
+}
\ No newline at end of file

From ca01d9877bd3a6872b697ddc6ad4cd60e613cc2d Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Mon, 17 Dec 2018 16:30:18 +0300
Subject: [PATCH 233/252] IDEA-174243 Decompiler Switch-Enum Sugaring Doesn't
 Support Obfuscated Code

---
 .../java/decompiler/modules/decompiler/SwitchHelper.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
index 92ee80e..b49bf39 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -70,7 +70,10 @@ public class SwitchHelper {
   private static boolean isEnumArray(Exprent exprent) {
     if (exprent instanceof ArrayExprent) {
       Exprent field = ((ArrayExprent)exprent).getArray();
-      return field instanceof FieldExprent && ((FieldExprent)field).getName().startsWith("$SwitchMap");
+      Exprent index = ((ArrayExprent)exprent).getIndex();
+      return field instanceof FieldExprent &&
+             (((FieldExprent)field).getName().startsWith("$SwitchMap") ||
+              (index instanceof InvocationExprent && ((InvocationExprent)index).getName().equals("ordinal")));
     }
     return false;
   }

From 8f2a97adc33d89d96a69c847538b091ae7fd306f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 18 Dec 2018 16:38:48 +0300
Subject: [PATCH 234/252] IDEA-204310: Decompiler adds redundant imports for
 lambdas

---
 .../modules/decompiler/exps/NewExprent.java   |   3 +-
 testData/results/TestClassLambda.dec          | 271 +++++++++---------
 2 files changed, 136 insertions(+), 138 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index d915a5d..5268e16 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -143,7 +143,8 @@ public class NewExprent extends Exprent {
     if (anonymous) {
       ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
 
-      if (!enumConst) {
+      // IDEA-204310 - avoid backtracking later on for lambdas (causes spurious imports)
+      if (!enumConst && (!lambda || DecompilerContext.getOption(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS))) {
         String enclosing = null;
 
         if (!lambda && constructor != null) {
diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index daeb7e1..cae1518 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -5,10 +5,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.OptionalInt;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.IntBinaryOperator;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 public class TestClassLambda {
@@ -90,43 +87,51 @@ public class TestClassLambda {
 
 class 'pkg/TestClassLambda' {
    method 'lambda$testLambda$0 (ILjava/lang/Integer;)V' {
-      0      20
-      2      20
-      5      20
-      6      20
-      7      21
-      c      21
-      e      21
-      11      21
-      12      21
-      15      22
+      0      17
+      2      17
+      5      17
+      6      17
+      7      18
+      c      18
+      e      18
+      11      18
+      12      18
+      15      19
    }
 
    method 'testLambda ()V' {
-      7      17
-      8      17
-      e      17
-      f      17
-      15      17
-      16      17
-      1c      17
-      1d      17
-      23      17
-      24      17
-      2a      17
-      2c      17
-      33      17
-      35      17
-      39      17
-      3c      17
-      3d      18
-      40      18
-      41      18
-      4a      19
-      4f      23
+      7      14
+      8      14
+      e      14
+      f      14
+      15      14
+      16      14
+      1c      14
+      1d      14
+      23      14
+      24      14
+      2a      14
+      2c      14
+      33      14
+      35      14
+      39      14
+      3c      14
+      3d      15
+      40      15
+      41      15
+      4a      16
+      4f      20
    }
 
    method 'lambda$testLambda1$1 (I)V' {
+      0      25
+      a      25
+      13      25
+      16      25
+      19      26
+   }
+
+   method 'lambda$testLambda1$2 (I)V' {
       0      28
       a      28
       13      28
@@ -134,153 +139,145 @@ class 'pkg/TestClassLambda' {
       19      29
    }
 
-   method 'lambda$testLambda1$2 (I)V' {
-      0      31
-      a      31
-      13      31
-      16      31
-      19      32
-   }
-
    method 'testLambda1 ()V' {
-      0      26
-      3      26
-      4      26
-      b      29
-      12      32
-      13      33
+      0      23
+      3      23
+      4      23
+      b      26
+      12      29
+      13      30
    }
 
    method 'lambda$testLambda2$3 (II)I' {
-      2      37
-      5      37
+      2      34
+      5      34
    }
 
    method 'testLambda2 ()V' {
-      5      36
-      9      39
+      5      33
+      9      36
    }
 
    method 'testLambda3 ()V' {
-      5      42
-      9      43
+      5      39
+      9      40
    }
 
    method 'testLambda4 ()V' {
-      5      46
-      9      47
+      5      43
+      9      44
    }
 
    method 'testLambda5 ()V' {
-      0      50
-      2      50
-      e      51
-      12      52
+      0      47
+      2      47
+      e      48
+      12      49
    }
 
    method 'lambda$testLambda6$4 (IILjava/lang/String;)Z' {
-      2      59
-      5      59
-      9      59
-      d      59
-      15      59
+      2      56
+      5      56
+      9      56
+      d      56
+      15      56
    }
 
    method 'testLambda6 ()V' {
-      7      55
-      9      56
-      e      56
-      f      56
-      10      56
-      12      57
-      17      57
-      18      57
-      19      57
-      22      58
-      28      61
+      7      52
+      9      53
+      e      53
+      f      53
+      10      53
+      12      54
+      17      54
+      18      54
+      19      54
+      22      55
+      28      58
    }
 
    method 'testLambda7 ([Ljava/lang/annotation/Annotation;)V' {
-      1      64
-      9      64
-      f      65
+      1      61
+      9      61
+      f      62
    }
 
    method 'reduce (Ljava/util/function/IntBinaryOperator;)Ljava/util/OptionalInt;' {
-      0      68
-      1      68
+      0      65
+      1      65
    }
 
    method 'function (Ljava/util/function/Supplier;)Ljava/lang/String;' {
-      1      72
-      6      72
-      9      72
+      1      69
+      6      69
+      9      69
    }
 
    method 'localMax (II)I' {
-      0      76
-      1      76
+      0      73
+      1      73
    }
 
    method 'lambda$null$5 (I)V' {
-      0      83
-      a      83
-      13      83
-      16      83
-      19      84
+      0      80
+      a      80
+      13      80
+      16      80
+      19      81
    }
 
    method 'lambda$nestedLambdas$6 (I)V' {
-      6      84
-      7      85
-      11      85
-      1a      85
-      1d      85
-      20      86
+      6      81
+      7      82
+      11      82
+      1a      82
+      1d      82
+      20      83
    }
 
    method 'nestedLambdas ()V' {
-      0      80
-      1      80
-      8      86
-      9      87
+      0      77
+      1      77
+      8      83
+      9      84
    }
 }
 
 Lines mapping:
-29 <-> 18
-30 <-> 19
-32 <-> 20
-33 <-> 21
-34 <-> 22
-35 <-> 23
-36 <-> 24
-39 <-> 27
-40 <-> 30
-41 <-> 33
-42 <-> 34
-45 <-> 37
-46 <-> 40
-49 <-> 43
-50 <-> 44
-53 <-> 47
-54 <-> 48
-57 <-> 51
-58 <-> 52
-59 <-> 53
-62 <-> 56
-63 <-> 57
-64 <-> 58
-65 <-> 59
-66 <-> 62
-69 <-> 65
-70 <-> 66
-73 <-> 69
-77 <-> 73
-81 <-> 77
-85 <-> 81
-86 <-> 87
-87 <-> 85
-88 <-> 86
-89 <-> 87
-90 <-> 88
+29 <-> 15
+30 <-> 16
+32 <-> 17
+33 <-> 18
+34 <-> 19
+35 <-> 20
+36 <-> 21
+39 <-> 24
+40 <-> 27
+41 <-> 30
+42 <-> 31
+45 <-> 34
+46 <-> 37
+49 <-> 40
+50 <-> 41
+53 <-> 44
+54 <-> 45
+57 <-> 48
+58 <-> 49
+59 <-> 50
+62 <-> 53
+63 <-> 54
+64 <-> 55
+65 <-> 56
+66 <-> 59
+69 <-> 62
+70 <-> 63
+73 <-> 66
+77 <-> 70
+81 <-> 74
+85 <-> 78
+86 <-> 84
+87 <-> 82
+88 <-> 83
+89 <-> 84
+90 <-> 85

From ccc203e92b334a8448c21674352a8a5423917580 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Tue, 18 Dec 2018 17:32:57 +0300
Subject: [PATCH 235/252] IDEA-197665 Decompiler decompiles references to
 static fields inside class incorrectly

---
 .../attr/StructLocalVariableTableAttribute.java |   9 +++------
 testData/classes/pkg/TestStaticNameClash.class  | Bin 351 -> 443 bytes
 testData/results/TestStaticNameClash.dec        |   4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
index 1c80ef0..15fb317 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
@@ -1,14 +1,11 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -67,7 +64,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
   }
 
   public boolean containsName(String name) {
-    return localVariables.stream().anyMatch(v -> v.name == name);
+    return localVariables.stream().anyMatch(v -> Objects.equals(v.name, name));
   }
 
   public Map<Integer, String> getMapParamNames() {
diff --git a/testData/classes/pkg/TestStaticNameClash.class b/testData/classes/pkg/TestStaticNameClash.class
index 1573836f0fc84d5481c052752a2de61e3671342b..7ae890ef6e32e8ec6d51d80c0b8361f6b4375d7d 100644
GIT binary patch
delta 197
zcmcc5w3}J#)W2Q(7#J8#7{s_3SQvyj8JHP_*%?IG8AK;adC3X+<R>TQge4YbCMM;i
zhJXl029}bH%wk3cNuP;(#Tl(9CM~PhXJ7<E1_oBG?F@_?fea=FE+EMU7G!4N2C{h|
z3V<{(kjKfu$G{I1;RLdcfiy((W(FpNW-g#13=AAVM{%MUzzQ^$0jNO$NHQ@90sw!f
B7&rg`

delta 125
zcmdnZe4k0`)W2Q(7#J8#7=*bPSQz*@8JHOa*ck-b8H6TEc}<+NBwUt(5eOL=Shcn@
zFm41g7#X;LBpX<enSqmmn}G+&<^+l<0%?fS%?wNkrCbb5KuHdu@ti<uULc!^fe!$Q
CzYM?t

diff --git a/testData/results/TestStaticNameClash.dec b/testData/results/TestStaticNameClash.dec
index 230983e..1c0f21a 100644
--- a/testData/results/TestStaticNameClash.dec
+++ b/testData/results/TestStaticNameClash.dec
@@ -3,8 +3,8 @@ package pkg;
 public class TestStaticNameClash {
    public static String property;
 
-   public static void setProperty(String var0) {
-      property = var0;// 8
+   public static void setProperty(String property) {
+      TestStaticNameClash.property = property;// 8
    }// 9
 }
 

From 2c2b00b3695bad04056352d80be39c0e53999f0a Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Tue, 18 Dec 2018 17:56:53 +0300
Subject: [PATCH 236/252] cleanup: remove redundant casts

---
 .../java/decompiler/main/rels/LambdaProcessor.java        | 4 ++--
 .../java/decompiler/modules/decompiler/ExprProcessor.java | 3 +--
 .../decompiler/modules/decompiler/IdeaNotNullHelper.java  | 7 +++----
 .../decompiler/modules/decompiler/exps/VarExprent.java    | 8 +++-----
 .../jetbrains/java/decompiler/struct/StructMethod.java    | 2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
index 26f3565..fd0f261 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -38,7 +38,7 @@ public class LambdaProcessor {
     }
 
     StructBootstrapMethodsAttribute bootstrap =
-      (StructBootstrapMethodsAttribute)cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
+      cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
     if (bootstrap == null || bootstrap.getMethodsNumber() == 0) {
       return; // no bootstrap constants in pool
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 2b97f00..966cd44 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -269,8 +269,7 @@ public class ExprProcessor implements CodeConstants {
   public void processBlock(BasicBlockStatement stat, PrimitiveExprsList data, StructClass cl) {
 
     ConstantPool pool = cl.getPool();
-    StructBootstrapMethodsAttribute bootstrap =
-      (StructBootstrapMethodsAttribute)cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
+    StructBootstrapMethodsAttribute bootstrap = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
 
     BasicBlock block = stat.getBlock();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
index 4e26c7f..f164286 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -73,7 +73,7 @@ public class IdeaNotNullHelper {
 
             // parameter annotations
             StructAnnotationParameterAttribute param_annotations =
-              (StructAnnotationParameterAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
+              mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
             if (param_annotations != null) {
 
               List<List<AnnotationExprent>> param_annotations_lists = param_annotations.getParamAnnotations();
@@ -155,8 +155,7 @@ public class IdeaNotNullHelper {
     boolean is_notnull_check = false;
 
     // method annotation, refers to the return value
-    StructAnnotationAttribute attr =
-      (StructAnnotationAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
+    StructAnnotationAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
     if (attr != null) {
       List<AnnotationExprent> annotations = attr.getAnnotations();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index 8c2a553..f30082e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -143,8 +141,8 @@ public class VarExprent extends Exprent {
         if (originalIndex != null) {
           // first try from signature
           if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-            StructLocalVariableTypeTableAttribute attr = (StructLocalVariableTypeTableAttribute)method.methodStruct
-              .getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+            StructLocalVariableTypeTableAttribute attr =
+              method.methodStruct.getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
             if (attr != null) {
               String signature = attr.getSignature(originalIndex, visibleOffset);
               if (signature != null) {
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index ae6343d..859805c 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -380,7 +380,7 @@ public class StructMethod extends StructMember {
   }
 
   public StructLocalVariableTableAttribute getLocalVariableAttr() {
-    return (StructLocalVariableTableAttribute)getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+    return getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
   }
 
   @Override

From eda6ab8d84d34b60b2a9a7398b2aa5c4b0d07eba Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Thu, 17 Jan 2019 13:47:27 +0700
Subject: [PATCH 237/252] Fixed integer multiplication in long context

---
 src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 15a4898..ca63ad5 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -65,7 +65,7 @@ public class ClassWrapper {
             MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, md, varProc, DecompilerContext.getCurrentContext());
 
             Thread mtThread = new Thread(mtProc, "Java decompiler");
-            long stopAt = System.currentTimeMillis() + maxSec * 1000;
+            long stopAt = System.currentTimeMillis() + maxSec * 1000L;
 
             mtThread.start();
 

From 1cdee1fbf4a3cce13ee8116370686ce87a52a075 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 23 Jan 2019 15:39:37 +0300
Subject: [PATCH 238/252] cleanup: make fields final

---
 .../decompiler/modules/decompiler/FinallyProcessor.java     | 6 +++---
 .../decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java | 2 +-
 .../modules/decompiler/sforms/FlattenStatementsHelper.java  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index 7a431d7..240ee3e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -547,11 +547,11 @@ public class FinallyProcessor {
                                   Map<BasicBlock, Boolean> mapLast,
                                   boolean skippedFirst) {
     class BlockStackEntry {
-      public BasicBlock blockCatch;
-      public BasicBlock blockSample;
+      public final BasicBlock blockCatch;
+      public final BasicBlock blockSample;
 
       // TODO: correct handling (merging) of multiple paths
-      public List<int[]> lstStoreVars;
+      public final List<int[]> lstStoreVars;
 
       BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) {
         this.blockCatch = blockCatch;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
index 4017b3e..7fecbd9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
@@ -16,7 +16,7 @@ public class IrreducibleCFGDeobfuscator {
   public static boolean isStatementIrreducible(Statement statement) {
 
     class Node {
-      public Integer id;
+      public final Integer id;
       public final Set<Node> preds = new HashSet<>();
       public final Set<Node> succs = new HashSet<>();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
index 2db1e30..b9abd11 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
@@ -56,9 +56,9 @@ public class FlattenStatementsHelper {
   private void flattenStatement() {
 
     class StatementStackEntry {
-      public Statement statement;
-      public LinkedList<StackEntry> stackFinally;
-      public List<Exprent> tailExprents;
+      public final Statement statement;
+      public final LinkedList<StackEntry> stackFinally;
+      public final List<Exprent> tailExprents;
 
       public int statementIndex;
       public int edgeIndex;

From a0a8f0a8dd777a7010958474acbca857071ee941 Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Wed, 6 Mar 2019 14:22:46 +0300
Subject: [PATCH 239/252] IDEA-208443 Java decompiler not correctly decompiling
 string concatenation with recent Java

---
 .../java/decompiler/code/CodeConstants.java   |  20 +++++++------
 .../java/decompiler/struct/StructClass.java   |  22 ++++----------
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 .../java11/TestJava11StringConcat.class       | Bin 0 -> 874 bytes
 testData/results/TestJava11StringConcat.dec   |  27 ++++++++++++++++++
 .../src/java11/TestJava11StringConcat.java    |  26 +++++++++++++++++
 6 files changed, 71 insertions(+), 27 deletions(-)
 create mode 100644 testData/classes/java11/TestJava11StringConcat.class
 create mode 100644 testData/results/TestJava11StringConcat.dec
 create mode 100644 testData/src/java11/TestJava11StringConcat.java

diff --git a/src/org/jetbrains/java/decompiler/code/CodeConstants.java b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
index a8f9f36..720d2a7 100644
--- a/src/org/jetbrains/java/decompiler/code/CodeConstants.java
+++ b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 @SuppressWarnings({"unused", "SpellCheckingInspection"})
@@ -9,12 +7,16 @@ public interface CodeConstants {
   // BYTECODE VERSIONS
   // ----------------------------------------------------------------------
 
-  int BYTECODE_JAVA_LE_4 = 1;
-  int BYTECODE_JAVA_5 = 2;
-  int BYTECODE_JAVA_6 = 3;
-  int BYTECODE_JAVA_7 = 4;
-  int BYTECODE_JAVA_8 = 5;
-  int BYTECODE_JAVA_9 = 6;
+  int BYTECODE_JAVA_LE_4 = 48;
+  int BYTECODE_JAVA_5 = 49;
+  int BYTECODE_JAVA_6 = 50;
+  int BYTECODE_JAVA_7 = 51;
+  int BYTECODE_JAVA_8 = 52;
+  int BYTECODE_JAVA_9 = 53;
+  int BYTECODE_JAVA_10 = 54;
+  int BYTECODE_JAVA_11 = 55;
+  int BYTECODE_JAVA_12 = 56;
+  int BYTECODE_JAVA_13 = 57;
 
   // ----------------------------------------------------------------------
   // VARIABLE TYPES
diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
index 5815c89..02bb74a 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -157,28 +157,16 @@ public class StructClass extends StructMember {
   }
 
   public boolean isVersionGE_1_5() {
-    return (majorVersion > 48 || (majorVersion == 48 && minorVersion > 0)); // FIXME: check second condition
+    return (majorVersion > CodeConstants.BYTECODE_JAVA_LE_4 ||
+            (majorVersion == CodeConstants.BYTECODE_JAVA_LE_4 && minorVersion > 0)); // FIXME: check second condition
   }
 
   public boolean isVersionGE_1_7() {
-    return (majorVersion >= 51);
+    return (majorVersion >= CodeConstants.BYTECODE_JAVA_7);
   }
 
   public int getBytecodeVersion() {
-    switch (majorVersion) {
-      case 53:
-        return CodeConstants.BYTECODE_JAVA_9;
-      case 52:
-        return CodeConstants.BYTECODE_JAVA_8;
-      case 51:
-        return CodeConstants.BYTECODE_JAVA_7;
-      case 50:
-        return CodeConstants.BYTECODE_JAVA_6;
-      case 49:
-        return CodeConstants.BYTECODE_JAVA_5;
-    }
-
-    return CodeConstants.BYTECODE_JAVA_LE_4;
+    return majorVersion < CodeConstants.BYTECODE_JAVA_LE_4 ? CodeConstants.BYTECODE_JAVA_LE_4 : majorVersion;
   }
 
   @Override
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 927e10a..1d0dc62 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -74,6 +74,7 @@ public class SingleClassesTest {
            "pkg/TestShadowingSuperClass"); }
   @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
   @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
+  @Test public void testJava11StringConcat() { doTest("java11/TestJava11StringConcat"); }
   @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
   @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
   @Test public void testConstructorReference() { doTest("pkg/TestConstructorReference"); }
diff --git a/testData/classes/java11/TestJava11StringConcat.class b/testData/classes/java11/TestJava11StringConcat.class
new file mode 100644
index 0000000000000000000000000000000000000000..8ec1fbd7849ee94217014605f9d8e94f18806fb7
GIT binary patch
literal 874
zcmaJ<QBM;=5dNmLy>b+ahyv0gXpvS@oAbq(8Xs&z#8i1`qYpl9+YKB&cAL8`3ID{O
zp-(1#@CW##jI-P&oN)0TW@hKU@0;0~{rzYD3&1NJxF}$CjpOw-5FR?%aIi@zzVVfB
z-VzoX&Ci5<SC1v3(({%4G`kqea3F>OX9`9}#v>dwdgtO&v;(0|+kF%I>a=s*yqilH
zFA1-+7%9TZ@LY~eCsV`i>sdIGN4{-gd%!Jx;NqSa7w&2`66S^Nr;H*T!s<J%O=Lnb
z{V2_u9!HfTwn}(Z#x|Bps9L{Fs9B2VwX+3T=H`lVcP?t!A>@b%8y8|C<I-PzbH-6*
zgfbCfu|X|rwOZ74@Yt4mN~qsR`RY<nWHPi^;7E*&4zC>S^Co&)Pi9j>`B*6#b^{Sb
zl2yN@=a*>2w|g(tIFM02CU#OYO%{{N{6idEO=SlBYYLySl|-T|f}rmk*>UiUuz%-%
zS-lZ<{*S{R^87&Ux4_Snm&vxory6@=UwHl#^n(K)Guz^I(!OLDOKdH47da*arNio+
zLwvu5UT0hx%L#gqv3W);9#&g(%exKV<m3tia;V@5dzXp3sB@=VxX0%e{$m@se{CQ9
E1#6ww-~a#s

literal 0
HcmV?d00001

diff --git a/testData/results/TestJava11StringConcat.dec b/testData/results/TestJava11StringConcat.dec
new file mode 100644
index 0000000..68ab9c2
--- /dev/null
+++ b/testData/results/TestJava11StringConcat.dec
@@ -0,0 +1,27 @@
+package java11;
+
+public class TestJava11StringConcat {
+   public String test1(String var1, int var2) {
+      return var1 + var2;// 20
+   }
+
+   public String test2(String var1, int var2, Object var3) {
+      return "(" + var1 + "-" + var2 + "---" + var3 + ")";// 24
+   }
+}
+
+class 'java11/TestJava11StringConcat' {
+   method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
+      2      4
+      7      4
+   }
+
+   method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
+      3      8
+      8      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+24 <-> 9
diff --git a/testData/src/java11/TestJava11StringConcat.java b/testData/src/java11/TestJava11StringConcat.java
new file mode 100644
index 0000000..3f9e040
--- /dev/null
+++ b/testData/src/java11/TestJava11StringConcat.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package java11;
+
+public class TestJava11StringConcat {
+  public String test1(String prefix, int a) {
+    return prefix + a;
+  }
+
+  public String test2(String var, int b, Object c) {
+    return "(" + var + "-" + b + "---" + c + ")";
+  }
+}
\ No newline at end of file

From df035f43441eed4e9d63bdff1ebead38866446b0 Mon Sep 17 00:00:00 2001
From: Leon Linhart <themrmilchmann@gmail.com>
Date: Thu, 7 Mar 2019 17:33:13 +0100
Subject: [PATCH 240/252] decompiler: Recognize enum as keyword on Java 5

---
 src/org/jetbrains/java/decompiler/util/TextUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 10e3991..3d92d2e 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -70,7 +70,7 @@ public class TextUtil {
   }
 
   private static boolean isKeyword(String id, int version) {
-    return KEYWORDS.contains(id) || version > CodeConstants.BYTECODE_JAVA_5 && "enum".equals(id);
+    return KEYWORDS.contains(id) || version >= CodeConstants.BYTECODE_JAVA_5 && "enum".equals(id);
   }
 
   public static String getInstructionName(int opcode) {

From 0cf8fc49d02282c880a145ba5eebed810024ff63 Mon Sep 17 00:00:00 2001
From: Artemiy Sartakov <Artemiy.Sartakov@jetbrains.com>
Date: Mon, 8 Apr 2019 18:37:32 +0700
Subject: [PATCH 241/252] IfStatementMissingBreakInLoopInspection: added break
 if iterations have no effect after condition is met (IDEA-210094)

---
 .../java/decompiler/modules/decompiler/IdeaNotNullHelper.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
index f164286..9598b3c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
@@ -93,6 +93,7 @@ public class IdeaNotNullHelper {
                     for (AnnotationExprent ann : annotations) {
                       if (ann.getClassName().equals("org/jetbrains/annotations/NotNull")) {
                         is_notnull_check = true;
+                        break;
                       }
                     }
                   }
@@ -162,6 +163,7 @@ public class IdeaNotNullHelper {
       for (AnnotationExprent ann : annotations) {
         if (ann.getClassName().equals("org/jetbrains/annotations/NotNull")) {
           is_notnull_check = true;
+          break;
         }
       }
     }

From f9c29f0c92c82ecf18c9b22b5e530cfe446aa593 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 13 May 2019 15:57:11 +0300
Subject: [PATCH 242/252] add PECS wildcards to method signatures where
 necessary and where methods are not overridden by plugins

GitOrigin-RevId: 1ec7f1a1aa17d2d4f42e647207323ab8a3138683
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 3c6b14d..08223cf 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index a6369f5..41b5a9a 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 684249e..120470d 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<File> list, String path) {
+  private static void addPath(List<? super File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 1b91f44..da17532 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index c235387..1232e64 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index 6f33885..aa2fae8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index e57e9ef..b5e8213 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index e295915..58eda68 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 45ca557..3e4e1f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From 042f6bd9a71e25442379e7822c2f971286a99dc0 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 14 May 2019 15:27:32 +0300
Subject: [PATCH 243/252] migrate to StringUtil.toLower/UpperCase, ENGLISH
 locale

GitOrigin-RevId: 3a8627e7aef5991ee840996c6f7f147d1f747a3b
---
 src/org/jetbrains/java/decompiler/main/Fernflower.java          | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 37a7db1..692c1b6 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 93b3de7..4949a00 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
              value.length() > 255 - ".class".length());
   }
 

From c66c8fc54ea567a502905010f6a6792ebefac32f Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Mon, 6 May 2019 23:01:12 +0200
Subject: [PATCH 244/252] IDEA-210281 Cleanup Gradle settings: separate Runner
 configurable removed

GitOrigin-RevId: adbc39121fe91beb633e125b4cf39bfe0a422e4b
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 src/org/jetbrains/java/decompiler/main/Fernflower.java        | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 08223cf..3c6b14d 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 41b5a9a..a6369f5 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 692c1b6..37a7db1 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 120470d..684249e 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<? super File> list, String path) {
+  private static void addPath(List<File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index da17532..1b91f44 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index 1232e64..c235387 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index aa2fae8..6f33885 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index b5e8213..e57e9ef 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 58eda68..e295915 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 4949a00..93b3de7 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
              value.length() > 255 - ".class".length());
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 3e4e1f1..45ca557 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From c25785846b9a8a43fff5a3b2f22a60928342bc01 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Wed, 15 May 2019 13:31:00 +0200
Subject: [PATCH 245/252] Merge branch 'master' into amakeev/gradle

# Conflicts:
#	community/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java

GitOrigin-RevId: d931e798108685731bf185f7c2e3221680b8e5a2
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 3c6b14d..08223cf 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index a6369f5..41b5a9a 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 684249e..120470d 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<File> list, String path) {
+  private static void addPath(List<? super File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 1b91f44..da17532 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index c235387..1232e64 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index 6f33885..aa2fae8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index e57e9ef..b5e8213 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index e295915..58eda68 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 45ca557..3e4e1f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From 24a695344efc7a197848affde9a4dec17751f9b9 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Thu, 16 May 2019 14:00:10 +0200
Subject: [PATCH 246/252] Merge remote-tracking branch 'origin/master' into
 amakeev/gradle

GitOrigin-RevId: f9a633252daf311ecab19002c0f4757052eee9dc
---
 src/org/jetbrains/java/decompiler/main/Fernflower.java          | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 37a7db1..692c1b6 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 93b3de7..4949a00 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
              value.length() > 255 - ".class".length());
   }
 

From d05fff192fa6aa9b850deaed28c91b001331df69 Mon Sep 17 00:00:00 2001
From: Alexandr Suhinin <alexandr.suhinin@jetbrains.com>
Date: Mon, 13 May 2019 15:56:13 +0300
Subject: [PATCH 247/252] [duplicates] enable duplicates analysis in
 PyCharm/WebStorm/PhpStorm/RubyMine

GitOrigin-RevId: 1545b79fdca4888f4b94f47f22703fd37694fa7a
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 src/org/jetbrains/java/decompiler/main/Fernflower.java        | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 08223cf..3c6b14d 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 41b5a9a..a6369f5 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 692c1b6..37a7db1 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 120470d..684249e 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<? super File> list, String path) {
+  private static void addPath(List<File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index da17532..1b91f44 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index 1232e64..c235387 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index aa2fae8..6f33885 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index b5e8213..e57e9ef 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 58eda68..e295915 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 4949a00..93b3de7 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
              value.length() > 255 - ".class".length());
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 3e4e1f1..45ca557 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From 89e9a42b63aa2f329d94c1d8907d0ef42e9a2831 Mon Sep 17 00:00:00 2001
From: Aleksey Rostovskiy <aleksey.rostovskiy@jetbrains.com>
Date: Mon, 27 May 2019 14:04:25 +0300
Subject: [PATCH 248/252] get rid of intellij.build.toolbox.litegen parameter
 and use BuildOptions.TOOLBOX_LITE_GEN_STEP to skip it instead

GitOrigin-RevId: 9aac8ee4ed1ebf2a29de18a238825fafb1ab88f9
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 src/org/jetbrains/java/decompiler/main/Fernflower.java        | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 3c6b14d..08223cf 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index a6369f5..41b5a9a 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 37a7db1..692c1b6 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 684249e..120470d 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<File> list, String path) {
+  private static void addPath(List<? super File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 1b91f44..da17532 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index c235387..1232e64 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index 6f33885..aa2fae8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index e57e9ef..b5e8213 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index e295915..58eda68 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 93b3de7..4949a00 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
              value.length() > 255 - ".class".length());
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 45ca557..3e4e1f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From 20d0e0f1e59b00d73e484e3ee74c28f0c2a12a39 Mon Sep 17 00:00:00 2001
From: Egor Zhdan <egor.zhdan@jetbrains.com>
Date: Thu, 4 Apr 2019 18:16:43 +0300
Subject: [PATCH 249/252] Cleanup: NotNull/Nullable

GitOrigin-RevId: b8e892f32ea84c2115973155dba7127b892cc36e
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 src/org/jetbrains/java/decompiler/main/Fernflower.java        | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 08223cf..3c6b14d 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 41b5a9a..a6369f5 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 692c1b6..37a7db1 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 120470d..684249e 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<? super File> list, String path) {
+  private static void addPath(List<File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index da17532..1b91f44 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index 1232e64..c235387 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index aa2fae8..6f33885 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index b5e8213..e57e9ef 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 58eda68..e295915 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 4949a00..93b3de7 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
              value.length() > 255 - ".class".length());
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 3e4e1f1..45ca557 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From a431a3c93e83c701fe0a13b943e27e11c9e86fe5 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 12 Jun 2019 12:40:39 +0200
Subject: [PATCH 250/252] constructor reference: don't ignore constructor
 parameters during method reference inference (IDEA-185578)

GitOrigin-RevId: e836468e05db28157713e9edd3c70382f8ecdebc
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 src/org/jetbrains/java/decompiler/main/Fernflower.java        | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 3c6b14d..08223cf 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index a6369f5..41b5a9a 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 37a7db1..692c1b6 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 684249e..120470d 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<File> list, String path) {
+  private static void addPath(List<? super File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 1b91f44..da17532 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index c235387..1232e64 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index 6f33885..aa2fae8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index e57e9ef..b5e8213 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index e295915..58eda68 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 93b3de7..4949a00 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
              value.length() > 255 - ".class".length());
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 45ca557..3e4e1f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From 88db2ab37af824e29e14bb5159784f998c4f259c Mon Sep 17 00:00:00 2001
From: Egor Zhdan <egor.zhdan@jetbrains.com>
Date: Thu, 4 Apr 2019 18:16:43 +0300
Subject: [PATCH 251/252] Cleanup: NotNull/Nullable

GitOrigin-RevId: b8e892f32ea84c2115973155dba7127b892cc36e
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 src/org/jetbrains/java/decompiler/main/Fernflower.java        | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 08223cf..3c6b14d 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 41b5a9a..a6369f5 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 692c1b6..37a7db1 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 120470d..684249e 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<? super File> list, String path) {
+  private static void addPath(List<File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index da17532..1b91f44 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index 1232e64..c235387 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index aa2fae8..6f33885 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index b5e8213..e57e9ef 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 58eda68..e295915 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 4949a00..93b3de7 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
              value.length() > 255 - ".class".length());
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 3e4e1f1..45ca557 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }

From e2d2701ca9654d146438bde5c797da5939b543aa Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Sat, 8 Jun 2019 15:31:49 +0300
Subject: [PATCH 252/252] EditorConfig documentation test

GitOrigin-RevId: fd52ace3d7a32ecd02c2c5ab90e077967604c15e
---
 .../jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java  | 2 +-
 .../java/decompiler/main/ClassReference14Processor.java       | 2 +-
 src/org/jetbrains/java/decompiler/main/Fernflower.java        | 2 +-
 .../java/decompiler/main/decompiler/ConsoleDecompiler.java    | 2 +-
 .../java/decompiler/main/rels/NestedClassProcessor.java       | 2 +-
 .../decompiler/modules/decompiler/StackVarsProcessor.java     | 2 +-
 .../decompiler/modules/decompiler/sforms/DirectGraph.java     | 2 +-
 .../java/decompiler/modules/decompiler/stats/Statement.java   | 4 ++--
 .../decompiler/modules/decompiler/vars/VarVersionsGraph.java  | 2 +-
 .../java/decompiler/modules/renamer/ConverterHelper.java      | 2 +-
 .../java/decompiler/struct/gen/generics/GenericMain.java      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 3c6b14d..08223cf 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -745,7 +745,7 @@ public class ControlFlowGraph implements CodeConstants {
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
 
     LinkedList<BasicBlock> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index a6369f5..41b5a9a 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -74,7 +74,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<ClassWrapper> setFound) {
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
     ClassWrapper wrapper = node.getWrapper();
 
     // search code
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index 37a7db1..692c1b6 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,7 +32,7 @@ public class Fernflower implements IDecompiledData {
     String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
     if (level != null) {
       try {
-        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
       }
       catch (IllegalArgumentException ignore) { }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 684249e..120470d 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -83,7 +83,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<File> list, String path) {
+  private static void addPath(List<? super File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 1b91f44..da17532 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -798,7 +798,7 @@ public class NestedClassProcessor {
     return null;
   }
 
-  private static Statement getDefStatement(Statement stat, VarType classType, Set<Statement> setStats) {
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
     List<Exprent> lst = new ArrayList<>();
     Statement retStat = null;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index c235387..1232e64 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -525,7 +525,7 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index 6f33885..aa2fae8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -39,7 +39,7 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
 
     LinkedList<DirectNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index e57e9ef..b5e8213 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -546,7 +546,7 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
 
     LinkedList<Statement> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
@@ -589,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index e295915..58eda68 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -99,7 +99,7 @@ public class VarVersionsGraph {
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, Set<VarVersionNode> setVisited) {
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
     Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
     LinkedList<VarVersionNode> stackNode = new LinkedList<>();
     LinkedList<Integer> stackIndex = new LinkedList<>();
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 93b3de7..4949a00 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -33,7 +33,7 @@ public class ConverterHelper implements IIdentifierRenamer {
            !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
            KEYWORDS.contains(value) ||
            elementType == Type.ELEMENT_CLASS && (
-             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.US)) ||
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
              value.length() > 255 - ".class".length());
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 45ca557..3e4e1f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -95,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }