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

AS1/2: break on the end of for..in loop

Browse Source
This commit is contained in:
Jindra Petřík
2018-01-30 07:39:16 +01:00
parent eca98106d2
commit a7f457ad9d
8 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/FinalProcessLocalData.java
+7 -2
View File
@@ -12,10 +12,13 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.graph.Loop;
import java.util.HashSet;
import java.util.List;
/**
*
@@ -24,8 +27,10 @@ import java.util.HashSet;
public class FinalProcessLocalData {
public final HashSet<Integer> temporaryRegisters;
public final List<Loop> loops;
public FinalProcessLocalData() {
public FinalProcessLocalData(List<Loop> loops) {
temporaryRegisters = new HashSet<>();
this.loops = loops;
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionGraph.java
+35 -17
View File
@@ -49,6 +49,7 @@ import com.jpexs.decompiler.graph.TranslateStack;
import com.jpexs.decompiler.graph.model.BreakItem;
import com.jpexs.decompiler.graph.model.ContinueItem;
import com.jpexs.decompiler.graph.model.DefaultItem;
import com.jpexs.decompiler.graph.model.IfItem;
import com.jpexs.decompiler.graph.model.SwitchItem;
import com.jpexs.decompiler.graph.model.WhileItem;
import java.util.ArrayList;
@@ -171,31 +172,48 @@ public class ActionGraph extends Graph {
} while (again);
for (int t = 1/*not first*/; t < list.size(); t++) {
GraphTargetItem it = list.get(t);
List<GraphTargetItem> checkedBody = null;
GraphTargetItem checkedCondition = null;
Loop checkedLoop = null;
if (it instanceof WhileItem) {
WhileItem wi = (WhileItem) it;
if ((!wi.commands.isEmpty()) && (wi.commands.get(0) instanceof SetTypeActionItem)) {
SetTypeActionItem sti = (SetTypeActionItem) wi.commands.get(0);
if (wi.expression.get(wi.expression.size() - 1) instanceof NeqActionItem) {
NeqActionItem ne = (NeqActionItem) wi.expression.get(wi.expression.size() - 1);
if (ne.rightSide instanceof DirectValueActionItem) {
DirectValueActionItem dv = (DirectValueActionItem) ne.rightSide;
if (dv.value == Null.INSTANCE) {
GraphTargetItem en = list.get(t - 1);
if (en instanceof EnumerateActionItem) {
EnumerateActionItem eti = (EnumerateActionItem) en;
list.remove(t);
wi.commands.remove(0);
list.add(t, new ForInActionItem(null, null, wi.loop, sti.getObject(), eti.object, wi.commands));
list.remove(t - 1);
t--;
checkedBody = wi.commands;
checkedCondition = wi.expression.get(wi.expression.size() - 1);
checkedLoop = wi.loop;
} else if (it instanceof IfItem) {
IfItem ifi = (IfItem) it;
if (ifi.onFalse.isEmpty()) {
checkedBody = ifi.onTrue;
checkedCondition = ifi.expression;
checkedLoop = null;
}
}
if (checkedBody != null && (!checkedBody.isEmpty()) && (checkedBody.get(0) instanceof SetTypeActionItem)) {
SetTypeActionItem sti = (SetTypeActionItem) checkedBody.get(0);
if (checkedCondition instanceof NeqActionItem) {
NeqActionItem ne = (NeqActionItem) checkedCondition;
if (ne.rightSide instanceof DirectValueActionItem) {
DirectValueActionItem dv = (DirectValueActionItem) ne.rightSide;
if (dv.value == Null.INSTANCE) {
GraphTargetItem en = list.get(t - 1);
if (en instanceof EnumerateActionItem) {
EnumerateActionItem eti = (EnumerateActionItem) en;
list.remove(t);
checkedBody.remove(0);
if (checkedLoop == null) {
checkedLoop = new Loop(localData.loops.size(), null, null);
checkedBody.add(new BreakItem(null, null, checkedLoop.id));
}
list.add(t, new ForInActionItem(null, null, checkedLoop, sti.getObject(), eti.object, checkedBody));
list.remove(t - 1);
t--;
}
}
}
}
}
}
//Handle for loops at the end:
super.finalProcess(list, level, localData, path);
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java
+2 -1
View File
@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.␍ */
* License along with this library.
*/
package com.jpexs.decompiler.flash.action.model.clauses;
import com.jpexs.decompiler.flash.SWF;
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
+1 -1
View File
@@ -676,7 +676,7 @@ public class Graph {
List<GraphTargetItem> ret = printGraph(new HashMap<>(), new HashMap<>(), localData, stack, allParts, null, heads.get(0), null, loops, staticOperation, path);
processIfs(ret);
finalProcessStack(stack, ret, path);
finalProcessAll(ret, 0, new FinalProcessLocalData(), path);
finalProcessAll(ret, 0, new FinalProcessLocalData(loops), path);
return ret;
}