LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-18 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3 direct editation - call type fix, const/var init fix

Browse Source
This commit is contained in:
Jindra Petk
2014-04-21 10:01:59 +02:00
parent caf965b9ec
commit f288b405f9
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
View File

@@ -36,6 +36,7 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.JumpIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.LookupSwitchIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.GetLocal0Ins;
import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.KillIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.other.FindPropertyIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.other.FindPropertyStrictIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.other.GetDescendantsIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.other.GetGlobalScopeIns;
@@ -1194,6 +1195,7 @@ public class AVM2SourceGenerator implements SourceGenerator {
boolean isStatic = false;
int ns=-1;
String tname=null;
boolean isConst = false;
if(ti instanceof SlotAVM2Item){
val = ((SlotAVM2Item) ti).value;
isStatic = ((SlotAVM2Item) ti).isStatic();
@@ -1205,18 +1207,19 @@ public class AVM2SourceGenerator implements SourceGenerator {
isStatic = ((ConstAVM2Item) ti).isStatic();
ns = ((ConstAVM2Item) ti).getNamespace();
tname = ((ConstAVM2Item) ti).var;
isConst = true;
}
if (isStatic && val!=null) {
sinitcode.add(ins(new FindPropertyStrictIns(), traitName(namespace, tname)));
sinitcode.add(ins(new FindPropertyIns(), traitName(ns, tname)));
sinitcode.addAll(toInsList(val.toSource(localData, this)));
sinitcode.add(ins(new InitPropertyIns(), traitName(ns, tname)));
sinitcode.add(ins(isConst?new InitPropertyIns():new SetPropertyIns(), traitName(ns, tname)));
}
if (!isStatic && val!=null) {
//do not init basic values, that can be stored in trait
if(!(val instanceof IntegerValueAVM2Item) && !(val instanceof StringAVM2Item) && !(val instanceof BooleanAVM2Item) && !(val instanceof NullAVM2Item) && !(val instanceof UndefinedAVM2Item)){
initcode.add(ins(new GetLocal0Ins()));
initcode.addAll(toInsList(val.toSource(localData, this)));
initcode.add(ins(new InitPropertyIns(), traitName(ns, tname)));
initcode.add(ins(isConst?new InitPropertyIns():new SetPropertyIns(), traitName(ns, tname)));
}
}
}

12
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/CallAVM2Item.java
View File

@@ -180,7 +180,17 @@ public class CallAVM2Item extends AVM2Item {
@Override
public GraphTargetItem returnType() {
GraphTargetItem ti = name.returnType();
GraphTargetItem callable = name;
if(callable instanceof UnresolvedAVM2Item){
callable = ((UnresolvedAVM2Item)callable).resolved;
}
if(callable instanceof TypeItem){
return TypeItem.UNBOUNDED;
}
GraphTargetItem ti = callable.returnType();
if (ti instanceof TypeFunctionItem) {
TypeFunctionItem tfi = (TypeFunctionItem) ti;
return new TypeItem(tfi.fullTypeName);