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

Fixed: AS3 incorrect parsing of divide operator vs regexp

Browse Source
This commit is contained in:
Jindra Petřík
2025-05-31 20:50:51 +02:00
parent f1a22e9559
commit 905ad28304
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3Parser.java
View File

@@ -2140,17 +2140,18 @@ public class ActionScript3Parser {
*/
private void xmlToLowerThanFix(ParsedSymbol symb) {
if (symb.isType(SymbolType.XML_STARTVARTAG_BEGIN, SymbolType.XML_STARTTAG_BEGIN)) {
lexer.yypushbackstr(symb.value.toString().substring(1)); //parse again as LOWER_THAN
String pb = symb.value.toString().substring(1);
symb.type = SymbolType.LOWER_THAN;
symb.group = SymbolGroup.OPERATOR;
symb.value = "<";
int pos = 1;
if (pb.charAt(0) == '=') {
symb.type = SymbolType.LOWER_EQUAL;
symb.value = "<=";
pb = pb.substring(1);
pos++;
}
lexer.yypushbackstr(pb); //parse again as LOWER_THAN
lexer.yypushbackstr(pb, ActionScriptLexer.YYINITIAL, pos); //parse again as LOWER_THAN
}
}
@@ -2160,12 +2161,14 @@ public class ActionScript3Parser {
symb.type = SymbolType.DIVIDE;
symb.group = SymbolGroup.OPERATOR;
symb.value = "/";
int pos = 1;
if (pb.charAt(0) == '=') {
symb.type = SymbolType.ASSIGN_DIVIDE;
symb.value = "/=";
pb = pb.substring(1);
pos++;
}
lexer.yypushbackstr(pb); //parse again as DIVIDE
lexer.yypushbackstr(pb, ActionScriptLexer.YYINITIAL, pos); //parse again as DIVIDE
}
}
@@ -2619,7 +2622,7 @@ public class ActionScript3Parser {
case FLOAT4:
if (!abc.hasFloat4Support()) {
//parse again as method call
lexer.yypushbackstr(lexer.yytext().substring("float4".length()));
lexer.yypushbackstr(lexer.yytext().substring("float4".length()), ActionScriptLexer.YYINITIAL, "float4".length());
lexer.pushback(new ParsedSymbol(-1, SymbolGroup.IDENTIFIER, SymbolType.IDENTIFIER, "float4"));
ret = name(allOpenedNamespaces, thisType, pkg, needsActivation, false, openedNamespaces, registerVars, inFunction, inMethod, variables, importedClasses, abc);
} else {
@@ -2663,7 +2666,7 @@ public class ActionScript3Parser {
case NEW:
s = lex();
if (s.type == SymbolType.XML_STARTTAG_BEGIN) {
lexer.yypushbackstr(s.value.toString().substring(1), ActionScriptLexer.YYINITIAL);
lexer.yypushbackstr(s.value.toString().substring(1), ActionScriptLexer.YYINITIAL, 1);
s = new ParsedSymbol(-1, SymbolGroup.OPERATOR, SymbolType.LOWER_THAN);
}
if (s.type == SymbolType.FUNCTION) {

14
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3SimpleParser.java
View File

@@ -41,7 +41,6 @@ import java.io.IOException;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Stack;
@@ -1571,17 +1570,18 @@ public class ActionScript3SimpleParser implements SimpleParser {
*/
private void xmlToLowerThanFix(ParsedSymbol symb) {
if (symb.isType(SymbolType.XML_STARTVARTAG_BEGIN, SymbolType.XML_STARTTAG_BEGIN)) {
lexer.yypushbackstr(symb.value.toString().substring(1)); //parse again as LOWER_THAN
String pb = symb.value.toString().substring(1);
symb.type = SymbolType.LOWER_THAN;
symb.group = SymbolGroup.OPERATOR;
symb.value = "<";
int pos = 1;
if (pb.charAt(0) == '=') {
symb.type = SymbolType.LOWER_EQUAL;
symb.value = "<=";
pb = pb.substring(1);
pos++;
}
lexer.yypushbackstr(pb); //parse again as LOWER_THAN
lexer.yypushbackstr(pb, ActionScriptLexer.YYINITIAL, pos); //parse again as LOWER_THAN
}
}
@@ -1591,12 +1591,14 @@ public class ActionScript3SimpleParser implements SimpleParser {
symb.type = SymbolType.DIVIDE;
symb.group = SymbolGroup.OPERATOR;
symb.value = "/";
int pos = 1;
if (pb.charAt(0) == '=') {
symb.type = SymbolType.ASSIGN_DIVIDE;
symb.value = "/=";
pb = pb.substring(1);
pos++;
}
lexer.yypushbackstr(pb); //parse again as DIVIDE
lexer.yypushbackstr(pb, ActionScriptLexer.YYINITIAL, pos); //parse again as DIVIDE
}
}
@@ -1904,7 +1906,7 @@ public class ActionScript3SimpleParser implements SimpleParser {
case FLOAT4:
if (!abc.hasFloat4Support()) {
//parse again as method call
lexer.yypushbackstr(lexer.yytext().substring("float4".length()));
lexer.yypushbackstr(lexer.yytext().substring("float4".length()), ActionScriptLexer.YYINITIAL, "float4".length());
lexer.pushback(new ParsedSymbol(lexer.yychar() /*???*/, SymbolGroup.IDENTIFIER, SymbolType.IDENTIFIER, "float4"));
ret = name(errors, thisType, needsActivation, openedNamespaces, registerVars, inFunction, inMethod, isStatic, variables, importedClasses, abc);
} else {
@@ -1940,7 +1942,7 @@ public class ActionScript3SimpleParser implements SimpleParser {
case NEW:
s = lex();
if (s.type == SymbolType.XML_STARTTAG_BEGIN) {
lexer.yypushbackstr(s.value.toString().substring(1), ActionScriptLexer.YYINITIAL);
lexer.yypushbackstr(s.value.toString().substring(1), ActionScriptLexer.YYINITIAL, 1);
s = new ParsedSymbol(s.position, SymbolGroup.OPERATOR, SymbolType.LOWER_THAN);
}
if (s.type == SymbolType.FUNCTION) {

12
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
View File

@@ -1059,6 +1059,8 @@ public final class ActionScriptLexer {
private boolean enableWhiteSpace = false;
private int yyStartOffset = 0;
private final Pattern float4Pattern = Pattern.compile("float4.*\\([\r\n \t\f]*(?<f1>[^\r\n \t\f]+)[\r\n \t\f]*,[\r\n \t\f]*(?<f2>[^\r\n \t\f]+)[\r\n \t\f]*,[\r\n \t\f]*(?<f3>[^\r\n \t\f]+)[\r\n \t\f]*,[\r\n \t\f]*(?<f4>[^\r\n \t\f]+)[\r\n \t\f]*\\)", Pattern.MULTILINE);
public ActionScriptLexer(String sourceCode){
@@ -1066,10 +1068,11 @@ public final class ActionScriptLexer {
this.sourceCode = sourceCode;
}
public void yypushbackstr(String s, int state)
public void yypushbackstr(String s, int state, int skipNumChars)
{
int numLines = count(s, "\n");
int newYyline = yyline - numLines;
yyStartOffset = yyStartOffset + skipNumChars + yychar;
sourceCode = s + sourceCode.substring(yychar + yylength());
yyreset(new StringReader(sourceCode));
yybegin(state);
@@ -1087,11 +1090,6 @@ public final class ActionScriptLexer {
yybegin(state);
}
public void yypushbackstr(String s)
{
yypushbackstr(s, YYINITIAL);
}
StringBuilder string = new StringBuilder();
private static String xmlTagName = "";
@@ -1099,7 +1097,7 @@ public final class ActionScriptLexer {
private int startPos = -1;
public int yychar() {
return yychar;
return yyStartOffset + yychar;
}
private Stack<ParsedSymbol> pushedBack = new Stack<>();