LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-05 15:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #270 AS3 decompilation - loop followed by try

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-13 19:23:38 +01:00
parent 09b68c1f9c
commit b84ccc7005
5 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
View File

@@ -1411,12 +1411,6 @@ public class Graph {
}
checkGetLoopsPart(part);
for (ThrowState ts : throwStates) {
if (ts.throwingParts.contains(part)) {
ts.state = 1;
}
}
if (debugGetLoops) {
System.err.println("getloops: " + part);
}
@@ -1443,26 +1437,34 @@ public class Graph {
}
}
}
if (lastP1 != null && canBeCandidate && canBeBreakCandidate(localData, part, throwStates)) {
if (lastP1.breakCandidates.contains(part)) {
lastP1.breakCandidates.add(part);
lastP1.breakCandidatesLevels.add(level);
return;
} else {
List<Loop> loops2 = new ArrayList<>(loops);
loops2.remove(lastP1);
if (!part.leadsTo(localData, this, code, lastP1.loopContinue, loops2, throwStates, true)) {
if (lastP1.breakCandidatesLocked == 0) {
if (debugGetLoops) {
System.err.println("added breakCandidate " + part + " to " + lastP1);
}
try {
if (lastP1 != null && canBeCandidate && canBeBreakCandidate(localData, part, throwStates)) {
if (lastP1.breakCandidates.contains(part)) {
lastP1.breakCandidates.add(part);
lastP1.breakCandidatesLevels.add(level);
return;
} else {
List<Loop> loops2 = new ArrayList<>(loops);
loops2.remove(lastP1);
if (!part.leadsTo(localData, this, code, lastP1.loopContinue, loops2, throwStates, true)) {
if (lastP1.breakCandidatesLocked == 0) {
if (debugGetLoops) {
System.err.println("added breakCandidate " + part + " to " + lastP1);
}
lastP1.breakCandidates.add(part);
lastP1.breakCandidatesLevels.add(level);
return;
lastP1.breakCandidates.add(part);
lastP1.breakCandidatesLevels.add(level);
return;
}
}
}
}
} finally {
for (ThrowState ts : throwStates) {
if (ts.throwingParts.contains(part)) {
ts.state = 1;
}
}
}
for (Loop el : loops) {
@@ -1586,7 +1588,7 @@ public class Graph {
GraphPart cand = currentLoop.breakCandidates.get(c);
List<Integer> candThrowStates = new ArrayList<>();
for (ThrowState ts : throwStates) {
if (ts.throwingParts.contains(cand)) {
if (ts.throwingParts.contains(cand) && ts.startPart != cand) {
if (contThrowStates.equals(candThrowStates)) {
//adding new ts
//this means breakcandidate is in nested try