LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-12 14:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #2317 AS3 direct editation - local register names colliding with parameter names

Browse Source
This commit is contained in:
Jindra Petřík
2024-09-23 20:29:16 +02:00
parent 3b3679e2cc
commit 8da8239f6a
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1209,21 +1209,32 @@ public class AVM2SourceGenerator implements SourceGenerator {
String varName = n.getVariableName();
if (!needsActivation) {
Matcher m = pat.matcher(varName);
//In first round, make all register that match standard loc_xx register
boolean addNew = false;
//In first round, make all register that match standard loc_xx register
if ((round == 1) && (m.matches())) {
String regIndexStr = m.group(1);
int regIndex = Integer.parseInt(regIndexStr);
while (registerNames.size() <= regIndex) {
registerNames.add(UNUSED);
registerTypes.add(TypeItem.UNBOUNDED);
registerLines.add(paramLine);
boolean alreadyExistsWithDifferentName = regIndex < registerNames.size()
&& !registerNames.get(regIndex).equals(UNUSED)
&& !registerNames.get(regIndex).equals(varName);
if (alreadyExistsWithDifferentName) {
addNew = true;
} else {
while (registerNames.size() <= regIndex) {
registerNames.add(UNUSED);
registerTypes.add(TypeItem.UNBOUNDED);
registerLines.add(paramLine);
}
registerNames.set(regIndex, varName);
registerTypes.set(regIndex, n.type);
registerLines.set(regIndex, n.line);
}
registerNames.set(regIndex, varName);
registerTypes.set(regIndex, n.type);
registerLines.set(regIndex, n.line);
} else if (round == 2 && !m.matches()) { //in second round the rest
addNew = true;
}
if (addNew) {
//search for some unused indices first:
int newRegIndex = -1;
for (int j = 0; j < registerNames.size(); j++) {