LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-10 23:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3 Direct editing fix - saving local register names

Browse Source
This commit is contained in:
Jindra Petřík
2016-09-18 09:35:44 +02:00
parent 790d1070ed
commit 6d6d4f0d40
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
View File

@@ -1628,8 +1628,10 @@ public class AVM2SourceGenerator implements SourceGenerator {
}
String mask = Configuration.registerNameFormat.get();
mask = mask.replace("%d", "([0-9]+)");
Pattern pat = Pattern.compile(mask);
String maskRegexp = mask.replace("%d", "([0-9]+)");
Pattern pat = Pattern.compile(maskRegexp);
final String UNUSED = "~~unused";
//Two rounds
for (int round = 1; round <= 2; round++) {
@@ -1644,11 +1646,10 @@ public class AVM2SourceGenerator implements SourceGenerator {
if ((round == 1) && (m.matches())) {
String regIndexStr = m.group(1);
int regIndex = Integer.parseInt(regIndexStr);
while (registerNames.size() <= regIndex + 1) {
String standardName = String.format(mask, registerNames.size() - 1);
registerNames.add(standardName);
while (registerNames.size() <= regIndex) {
registerNames.add(UNUSED);
registerTypes.add("*");
slotNames.add(standardName);
slotNames.add(UNUSED);
slotTypes.add("*");
registerLines.add(paramLine);
}
@@ -1659,11 +1660,26 @@ public class AVM2SourceGenerator implements SourceGenerator {
registerLines.set(regIndex, n.line);
} //in second round the rest
else if (round == 2 && !m.matches()) {
registerNames.add(n.getVariableName());
registerTypes.add(n.type.toString());
slotNames.add(n.getVariableName());
slotTypes.add(n.type.toString());
registerLines.add(n.line);
int newRegIndex = -1;
for (int j = 0; j < registerNames.size(); j++) {
if (UNUSED.equals(registerNames.get(j))) {
newRegIndex = j;
break;
}
}
if (newRegIndex == -1) {
newRegIndex = registerNames.size();
registerNames.add(UNUSED);
registerTypes.add("*");
slotNames.add(UNUSED);
slotTypes.add("*");
registerLines.add(paramLine);
}
registerNames.set(newRegIndex, n.getVariableName());
registerTypes.set(newRegIndex, n.type.toString());
slotNames.set(newRegIndex, n.getVariableName());
slotTypes.set(newRegIndex, n.type.toString());
registerLines.set(newRegIndex, n.line);
}
}
}
@@ -1671,6 +1687,14 @@ public class AVM2SourceGenerator implements SourceGenerator {
}
}
for (int j = 0; j < registerNames.size(); j++) {
if (UNUSED.equals(registerNames.get(j))) {
String standardName = String.format(mask, j);
registerNames.set(j, standardName);
slotNames.set(j, standardName);
}
}
int slotScope = subMethod ? 0 : 1;
for (AssignableAVM2Item an : subvariables) {