LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-23 01:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3: Better semicolon insertion

Browse Source
This commit is contained in:
Jindra Petk
2012-12-20 21:02:11 +01:00
parent 3d775b283b
commit d7843ea832
31 changed files with 104 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java
View File

@@ -833,7 +833,7 @@ public class AVM2Code {
String ret = "";
for (int d = 0; d < stack.size(); d++) {
TreeItem o = stack.get(d);
ret += o.toString(constants) + "\r\n";
ret += o.toStringSemicoloned(constants) + "\r\n";
}
return ret;
}
@@ -1172,7 +1172,7 @@ public HashMap<Integer,String> getLocalRegNamesFromDebug(ABC abc){
throw new UnknownJumpException(stack, ip, output);
}
AVM2Instruction ins = code.get(ip);
//Ify s vice podminkama
//Ifs with multiple conditions
if (ins.definition instanceof JumpIns) {
if (ins.operands[0] == 0) {
ip++;
@@ -1468,6 +1468,12 @@ public HashMap<Integer,String> getLocalRegNamesFromDebug(ABC abc){
if (ip - 1 >= start) {
insBefore = code.get(ip - 1);
}
if (insAfter.definition instanceof ConvertBIns) { //SWF compiled with debug contain convert_b
ip++;
addr=pos2adr(ip);
insAfter = code.get(ip + 1);
}
boolean isAnd = false;
if (insAfter.definition instanceof IfFalseIns) {
//stack.add("(" + stack.pop() + ")&&");
@@ -1847,6 +1853,12 @@ public HashMap<Integer,String> getLocalRegNamesFromDebug(ABC abc){
} catch (Exception ex) {
}
for (int p = 0; p < parts.length; p++) {
if(p==parts.length-1){
if(parts[p].equals(""))
{
continue;
}
}
String strippedP = Highlighting.stripHilights(parts[p]);
if (strippedP.endsWith(":") && (!strippedP.startsWith("case ")) && (!strippedP.equals("default:"))) {
String loopname = strippedP.substring(0, strippedP.length() - 1);
@@ -1880,7 +1892,7 @@ public HashMap<Integer,String> getLocalRegNamesFromDebug(ABC abc){
level++;
sub += tabString(level) + parts[p] + "\r\n";
level++;
} else if (strippedP.equals("}")) {
} else if (strippedP.equals("}")||strippedP.equals("};")) {
level--;
sub += tabString(level) + parts[p] + "\r\n";
level--;