LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 23:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: AS decompilation - Gotos handling vs and/or

Browse Source
This commit is contained in:
Jindra Petřík
2021-04-05 16:56:59 +02:00
parent a52a4206ca
commit f6459bb740
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
+4 -1
View File
@@ -2048,8 +2048,11 @@ public class Graph {
boolean parseNext = true;
//****************************DECOMPILING PART*************
GraphPartMarkedArrayList<GraphTargetItem> output = new GraphPartMarkedArrayList<>();
if (stack.isEmpty() && (currentRet instanceof GraphPartMarkedArrayList)) {
((GraphPartMarkedArrayList) currentRet).clearCurrentParts();
}
GraphPartMarkedArrayList<GraphTargetItem> output = new GraphPartMarkedArrayList<>();
output.startPart(part);
if (currentRet instanceof GraphPartMarkedArrayList) {
((GraphPartMarkedArrayList) currentRet).startPart(part);
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphPartMarkedArrayList.java
+24 -14
View File
@@ -10,19 +10,19 @@ import java.util.List;
*/
public class GraphPartMarkedArrayList<E> extends ArrayList<E> {
private List<GraphPart> listParts = new ArrayList<>();
private GraphPart currentPart = null;
private List<List<GraphPart>> listParts = new ArrayList<>();
private List<GraphPart> currentParts = new ArrayList<>();
public GraphPartMarkedArrayList(Collection<? extends E> collection) {
super(collection);
if (collection instanceof GraphPartMarkedArrayList) {
for (int i = 0; i < collection.size(); i++) {
listParts.add((GraphPart) ((GraphPartMarkedArrayList) collection).listParts.get(i));
listParts.add((List<GraphPart>) ((GraphPartMarkedArrayList) collection).listParts.get(i));
}
currentPart = ((GraphPartMarkedArrayList) collection).currentPart;
currentParts = ((GraphPartMarkedArrayList) collection).currentParts;
} else {
for (int i = 0; i < collection.size(); i++) {
listParts.add(currentPart);
listParts.add(currentParts);
}
}
}
@@ -31,38 +31,48 @@ public class GraphPartMarkedArrayList<E> extends ArrayList<E> {
}
public void startPart(GraphPart part) {
currentPart = part;
currentParts.add(part);
}
public void clearCurrentParts() {
currentParts = new ArrayList<>();
}
@Override
public boolean add(E e) {
listParts.add(currentPart);
listParts.add(currentParts);
return super.add(e);
}
@Override
public void add(int index, E element) {
listParts.add(index, currentPart);
listParts.add(index, currentParts);
super.add(index, element);
}
public GraphPart getPartAt(int index) {
public List<GraphPart> getPartsAt(int index) {
return listParts.get(index);
}
public int indexOfPart(GraphPart part) {
return listParts.indexOf(part);
for (int i = 0; i < listParts.size(); i++) {
List<GraphPart> list = listParts.get(i);
if (list.indexOf(part) > -1) {
return i;
}
}
return -1;
}
@Override
public boolean addAll(Collection<? extends E> c) {
if (c instanceof GraphPartMarkedArrayList) {
for (int i = 0; i < c.size(); i++) {
listParts.add((GraphPart) ((GraphPartMarkedArrayList) c).listParts.get(i));
listParts.add((List<GraphPart>) ((GraphPartMarkedArrayList) c).listParts.get(i));
}
} else {
for (int i = 0; i < c.size(); i++) {
listParts.add(currentPart);
listParts.add(currentParts);
}
}
return super.addAll(c);
@@ -72,11 +82,11 @@ public class GraphPartMarkedArrayList<E> extends ArrayList<E> {
public boolean addAll(int index, Collection<? extends E> c) {
if (c instanceof GraphPartMarkedArrayList) {
for (int i = 0; i < c.size(); i++) {
listParts.add(index + i, (GraphPart) ((GraphPartMarkedArrayList) c).listParts.get(i));
listParts.add(index + i, (List<GraphPart>) ((GraphPartMarkedArrayList) c).listParts.get(i));
}
} else {
for (int i = 0; i < c.size(); i++) {
listParts.add(index + i, currentPart);
listParts.add(index + i, currentParts);
}
}
return super.addAll(index, c);