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

Fixed: #1260 AS1/2 direct editation - is/as/:: are not reserved operators

Browse Source
This commit is contained in:
Jindra Petřík
2021-03-05 09:30:15 +01:00
parent 114947ffc1
commit 19c836764f
7 changed files with 1159 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
- AS3 - escaping star import
- #1298 AS1 colon syntax handling
- #1298 AS1 direct editation of add,eq,ne and such operations
- #1260 AS1/2 direct editation - is/as/:: are not reserved operators
### Removed
- #1631 ActiveX Flash component download in windows installer

BIN
lib/jsyntaxpane-0.9.5.jar
View File

Binary file not shown.

3
libsrc/ffdec_lib/lexers/actionscript_script.flex
View File

@@ -330,11 +330,8 @@ Preprocessor = \u00A7\u00A7 {Identifier}
"<<=" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.ASSIGN_SHIFT_LEFT, yytext()); }
">>=" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.ASSIGN_SHIFT_RIGHT, yytext()); }
">>>=" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.ASSIGN_USHIFT_RIGHT, yytext()); }
"as" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.AS, yytext()); }
"delete" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.DELETE, yytext()); }
"instanceof" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.INSTANCEOF, yytext()); }
"is" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.IS, yytext()); }
"::" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.NAMESPACE_OP, yytext()); }
"new" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.NEW, yytext()); }
"typeof" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.TYPEOF, yytext()); }
"void" { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.VOID, yytext()); }

7
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScript2Parser.java
View File

@@ -1488,17 +1488,10 @@ public class ActionScript2Parser {
break;
case XOR:
lhs = new BitXorActionItem(null, null, lhs, rhs);
break;
case AS:
break;
case INSTANCEOF:
lhs = new InstanceOfActionItem(null, null, lhs, rhs);
break;
case IS:
break;
case ASSIGN:
case ASSIGN_BITAND:
case ASSIGN_BITOR:

2329
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java
View File

File diff suppressed because it is too large Load Diff

3
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/SymbolType.java
View File

@@ -118,11 +118,8 @@ public enum SymbolType {
ASSIGN_SHIFT_LEFT(GraphTargetItem.PRECEDENCE_ASSIGMENT, true, true),
ASSIGN_SHIFT_RIGHT(GraphTargetItem.PRECEDENCE_ASSIGMENT, true, true),
ASSIGN_USHIFT_RIGHT(GraphTargetItem.PRECEDENCE_ASSIGMENT, true, true),
AS(GraphTargetItem.PRECEDENCE_RELATIONAL, true),
DELETE(GraphTargetItem.PRECEDENCE_UNARY, false),
INSTANCEOF(GraphTargetItem.PRECEDENCE_RELATIONAL, true),
IS(GraphTargetItem.PRECEDENCE_RELATIONAL, true),
NAMESPACE_OP(GraphTargetItem.PRECEDENCE_PRIMARY, false),
NEW(GraphTargetItem.PRECEDENCE_PRIMARY, false),
TYPEOF(GraphTargetItem.PRECEDENCE_UNARY, false),
VOID,

3
libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex
View File

@@ -252,11 +252,8 @@ RegExp = \/([^\r\n/]|\\\/)+\/[a-z]*
"<<=" |
">>=" |
">>>=" |
"as" |
"delete" |
"instanceof" |
"is" |
"::" |
"new" |
"typeof" |
"void" |