diff --git a/CHANGELOG.md b/CHANGELOG.md index e38172b0b..0d0c1a72b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ All notable changes to this project will be documented in this file. - #1643 Separate AS1/2 and AS3 editor hilighting - AS3 direct editation - slot/const default values - #1328 AS1/2/3 direct editation - empty commands (just semicolon) +- #1310 AS1/2/3 direct editation - modulo operator precedence ### Removed - #1631 ActiveX Flash component download in windows installer diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/SymbolType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/SymbolType.java index adb989762..64306ed30 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/SymbolType.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/SymbolType.java @@ -12,7 +12,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library. */ + * License along with this library. + */ package com.jpexs.decompiler.flash.abc.avm2.parser.script; import com.jpexs.decompiler.graph.GraphTargetItem; @@ -102,7 +103,7 @@ public enum SymbolType { BITAND(GraphTargetItem.PRECEDENCE_BITWISEAND, true), BITOR(GraphTargetItem.PRECEDENCE_BITWISEOR, true), XOR(GraphTargetItem.PRECEDENCE_BITWISEXOR, true), - MODULO(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true), + MODULO(GraphTargetItem.PRECEDENCE_MULTIPLICATIVE, true), SHIFT_LEFT(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true), SHIFT_RIGHT(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true), USHIFT_RIGHT(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true), diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/SymbolType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/SymbolType.java index fedd72a71..b6b858054 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/SymbolType.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/SymbolType.java @@ -12,7 +12,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library. */ + * License along with this library. + */ package com.jpexs.decompiler.flash.action.parser.script; import com.jpexs.decompiler.graph.GraphTargetItem; @@ -102,7 +103,7 @@ public enum SymbolType { BITAND(GraphTargetItem.PRECEDENCE_BITWISEAND, true), BITOR(GraphTargetItem.PRECEDENCE_BITWISEOR, true), XOR(GraphTargetItem.PRECEDENCE_BITWISEXOR, true), - MODULO(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true), + MODULO(GraphTargetItem.PRECEDENCE_MULTIPLICATIVE, true), SHIFT_LEFT(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true), SHIFT_RIGHT(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true), USHIFT_RIGHT(GraphTargetItem.PRECEDENCE_BITWISESHIFT, true),