diff options
| author | 2020-04-18 09:02:12 -0400 | |
|---|---|---|
| committer | 2020-04-18 14:02:12 +0100 | |
| commit | aad12650ea7394e315ebe170ceebb345c739577d (patch) | |
| tree | 130e544e082ec16be80fb17a3855dcead43af957 /src/main/java/cuchaz/enigma/source/cfr | |
| parent | Added zoom for PanelEditor (#209) (diff) | |
| download | enigma-fork-aad12650ea7394e315ebe170ceebb345c739577d.tar.gz enigma-fork-aad12650ea7394e315ebe170ceebb345c739577d.tar.xz enigma-fork-aad12650ea7394e315ebe170ceebb345c739577d.zip | |
Fix a few bugs (#219)
* Update Gradle and replace deprecated Gradle features
* Allow naming class in default package (fixes #215)
* Fix CFR crash (fixes #207)
* Update README.md
Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
Co-authored-by: liach <7806504+liach@users.noreply.github.com>
Diffstat (limited to 'src/main/java/cuchaz/enigma/source/cfr')
| -rw-r--r-- | src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java b/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java index e265d9d..09e0a9b 100644 --- a/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java +++ b/src/main/java/cuchaz/enigma/source/cfr/EnigmaDumper.java | |||
| @@ -43,7 +43,13 @@ public class EnigmaDumper implements Dumper { | |||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | private String getDesc(JavaTypeInstance type) { | 45 | private String getDesc(JavaTypeInstance type) { |
| 46 | type = type.getDeGenerifiedType(); | 46 | if (!type.isUsableType() && type != RawJavaType.VOID) { |
| 47 | throw new IllegalArgumentException(type.toString()); | ||
| 48 | } | ||
| 49 | |||
| 50 | if (type instanceof JavaGenericBaseInstance) { | ||
| 51 | return getDesc(type.getDeGenerifiedType()); | ||
| 52 | } | ||
| 47 | 53 | ||
| 48 | if (type instanceof JavaRefTypeInstance) { | 54 | if (type instanceof JavaRefTypeInstance) { |
| 49 | return "L" + type.getRawName().replace('.', '/') + ";"; | 55 | return "L" + type.getRawName().replace('.', '/') + ";"; |