LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 04:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3 parser improved

Browse Source
This commit is contained in:
Jindra Pet��k
2014-03-29 09:49:47 +01:00
parent 1fb8e486b8
commit b7df434e48
5 changed files with 144 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptParser.java
+37 -37
View File
@@ -344,8 +344,8 @@ public class ActionScriptParser {
}
}
if (k == -1) {
throw new ParseException("Cannot find variable or type:" + Helper.joinStrings(parts,"."), lexer.yyline());
if (k == -1) {
throw new ParseException("Cannot find variable or type:" + Helper.joinStrings(parts, "."), lexer.yyline());
}
GraphTargetItem ret = new TypeItem("".equals(pkg) ? name : pkg + "." + name);
for (int i = 1; i < parts.size(); i++) {
@@ -409,32 +409,32 @@ public class ActionScriptParser {
private MethodAVM2Item method(boolean override, boolean isFinal, GraphTargetItem thisType, List<String> openedNamespaces, List<Integer> openedNamespacesKinds, boolean isStatic, int namespaceKind, boolean withBody, String functionName, boolean isMethod, List<NameAVM2Item> variables) throws IOException, ParseException {
FunctionAVM2Item f = function(thisType, openedNamespaces, openedNamespacesKinds, withBody, functionName, isMethod, variables);
return new MethodAVM2Item(f.hasRest,f.line,override, isFinal, isStatic, namespaceKind, functionName, f.paramTypes, f.paramNames, f.paramValues, f.body, f.subvariables, f.retType);
return new MethodAVM2Item(f.hasRest, f.line, override, isFinal, isStatic, namespaceKind, functionName, f.paramTypes, f.paramNames, f.paramValues, f.body, f.subvariables, f.retType);
}
private FunctionAVM2Item function(GraphTargetItem thisType, List<String> openedNamespaces, List<Integer> openedNamespacesKinds, boolean withBody, String functionName, boolean isMethod, List<NameAVM2Item> variables) throws IOException, ParseException {
int line=lexer.yyline();
int line = lexer.yyline();
ParsedSymbol s;
expectedType(SymbolType.PARENT_OPEN);
s = lex();
List<String> paramNames = new ArrayList<>();
List<GraphTargetItem> paramTypes = new ArrayList<>();
List<GraphTargetItem> paramValues = new ArrayList<>();
boolean hasRest = false;
boolean hasRest = false;
while (s.type != SymbolType.PARENT_CLOSE) {
if (s.type != SymbolType.COMMA) {
lexer.pushback(s);
}
s = lex();
if(s.type == SymbolType.REST){
}
s = lex();
if (s.type == SymbolType.REST) {
hasRest = true;
s = lex();
}
expected(s, lexer.yyline(), SymbolType.IDENTIFIER);
paramNames.add(s.value.toString());
s = lex();
if(!hasRest){
if (!hasRest) {
if (s.type == SymbolType.COLON) {
paramTypes.add(type(openedNamespaces, openedNamespacesKinds, variables));
s = lex();
@@ -449,12 +449,11 @@ public class ActionScriptParser {
}
}
}
if (!s.isType(SymbolType.COMMA, SymbolType.PARENT_CLOSE)) {
expected(s, lexer.yyline(), SymbolType.COMMA, SymbolType.PARENT_CLOSE);
}
if(hasRest){
if (hasRest) {
expected(s, lexer.yyline(), SymbolType.PARENT_CLOSE);
}
}
@@ -484,7 +483,7 @@ public class ActionScriptParser {
for (int i = 0; i < parCnt; i++) {
subvariables.remove(0);
}
return new FunctionAVM2Item(hasRest,line,functionName, paramTypes, paramNames, paramValues, body, subvariables, retType);
return new FunctionAVM2Item(hasRest, line, functionName, paramTypes, paramNames, paramValues, body, subvariables, retType);
}
private GraphTargetItem traits(List<String> openedNamespaces, List<Integer> openedNamespacesKinds, String packageName, String classNameStr, boolean isInterface, List<GraphTargetItem> traits) throws ParseException, IOException {
@@ -511,7 +510,7 @@ public class ActionScriptParser {
}
isFinal = true;
}
if(s.type == SymbolType.DYNAMIC){
if (s.type == SymbolType.DYNAMIC) {
if (isDynamic) {
throw new ParseException("Only one dynamic keyword allowed", lexer.yyline());
}
@@ -586,7 +585,7 @@ public class ActionScriptParser {
} while (s.type == SymbolType.COMMA);
}
expected(s, lexer.yyline(), SymbolType.CURLY_OPEN);
traits.add((classTraits(isDynamic,isFinal,openedNamespaces, openedNamespacesKinds, packageName, nsKind, false, classTypeStr, extendsTypeStr, implementsTypeStrs, variables)));
traits.add((classTraits(isDynamic, isFinal, openedNamespaces, openedNamespacesKinds, packageName, nsKind, false, classTypeStr, extendsTypeStr, implementsTypeStrs, variables)));
expectedType(SymbolType.CURLY_CLOSE);
break;
case INTERFACE:
@@ -599,7 +598,7 @@ public class ActionScriptParser {
if (isFinal) {
throw new ParseException("Final flag not allowed for interfaces", lexer.yyline());
}
if(isDynamic){
if (isDynamic) {
throw new ParseException("Dynamic flag not allowed for interfaces", lexer.yyline());
}
//GraphTargetItem interfaceTypeStr = type(openedNamespaces, openedNamespacesKinds, variables);
@@ -617,20 +616,20 @@ public class ActionScriptParser {
} while (s.type == SymbolType.COMMA);
}
expected(s, lexer.yyline(), SymbolType.CURLY_OPEN);
traits.add((classTraits(false,isFinal,openedNamespaces, openedNamespacesKinds, packageName, nsKind, true, intTypeStr, null, intExtendsTypeStrs, variables)));
traits.add((classTraits(false, isFinal, openedNamespaces, openedNamespacesKinds, packageName, nsKind, true, intTypeStr, null, intExtendsTypeStrs, variables)));
expectedType(SymbolType.CURLY_CLOSE);
break;
case FUNCTION:
if(isDynamic){
if (isDynamic) {
throw new ParseException("Dynamic flag not allowed for methods", lexer.yyline());
}
s = lex();
if (s.type == SymbolType.GET) {
if (classNameStr == null) {
throw new ParseException("No get keyword allowed here", lexer.yyline());
}
}
isGetter = true;
s = lex();
} else if (s.type == SymbolType.SET) {
@@ -669,16 +668,16 @@ public class ActionScriptParser {
MethodAVM2Item ft = method(isOverride, isFinal, thisType, openedNamespaces, openedNamespacesKinds, isStatic, nsKind, !isInterface, fname, true, variables);
GraphTargetItem t;
if (isGetter) {
if(!ft.paramTypes.isEmpty()){
if (!ft.paramTypes.isEmpty()) {
throw new ParseException("Getter can't have any parameters", lexer.yyline());
}
GetterAVM2Item g = new GetterAVM2Item(ft.hasRest,ft.line,ft.isOverride(), ft.isFinal(), isStatic, ft.namespaceKind, ft.functionName, ft.paramTypes, ft.paramNames, ft.paramValues, ft.body, ft.subvariables, ft.retType);
GetterAVM2Item g = new GetterAVM2Item(ft.hasRest, ft.line, ft.isOverride(), ft.isFinal(), isStatic, ft.namespaceKind, ft.functionName, ft.paramTypes, ft.paramNames, ft.paramValues, ft.body, ft.subvariables, ft.retType);
t = g;
} else if (isSetter) {
if(ft.paramTypes.size()!=1){
if (ft.paramTypes.size() != 1) {
throw new ParseException("Getter must have exactly one parameter", lexer.yyline());
}
SetterAVM2Item st = new SetterAVM2Item(ft.hasRest, ft.line,ft.isOverride(), ft.isFinal(), isStatic, ft.namespaceKind, ft.functionName, ft.paramTypes, ft.paramNames, ft.paramValues, ft.body, ft.subvariables, ft.retType);
SetterAVM2Item st = new SetterAVM2Item(ft.hasRest, ft.line, ft.isOverride(), ft.isFinal(), isStatic, ft.namespaceKind, ft.functionName, ft.paramTypes, ft.paramNames, ft.paramValues, ft.body, ft.subvariables, ft.retType);
t = st;
} else {
t = ft;
@@ -699,8 +698,8 @@ public class ActionScriptParser {
if (isFinal) {
throw new ParseException("Final flag not allowed for " + (isConst ? "consts" : "vars"), lexer.yyline());
}
if(isDynamic){
throw new ParseException("Dynamic flag not allowed for "+(isConst ? "consts":"vars"), lexer.yyline());
if (isDynamic) {
throw new ParseException("Dynamic flag not allowed for " + (isConst ? "consts" : "vars"), lexer.yyline());
}
s = lex();
@@ -735,7 +734,7 @@ public class ActionScriptParser {
return constr;
}
private GraphTargetItem classTraits(boolean isDynamic,boolean isFinal,List<String> openedNamespaces, List<Integer> openedNamespacesKinds, String packageName, int namespaceKind, boolean isInterface, String nameStr, GraphTargetItem extendsStr, List<GraphTargetItem> implementsStr, List<NameAVM2Item> variables) throws IOException, ParseException {
private GraphTargetItem classTraits(boolean isDynamic, boolean isFinal, List<String> openedNamespaces, List<Integer> openedNamespacesKinds, String packageName, int namespaceKind, boolean isInterface, String nameStr, GraphTargetItem extendsStr, List<GraphTargetItem> implementsStr, List<NameAVM2Item> variables) throws IOException, ParseException {
GraphTargetItem ret = null;
@@ -781,9 +780,9 @@ public class ActionScriptParser {
GraphTargetItem constr = traits(openedNamespaces, openedNamespacesKinds, packageName, classNameStr, isInterface, traits);
if (isInterface) {
return new InterfaceAVM2Item(isFinal,namespaceKind, classNameStr, implementsStr, traits);
return new InterfaceAVM2Item(isFinal, namespaceKind, classNameStr, implementsStr, traits);
} else {
return new ClassAVM2Item(isDynamic,isFinal,namespaceKind, classNameStr, extendsStr, implementsStr, constr, traits);
return new ClassAVM2Item(isDynamic, isFinal, namespaceKind, classNameStr, extendsStr, implementsStr, constr, traits);
}
}
@@ -1407,15 +1406,16 @@ public class ActionScriptParser {
assigned = new BitXorAVM2Item(null, expr, assigned);
break;
}
if (expr instanceof NameAVM2Item) {
((NameAVM2Item) expr).setStoreValue(assigned);
((NameAVM2Item) expr).setDefinition(false);
ret = expr;
} else if (expr instanceof PropertyAVM2Item) {
((PropertyAVM2Item) expr).setStoreValue(assigned);
} else {
if (!(expr instanceof AssignableAVM2Item)) {
throw new ParseException("Invalid assignment", lexer.yyline());
}
((AssignableAVM2Item) expr).setAssignedValue(assigned);
if (expr instanceof NameAVM2Item) {
((NameAVM2Item) expr).setDefinition(false);
ret = expr;
}
ret = expr;
break;
case INCREMENT: //postincrement
if (!(expr instanceof NameAVM2Item) && !(expr instanceof GetPropertyAVM2Item)) {
@@ -1797,7 +1797,7 @@ public class ActionScriptParser {
}
public static void main(String[] args) {
if(args.length<2){
if (args.length < 2) {
return;
}
Main.initLogging(false);
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AssignableAVM2Item.java
+55
View File
@@ -0,0 +1,55 @@
/*
* Copyright (C) 2014 JPEXS
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.jpexs.decompiler.flash.abc.avm2.parser.script;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author JPEXS
*/
public abstract class AssignableAVM2Item extends AVM2Item{
protected GraphTargetItem assignedValue;
public AssignableAVM2Item() {
this(null);
}
public AssignableAVM2Item(GraphTargetItem storeValue) {
super(null, PRECEDENCE_PRIMARY);
this.assignedValue = storeValue;
}
public abstract List<GraphSourceItem> toSourcePreChange(SourceGeneratorLocalData localData, SourceGenerator generator, List<GraphSourceItem> change);
public abstract List<GraphSourceItem> toSourcePostChange(SourceGeneratorLocalData localData, SourceGenerator generator, List<GraphSourceItem> change);
public GraphTargetItem getAssignedValue(){
return assignedValue;
}
public void setAssignedValue(GraphTargetItem storeValue) {
this.assignedValue = storeValue;
}
}
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NameAVM2Item.java
+29 -13
View File
@@ -36,10 +36,10 @@ import java.util.List;
*
* @author JPEXS
*/
public class NameAVM2Item extends AVM2Item {
public class NameAVM2Item extends AssignableAVM2Item {
private String variableName;
private GraphTargetItem storeValue;
private boolean definition;
private GraphTargetItem index;
private int nsKind = -1;
@@ -92,8 +92,8 @@ public class NameAVM2Item extends AVM2Item {
return nsKind;
}
public void setStoreValue(GraphTargetItem storeValue) {
this.storeValue = storeValue;
public void setAssignedValue(GraphTargetItem storeValue) {
this.assignedValue = storeValue;
}
public String getVariableName() {
@@ -101,9 +101,9 @@ public class NameAVM2Item extends AVM2Item {
}
public NameAVM2Item(GraphTargetItem type, int line, String variableName, GraphTargetItem storeValue, boolean definition, List<String> openedNamespaces, List<Integer> openedNamespacesKind) {
super(null, PRECEDENCE_PRIMARY);
super(storeValue);
this.variableName = variableName;
this.storeValue = storeValue;
this.assignedValue = storeValue;
this.definition = definition;
this.line = line;
this.type = type;
@@ -114,7 +114,7 @@ public class NameAVM2Item extends AVM2Item {
}
public GraphTargetItem getStoreValue() {
return storeValue;
return assignedValue;
}
@Override
@@ -127,13 +127,19 @@ public class NameAVM2Item extends AVM2Item {
if (regNumber == -1) {
throw new RuntimeException("No register set for " + variableName);
}
if (definition && storeValue == null) {
if (definition && assignedValue == null) {
return new ArrayList<>();
}
if (storeValue == null) {
AVM2SourceGenerator g=(AVM2SourceGenerator)generator;
if(index!=null){
//g.abc.constants.getmu
}
if (assignedValue == null) {
return toSourceMerge(localData, generator, new LocalRegAVM2Item(null, regNumber, null));
} else {
return toSourceMerge(localData, generator, new SetLocalAVM2Item(null, regNumber, new CoerceAVM2Item(null, storeValue, type.toString())));
return toSourceMerge(localData, generator, new SetLocalAVM2Item(null, regNumber, new CoerceAVM2Item(null, assignedValue, type.toString())));
}
}
@@ -143,14 +149,14 @@ public class NameAVM2Item extends AVM2Item {
if (regNumber == -1) {
throw new RuntimeException("No register set for " + variableName);
}
if (definition && storeValue == null) {
if (definition && assignedValue == null) {
return new ArrayList<>();
}
if (storeValue == null) {
if (assignedValue == null) {
return toSourceMerge(localData, generator, new LocalRegAVM2Item(null, regNumber, null),
new AVM2Instruction(0, new PopIns(), new int[]{}, new byte[0]));
} else {
return toSourceMerge(localData, generator, new SetLocalAVM2Item(null, regNumber, new CoerceAVM2Item(null, storeValue, type.toString())).toSourceIgnoreReturnValue(localData, generator));
return toSourceMerge(localData, generator, new SetLocalAVM2Item(null, regNumber, new CoerceAVM2Item(null, assignedValue, type.toString())).toSourceIgnoreReturnValue(localData, generator));
}
}
@@ -183,4 +189,14 @@ public class NameAVM2Item extends AVM2Item {
return type;
}
@Override
public List<GraphSourceItem> toSourcePreChange(SourceGeneratorLocalData localData, SourceGenerator generator, List<GraphSourceItem> change) {
return null;//TODO
}
@Override
public List<GraphSourceItem> toSourcePostChange(SourceGeneratorLocalData localData, SourceGenerator generator, List<GraphSourceItem> change) {
return null;//TODO
}
}
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/PropertyAVM2Item.java
+21 -17
View File
@@ -52,29 +52,23 @@ import java.util.List;
*
* @author JPEXS
*/
public class PropertyAVM2Item extends AVM2Item {
public class PropertyAVM2Item extends AssignableAVM2Item {
public String propertyName;
public GraphTargetItem object;
public List<ABC> abcs;
public GraphTargetItem index;
private GraphTargetItem storeValue;
private List<String> openedNamespaces;
private List<Integer> openedNamespacesKind;
public PropertyAVM2Item(GraphTargetItem object, String propertyName, GraphTargetItem index, List<ABC> abcs, List<String> openedNamespaces, List<Integer> openedNamespacesKind) {
super(null, PRECEDENCE_PRIMARY);
public PropertyAVM2Item(GraphTargetItem object, String propertyName, GraphTargetItem index, List<ABC> abcs, List<String> openedNamespaces, List<Integer> openedNamespacesKind) {
this.propertyName = propertyName;
this.object = object;
this.abcs = abcs;
this.index = index;
this.openedNamespaces = openedNamespaces;
this.openedNamespacesKind = openedNamespacesKind;
}
public void setStoreValue(GraphTargetItem storeValue) {
this.storeValue = storeValue;
}
}
@Override
public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
@@ -268,13 +262,13 @@ public class PropertyAVM2Item extends AVM2Item {
if (obj == null) {
obj = new AVM2Instruction(0, new FindPropertyStrictIns(), new int[]{propertyId}, new byte[0]);
}
if (storeValue != null) {
if (assignedValue != null) {
int temp_reg = g.getFreeRegister(localData);
String targetType = resolvePropertyType().toString();
String srcType = storeValue.returnType().toString();
GraphTargetItem st=storeValue;
String srcType = assignedValue.returnType().toString();
GraphTargetItem st=assignedValue;
if(!targetType.equals(srcType)){
st = new CoerceAVM2Item(null, storeValue, targetType);
st = new CoerceAVM2Item(null, assignedValue, targetType);
}
List<GraphSourceItem> ret = toSourceMerge(localData, generator, obj, index,st ,
new AVM2Instruction(0, new DupIns(), new int[]{}, new byte[0]),
@@ -301,12 +295,12 @@ public class PropertyAVM2Item extends AVM2Item {
if (obj == null) {
obj = new AVM2Instruction(0, new FindPropertyStrictIns(), new int[]{propertyId}, new byte[0]);
}
if (storeValue != null) {
if (assignedValue != null) {
String targetType = resolvePropertyType().toString();
String srcType = storeValue.returnType().toString();
GraphTargetItem st=storeValue;
String srcType = assignedValue.returnType().toString();
GraphTargetItem st=assignedValue;
if(!targetType.equals(srcType)){
st = new CoerceAVM2Item(null, storeValue, targetType);
st = new CoerceAVM2Item(null, assignedValue, targetType);
}
return toSourceMerge(localData, generator, obj, index, st,
new AVM2Instruction(0, new SetPropertyIns(), new int[]{propertyId}, new byte[0])
@@ -324,4 +318,14 @@ public class PropertyAVM2Item extends AVM2Item {
return true;
}
@Override
public List<GraphSourceItem> toSourcePreChange(SourceGeneratorLocalData localData, SourceGenerator generator, List<GraphSourceItem> change) {
return null; //TODO
}
@Override
public List<GraphSourceItem> toSourcePostChange(SourceGeneratorLocalData localData, SourceGenerator generator, List<GraphSourceItem> change) {
return null; //TODO
}
}
trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/todo.txt
+2 -1
View File
@@ -10,4 +10,5 @@ TODO List for AS3 parser/compiler:
- pre/post in/decrements
- with
- delete property
- default xml namespace
- default xml namespace
- method body correct code stats