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

ignoring && true, || false

Browse Source
This commit is contained in:
Jindra Petřík
2021-02-06 14:21:31 +01:00
parent d1d1d7ba58
commit 72f0c66aa7
6 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1915,17 +1915,42 @@ public class Graph {
if (leftSide instanceof DuplicateItem) {
isIf = false;
stack.push(new OrItem(null, localData.lineStartInstruction, prevExpr, rightSide));
if (prevExpr.getNotCoercedNoDup() instanceof FalseItem) {
stack.push(rightSide);
} else if (rightSide.getNotCoercedNoDup() instanceof FalseItem) {
stack.push(prevExpr);
} else {
stack.push(new OrItem(null, localData.lineStartInstruction, prevExpr, rightSide));
}
} else if (leftSide.invert(null).getNotCoercedNoDup() instanceof DuplicateItem) {
isIf = false;
stack.push(new AndItem(null, localData.lineStartInstruction, prevExpr, rightSide));
if (prevExpr.getNotCoercedNoDup() instanceof TrueItem) {
stack.push(rightSide);
} else if (rightSide.getNotCoercedNoDup() instanceof TrueItem) {
stack.push(prevExpr);
} else {
stack.push(new AndItem(null, localData.lineStartInstruction, prevExpr, rightSide));
}
} else if (prevExpr instanceof FalseItem) {
isIf = false;
leftSide = leftSide.invert(null);
stack.push(new AndItem(null, localData.lineStartInstruction, leftSide, rightSide));
if (leftSide.getNotCoercedNoDup() instanceof TrueItem) {
stack.push(rightSide);
} else if (rightSide.getNotCoercedNoDup() instanceof TrueItem) {
stack.push(leftSide);
} else {
stack.push(new AndItem(null, localData.lineStartInstruction, leftSide, rightSide));
}
} else if (prevExpr instanceof TrueItem) {
isIf = false;
stack.push(new OrItem(null, localData.lineStartInstruction, leftSide, rightSide));
if (leftSide.getNotCoercedNoDup() instanceof FalseItem) {
stack.push(rightSide);
} else if (rightSide.getNotCoercedNoDup() instanceof FalseItem) {
stack.push(leftSide);
} else {
stack.push(new OrItem(null, localData.lineStartInstruction, leftSide, rightSide));
}
} else {
stack.push(prevExpr); //push it back
//Still unstructured