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

Issue #137, #179 AS3 hasNext / foreach problem

Browse Source
This commit is contained in:
Jindra Petk
2013-07-06 09:28:48 +02:00
parent 172473ae70
commit 4c1e2ab841
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
View File

@@ -58,6 +58,7 @@ import com.jpexs.decompiler.flash.graph.GraphTargetItem;
import com.jpexs.decompiler.flash.graph.IfItem;
import com.jpexs.decompiler.flash.graph.Loop;
import com.jpexs.decompiler.flash.graph.LoopItem;
import com.jpexs.decompiler.flash.graph.NotItem;
import com.jpexs.decompiler.flash.graph.SwitchItem;
import com.jpexs.decompiler.flash.graph.WhileItem;
import java.util.ArrayList;
@@ -653,6 +654,47 @@ public class AVM2Graph extends Graph {
if (((SetTypeTreeItem) list.get(i)).getValue() instanceof ExceptionTreeItem) {
list.remove(i);
i--;
continue;
}
}
if (list.get(i) instanceof IfItem) {
IfItem ifi = (IfItem) list.get(i);
if (((ifi.expression instanceof HasNextTreeItem)
|| ((ifi.expression instanceof NotItem)
&& (((NotItem) ifi.expression).getOriginal() instanceof HasNextTreeItem)))) {
HasNextTreeItem hnt = null;
List<GraphTargetItem> body = new ArrayList<>();
List<GraphTargetItem> nextbody = new ArrayList<>();
if (ifi.expression instanceof NotItem) {
hnt = (HasNextTreeItem) ((NotItem) ifi.expression).getOriginal();
body.addAll(ifi.onFalse);
for (int j = i + 1; j < list.size();) {
body.add(list.remove(i + 1));
}
nextbody = ifi.onTrue;
} else {
hnt = (HasNextTreeItem) ifi.expression;
body = ifi.onTrue;
nextbody = ifi.onFalse;
}
if (!body.isEmpty()) {
if (body.get(0) instanceof SetTypeTreeItem) {
SetTypeTreeItem sti = (SetTypeTreeItem) body.remove(0);
GraphTargetItem gti = sti.getValue().getNotCoerced();
GraphTargetItem repl = null;
if (gti instanceof NextValueTreeItem) {
repl = new ForEachInTreeItem(ifi.src, new Loop(0, null, null), new InTreeItem(null, sti.getObject(), hnt.collection), body);
} else if (gti instanceof NextNameTreeItem) {
repl = new ForInTreeItem(ifi.src, new Loop(0, null, null), new InTreeItem(null, sti.getObject(), hnt.collection), body);
}
if (repl != null) {
list.remove(i);
list.add(i, repl);
list.addAll(i + 1, nextbody);
}
}
}
}
}
}

2
trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java
View File

@@ -59,7 +59,7 @@ public class TraitsList extends JList<Object> implements ListSelectionListener {
@SuppressWarnings("unchecked")
public void setClassIndex(int classIndex, int scriptIndex) {
if(classIndex>=abc.instance_info.length){
if (classIndex >= abc.instance_info.length) {
return;
}
this.classIndex = classIndex;