diff options
| author | 2019-02-16 17:19:30 +0200 | |
|---|---|---|
| committer | 2019-02-16 17:19:30 +0200 | |
| commit | be3166db101560d96e1873a28ee34fc7618a52ed (patch) | |
| tree | fd271eaf219a7c60f5a2086eab22757acc328ce9 /src | |
| parent | Resolve HashEntryTree#getSiblings building the full ancestor path (diff) | |
| download | enigma-be3166db101560d96e1873a28ee34fc7618a52ed.tar.gz enigma-be3166db101560d96e1873a28ee34fc7618a52ed.tar.xz enigma-be3166db101560d96e1873a28ee34fc7618a52ed.zip | |
Don't save local variable entries with no mapping
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java index 1d44b6e8..8c55fa99 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java | |||
| @@ -165,7 +165,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter { | |||
| 165 | } else if (entry instanceof FieldEntry) { | 165 | } else if (entry instanceof FieldEntry) { |
| 166 | String line = writeField((FieldEntry) entry, mapping); | 166 | String line = writeField((FieldEntry) entry, mapping); |
| 167 | writer.println(indent(line, depth)); | 167 | writer.println(indent(line, depth)); |
| 168 | } else if (entry instanceof LocalVariableEntry) { | 168 | } else if (entry instanceof LocalVariableEntry && mapping != null) { |
| 169 | String line = writeArgument((LocalVariableEntry) entry, mapping); | 169 | String line = writeArgument((LocalVariableEntry) entry, mapping); |
| 170 | writer.println(indent(line, depth)); | 170 | writer.println(indent(line, depth)); |
| 171 | } | 171 | } |
| @@ -231,13 +231,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter { | |||
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | protected String writeArgument(LocalVariableEntry entry, EntryMapping mapping) { | 233 | protected String writeArgument(LocalVariableEntry entry, EntryMapping mapping) { |
| 234 | StringBuilder builder = new StringBuilder("ARG "); | 234 | return "ARG " + entry.getIndex() + ' ' + mapping.getTargetName(); |
| 235 | builder.append(entry.getIndex()).append(' '); | ||
| 236 | |||
| 237 | String mappedName = mapping != null ? mapping.getTargetName() : entry.getName(); | ||
| 238 | builder.append(mappedName); | ||
| 239 | |||
| 240 | return builder.toString(); | ||
| 241 | } | 235 | } |
| 242 | 236 | ||
| 243 | private void writeMapping(StringBuilder builder, EntryMapping mapping) { | 237 | private void writeMapping(StringBuilder builder, EntryMapping mapping) { |