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

Issue #306 editing AS directly - dot call as expression remainder (for new command)

Browse Source
This commit is contained in:
Jindra Pet��k
2014-02-24 22:05:42 +01:00
parent 83360a19df
commit 66746abd20
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class NewMethodActionItem extends ActionItem {
public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) {
return toSourceMerge(localData, generator, toSourceCall(localData, generator, arguments), scriptObject, methodName, new ActionNewMethod());
}
@Override
public boolean hasReturnValue() {
return true;
trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java
+5 -15
View File
@@ -122,7 +122,6 @@ import com.jpexs.decompiler.graph.model.ContinueItem;
import com.jpexs.decompiler.graph.model.DoWhileItem;
import com.jpexs.decompiler.graph.model.ForItem;
import com.jpexs.decompiler.graph.model.IfItem;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.NotItem;
import com.jpexs.decompiler.graph.model.OrItem;
import com.jpexs.decompiler.graph.model.ParenthesisItem;
@@ -928,19 +927,6 @@ public class ActionScriptParser {
expected(s, lexer.yyline(), SymbolType.IDENTIFIER);
ret = (function(true, s.value.toString(), false, variables));
break;
case NEW:
GraphTargetItem type = type(variables);
expectedType(SymbolType.PARENT_OPEN);
if (type instanceof GetMemberActionItem) {
GetMemberActionItem mem = (GetMemberActionItem) type;
ret = new NewMethodActionItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod, variables));
} else if (type instanceof VariableActionItem) {
VariableActionItem var = (VariableActionItem) type;
ret = new NewObjectActionItem(null, var, call(registerVars, inFunction, inMethod, variables));
} else {
ret = new NewObjectActionItem(null, ret, call(registerVars, inFunction, inMethod, variables));
}
break;
case VAR:
s = lex();
expected(s, lexer.yyline(), SymbolType.IDENTIFIER);
@@ -1349,6 +1335,10 @@ public class ActionScriptParser {
GraphTargetItem ret = null;
ParsedSymbol s = lex();
switch (s.type) {
case DOT:
lexer.pushback(s);
ret = memberOrCall(expr, registerVars, inFunction, inMethod, variables);
break;
case TERNAR:
GraphTargetItem terOnTrue = expression(registerVars, inFunction, inMethod, false, variables);
expectedType(SymbolType.COLON);
@@ -1619,11 +1609,11 @@ public class ActionScriptParser {
GetMemberActionItem mem = (GetMemberActionItem) newvar;
ret = new NewMethodActionItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod, variables));
} else if (newvar instanceof VariableActionItem) {
//VariableActionItem gv = (VariableActionItem) newvar;
ret = new NewObjectActionItem(null, newvar, call(registerVars, inFunction, inMethod, variables));
} else {
throw new ParseException("Invalid new item", lexer.yyline());
}
existsRemainder = true;
break;
case IDENTIFIER:
case THIS: