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

AS1/2: continue, break fix

Browse Source
This commit is contained in:
Jindra Petk
2013-01-13 18:11:41 +01:00
parent 99a98e2d8f
commit b97a37648e
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/src/com/jpexs/asdec/action/Action.java
View File

@@ -494,14 +494,20 @@ public class Action {
loopStack.add(stripped.substring(0, stripped.length() - 1));
}
if (stripped.startsWith("break ")) {
if (stripped.equals("break " + loopStack.peek() + ";")) {
parts[p] = parts[p].replace(" " + loopStack.peek(), "");
if (stripped.equals("break " + loopStack.peek().replace("switch", "") + ";")) {
parts[p] = parts[p].replace(" " + loopStack.peek().replace("switch", ""), "");
}
}
if (stripped.startsWith("continue ")) {
if (loopStack.size() > 0) {
if (stripped.equals("continue " + loopStack.peek() + ";")) {
parts[p] = parts[p].replace(" " + loopStack.peek(), "");
int pos=loopStack.size()-1;
String loopname="";
do{
loopname=loopStack.get(pos);
pos--;
}while((pos>=0)&&(loopname.startsWith("loopswitch")));
if (stripped.equals("continue " + loopname + ";")) {
parts[p] = parts[p].replace(" " + loopname, "");
}
}
}

2
trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java
View File

@@ -35,6 +35,6 @@ public class BreakTreeItem extends TreeItem {
@Override
public String toString(ConstantPool constants) {
return hilight("break") + " loop" + loopPos;
return hilight("break") + " loop" + loopPos+";";
}
}

2
trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java
View File

@@ -36,6 +36,6 @@ public class ContinueTreeItem extends TreeItem {
@Override
public String toString(ConstantPool constants) {
return hilight(isBreak ? "break" : "continue") + " " + (isKnown ? "loop" : "unk") + loopPos;
return hilight(isBreak ? "break" : "continue") + " " + (isKnown ? "loop" : "unk") + loopPos+";";
}
}

2
trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java
View File

@@ -41,7 +41,7 @@ public class SwitchTreeItem extends LoopTreeItem implements Block {
@Override
public String toString(ConstantPool constants) {
String ret = "";
ret += "loop" + loopBreak + ":\r\n";
ret += "loopswitch" + loopBreak + ":\r\n";
ret += hilight("switch(") + switchedObject.toString(constants) + hilight(")") + "\r\n{\r\n";
for (int i = 0; i < caseValues.size(); i++) {
ret += "case " + caseValues.get(i).toString(constants) + ":\r\n";