Skip to content

Commit bb35239

Browse files
committed
Add a shorter constructor for LocalVariableEntry
1 parent baf2897 commit bb35239

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

enigma/src/main/java/org/quiltmc/enigma/api/stats/StatsGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public StatsResult generate(Set<StatType> includedTypes, ClassEntry classEntry,
194194
if (!(argument.getAccess().isSynthetic() && !includeSynthetic)
195195
// skip the implicit superclass parameter for non-static inner class constructors
196196
&& !(method.isConstructor() && containingClass.isInnerClass() && index == 1 && argument.containsType() && argument.getTypeEntry().equals(containingClass.getOuterClass()))) {
197-
this.update(StatType.PARAMETERS, mappableCounts, unmappedCounts, new LocalVariableEntry(method, index, "", true, null));
197+
this.update(StatType.PARAMETERS, mappableCounts, unmappedCounts, new LocalVariableEntry(method, index));
198198
}
199199

200200
index += argument.getSize();

enigma/src/main/java/org/quiltmc/enigma/api/translation/mapping/serde/enigma/EnigmaMappingsReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ private static MappingPair<LocalVariableEntry, RawEntryMapping> parseArgument(@N
310310
throw new RuntimeException("Method arg must be a child of a method!");
311311
}
312312

313-
LocalVariableEntry obfuscatedEntry = new LocalVariableEntry(ownerEntry, Integer.parseInt(tokens[1]), "", true, null);
313+
LocalVariableEntry obfuscatedEntry = new LocalVariableEntry(ownerEntry, Integer.parseInt(tokens[1]));
314314
String mapping = tokens[2];
315315

316316
return new MappingPair<>(obfuscatedEntry, new RawEntryMapping(mapping));

enigma/src/main/java/org/quiltmc/enigma/api/translation/mapping/serde/tinyv2/TinyV2Reader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private MappingPair<LocalVariableEntry, RawEntryMapping> parseArgument(MappingPa
265265

266266
// tokens[2] is the useless obf name
267267

268-
LocalVariableEntry obfuscatedEntry = new LocalVariableEntry(ownerMethod, variableIndex, "", true, null);
268+
LocalVariableEntry obfuscatedEntry = new LocalVariableEntry(ownerMethod, variableIndex);
269269
if (tokens.length <= 3) {
270270
return new MappingPair<>(obfuscatedEntry);
271271
}

enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/LocalVariableEntry.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ public LocalVariableEntry(MethodEntry parent, int index, String name, boolean pa
2222
this.parameter = parameter;
2323
}
2424

25+
public LocalVariableEntry(MethodEntry parent, int index) {
26+
this(parent, index, "", true, null);
27+
}
28+
2529
@Override
2630
public Class<MethodEntry> getParentType() {
2731
return MethodEntry.class;

enigma/src/main/java/org/quiltmc/enigma/api/translation/representation/entry/MethodEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public List<LocalVariableEntry> getParameters(EntryIndex index) {
6363
int i = flags.isStatic() ? 0 : 1;
6464

6565
for (ArgumentDescriptor arg : this.descriptor.getArgumentDescs()) {
66-
LocalVariableEntry argEntry = new LocalVariableEntry(this, i, "", true, null);
66+
LocalVariableEntry argEntry = new LocalVariableEntry(this, i);
6767
parameters.add(argEntry);
6868

6969
i += arg.getSize();

enigma/src/main/java/org/quiltmc/enigma/impl/bytecode/translator/TranslationMethodVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void visitLocalVariable(String name, String desc, String signature, Label
143143
}
144144

145145
private String translateVariableName(int index, String name) {
146-
LocalVariableEntry entry = new LocalVariableEntry(this.methodEntry, index, "", true, null);
146+
LocalVariableEntry entry = new LocalVariableEntry(this.methodEntry, index);
147147
LocalVariableEntry translatedEntry = this.translator.translate(entry);
148148
String translatedName = translatedEntry.getName();
149149

0 commit comments

Comments
 (0)