summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/mapping
diff options
context:
space:
mode:
authorGravatar gegy10002018-05-19 19:00:56 +0200
committerGravatar gegy10002018-05-19 19:00:56 +0200
commit93c771a890f0f73b8caebafa4667e0535703cfa2 (patch)
treecf6b3abcd5019f13151da22bc2910a6609eb75b2 /src/main/java/cuchaz/enigma/mapping
parentAnnotation + inner class translation (diff)
downloadenigma-fork-93c771a890f0f73b8caebafa4667e0535703cfa2.tar.gz
enigma-fork-93c771a890f0f73b8caebafa4667e0535703cfa2.tar.xz
enigma-fork-93c771a890f0f73b8caebafa4667e0535703cfa2.zip
Fix inner class mapping
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping')
-rw-r--r--src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java b/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java
index 196bbd6..7af1a52 100644
--- a/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java
+++ b/src/main/java/cuchaz/enigma/mapping/DirectionalTranslator.java
@@ -194,13 +194,10 @@ public class DirectionalTranslator implements Translator {
194 if (translatedArgumentName == null) { 194 if (translatedArgumentName == null) {
195 translatedArgumentName = inheritLocalVariableName(entry); 195 translatedArgumentName = inheritLocalVariableName(entry);
196 } 196 }
197 if (translatedArgumentName == null) {
198 return entry;
199 }
200 // TODO: Translating arguments calls method translation.. Can we refactor the code in such a way that we don't need this? 197 // TODO: Translating arguments calls method translation.. Can we refactor the code in such a way that we don't need this?
201 MethodDefEntry translatedOwner = getTranslatedMethodDef(entry.getOwnerEntry()); 198 MethodDefEntry translatedOwner = getTranslatedMethodDef(entry.getOwnerEntry());
202 TypeDescriptor translatedTypeDesc = getTranslatedTypeDesc(entry.getDesc()); 199 TypeDescriptor translatedTypeDesc = getTranslatedTypeDesc(entry.getDesc());
203 return new LocalVariableDefEntry(translatedOwner, entry.getIndex(), translatedArgumentName, translatedTypeDesc); 200 return new LocalVariableDefEntry(translatedOwner, entry.getIndex(), translatedArgumentName != null ? translatedArgumentName : entry.getName(), translatedTypeDesc);
204 } 201 }
205 202
206 // TODO: support not identical behavior (specific to constructor) 203 // TODO: support not identical behavior (specific to constructor)