diff options
| author | md_5 <git@md-5.net> | 2018-12-06 10:00:00 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-12-06 10:00:00 +1100 |
| commit | 88d3d7481fb0d3f908ef19a220453ffbceeffc62 (patch) | |
| tree | 9a2ce100f987925e853ab65c2fb8b57eb581def6 /src/org/jetbrains/java/decompiler/struct | |
| parent | e0f22e66296eeaf1e2a9af73af0c7f9ba28521b1 (diff) | |
| download | fernflower-code-cleanup.tar fernflower-code-cleanup.tar.gz fernflower-code-cleanup.tar.lz fernflower-code-cleanup.tar.xz fernflower-code-cleanup.zip | |
Clean up old decompiler changes + add new sugaringcode-cleanup
Contains code from:
Alexandru-Constantin Bledea - Boxing
Dmitry Cherniachenko - Vararg parameters, Boxing
Egor Ushakov - Lambda, String Quoting
Lex Manos - Switch decompilation
Thinkofdeath - Formatting
Diffstat (limited to 'src/org/jetbrains/java/decompiler/struct')
| -rw-r--r-- | src/org/jetbrains/java/decompiler/struct/StructClass.java | 3 | ||||
| -rw-r--r-- | src/org/jetbrains/java/decompiler/struct/gen/VarType.java | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java index cb24ff6..13f5875 100644 --- a/src/org/jetbrains/java/decompiler/struct/StructClass.java +++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java @@ -24,6 +24,8 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil; import org.jetbrains.java.decompiler.util.VBStyleCollection; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; /* class_file { @@ -58,6 +60,7 @@ public class StructClass extends StructMember { private final String[] interfaceNames; private final VBStyleCollection<StructField, String> fields; private final VBStyleCollection<StructMethod, String> methods; + public final Map<String, Map<Integer, String>> enumSwitchMap = new HashMap<String, Map<Integer, String>>(); private ConstantPool pool; diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java index a58898a..d09ee59 100644 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java @@ -39,6 +39,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 int type; |