LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-25 20:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3: Fixed inline functions

Browse Source 
AS3: Fixed hiding assignements bug
AS3: Static initializer does not show initialization of static variables/consts
AS3: Better imports
This commit is contained in:
Jindra Petk
2012-12-29 11:34:49 +01:00
parent 1f804cbf18
commit 8909338f13
19 changed files with 171 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1610,8 +1610,8 @@ public class AVM2Code {
return ret;
}
public String toSource(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], MethodBody body, HashMap<Integer, String> localRegNames, Stack<TreeItem> scopeStack) {
return toSource(isStatic, classIndex, abc, constants, method_info, body, false, localRegNames, scopeStack);
public String toSource(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], MethodBody body, HashMap<Integer, String> localRegNames, Stack<TreeItem> scopeStack,boolean isStaticInitializer) {
return toSource(isStatic, classIndex, abc, constants, method_info, body, false, localRegNames, scopeStack,isStaticInitializer);
}
public List<TreeItem> toTree(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], MethodBody body, HashMap<Integer, String> localRegNames) {
@@ -1689,7 +1689,7 @@ public class AVM2Code {
}
}
public String toSource(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], MethodBody body, boolean hilighted, HashMap<Integer, String> localRegNames, Stack<TreeItem> scopeStack) {
public String toSource(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], MethodBody body, boolean hilighted, HashMap<Integer, String> localRegNames, Stack<TreeItem> scopeStack,boolean isStaticInitializer) {
toSourceCount = 0;
loopList = new ArrayList<Loop>();
unknownJumps = new ArrayList<Integer>();
@@ -1712,7 +1712,23 @@ public class AVM2Code {
try {
list = toSource(isStatic, classIndex, localRegs, new Stack<TreeItem>(), scopeStack, abc, constants, method_info, body, 0, code.size() - 1, localRegNames).output;
if(isStaticInitializer){
List<TreeItem> newList=new ArrayList<TreeItem>();
for(TreeItem ti:list){
if(!(ti instanceof ReturnVoidTreeItem)){
if(!(ti instanceof InitPropertyTreeItem)){
if(!(ti instanceof SetPropertyTreeItem)){
newList.add(ti);
}
}
}
}
list=newList;
if(list.isEmpty()){
return "";
}
}
//Declarations
boolean declaredRegisters[] = new boolean[regCount];
for (int b = 0; b < declaredRegisters.length; b++) {