From dcc2c99629bb761f8d89fca0d91476360908919d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Sat, 9 Feb 2013 21:16:20 +0100 Subject: [PATCH] AS3: fixed output before &&, || --- trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java index 3b8643d98..087e61504 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java @@ -257,6 +257,7 @@ public class Graph { if (isIf) { AVM2Instruction ins = code.code.get(end + 1); if ((stack.size() >= 2) && (ins.definition instanceof IfFalseIns) && (stack.get(stack.size() - 1) == stack.get(stack.size() - 2))) { + ret.addAll(output); printGraph(methodPath, stack, scopeStack, allParts, parsedExceptions, finallyJumps, level, parent, part.nextParts.get(1), part.nextParts.get(0), loops, localRegs, body, ignoredSwitches); TreeItem second = stack.pop(); TreeItem first = stack.pop(); @@ -264,6 +265,7 @@ public class Graph { ret.addAll(printGraph(methodPath, stack, scopeStack, allParts, parsedExceptions, finallyJumps, level, parent, part.nextParts.get(0), stopPart, loops, localRegs, body, ignoredSwitches)); return ret; } else if ((stack.size() >= 2) && (ins.definition instanceof IfTrueIns) && (stack.get(stack.size() - 1) == stack.get(stack.size() - 2))) { + ret.addAll(output); printGraph(methodPath, stack, scopeStack, allParts, parsedExceptions, finallyJumps, level, parent, part.nextParts.get(1), part.nextParts.get(0), loops, localRegs, body, ignoredSwitches); TreeItem second = stack.pop(); TreeItem first = stack.pop();