From bf195f1a6ae344a40a8dfc1c5d13f2278f871201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Tue, 16 Jul 2013 05:40:32 +0200 Subject: [PATCH] Refactoring: AVM2 / TreeItem => AVM2Item Action / TreeItem => ActionItem decompiler.flash.graph => decompiler.graph --- trunk/src/com/jpexs/decompiler/flash/SWF.java | 96 +-- .../decompiler/flash/SWFInputStream.java | 24 +- .../com/jpexs/decompiler/flash/TagNode.java | 2 +- .../decompiler/flash/abc/avm2/AVM2Code.java | 64 +- .../flash/abc/avm2/ConvertOutput.java | 2 +- .../flash/abc/avm2/UnknownJumpException.java | 2 +- .../flash/abc/avm2/graph/AVM2Graph.java | 172 ++--- .../flash/abc/avm2/graph/AVM2GraphSource.java | 8 +- .../avm2/instructions/AVM2Instruction.java | 6 +- .../abc/avm2/instructions/IfTypeIns.java | 2 +- .../instructions/InstructionDefinition.java | 12 +- .../abc/avm2/instructions/SetTypeIns.java | 4 +- .../avm2/instructions/alchemy/Lf32Ins.java | 6 +- .../avm2/instructions/alchemy/Lf64Ins.java | 6 +- .../avm2/instructions/alchemy/Li16Ins.java | 6 +- .../avm2/instructions/alchemy/Li32Ins.java | 6 +- .../abc/avm2/instructions/alchemy/Li8Ins.java | 6 +- .../avm2/instructions/alchemy/Sf32Ins.java | 6 +- .../avm2/instructions/alchemy/Sf64Ins.java | 6 +- .../avm2/instructions/alchemy/Si16Ins.java | 6 +- .../avm2/instructions/alchemy/Si32Ins.java | 6 +- .../abc/avm2/instructions/alchemy/Si8Ins.java | 6 +- .../avm2/instructions/alchemy/Sxi16Ins.java | 6 +- .../avm2/instructions/alchemy/Sxi1Ins.java | 6 +- .../avm2/instructions/alchemy/Sxi8Ins.java | 6 +- .../avm2/instructions/arithmetic/AddIIns.java | 6 +- .../avm2/instructions/arithmetic/AddIns.java | 6 +- .../arithmetic/DecrementIIns.java | 6 +- .../instructions/arithmetic/DecrementIns.java | 6 +- .../instructions/arithmetic/DivideIns.java | 6 +- .../arithmetic/IncrementIIns.java | 6 +- .../instructions/arithmetic/IncrementIns.java | 6 +- .../instructions/arithmetic/ModuloIns.java | 6 +- .../instructions/arithmetic/MultiplyIIns.java | 6 +- .../instructions/arithmetic/MultiplyIns.java | 6 +- .../instructions/arithmetic/NegateIIns.java | 6 +- .../instructions/arithmetic/NegateIns.java | 6 +- .../avm2/instructions/arithmetic/NotIns.java | 4 +- .../instructions/arithmetic/SubtractIIns.java | 6 +- .../instructions/arithmetic/SubtractIns.java | 6 +- .../avm2/instructions/bitwise/BitAndIns.java | 6 +- .../avm2/instructions/bitwise/BitNotIns.java | 6 +- .../avm2/instructions/bitwise/BitOrIns.java | 6 +- .../avm2/instructions/bitwise/BitXorIns.java | 6 +- .../avm2/instructions/bitwise/LShiftIns.java | 6 +- .../avm2/instructions/bitwise/RShiftIns.java | 6 +- .../avm2/instructions/bitwise/URShiftIns.java | 6 +- .../instructions/comparison/EqualsIns.java | 6 +- .../comparison/GreaterEqualsIns.java | 6 +- .../comparison/GreaterThanIns.java | 6 +- .../comparison/LessEqualsIns.java | 6 +- .../instructions/comparison/LessThanIns.java | 6 +- .../comparison/StrictEqualsIns.java | 6 +- .../construction/ConstructIns.java | 50 +- .../construction/ConstructPropIns.java | 14 +- .../construction/ConstructSuperIns.java | 6 +- .../construction/NewActivationIns.java | 6 +- .../construction/NewArrayIns.java | 6 +- .../construction/NewCatchIns.java | 6 +- .../construction/NewClassIns.java | 6 +- .../construction/NewFunctionIns.java | 6 +- .../construction/NewObjectIns.java | 8 +- .../avm2/instructions/executing/CallIns.java | 6 +- .../instructions/executing/CallMethodIns.java | 6 +- .../executing/CallPropLexIns.java | 10 +- .../executing/CallPropVoidIns.java | 10 +- .../executing/CallPropertyIns.java | 10 +- .../instructions/executing/CallStaticIns.java | 6 +- .../instructions/executing/CallSuperIns.java | 10 +- .../executing/CallSuperVoidIns.java | 10 +- .../abc/avm2/instructions/jumps/IfEqIns.java | 10 +- .../avm2/instructions/jumps/IfFalseIns.java | 4 +- .../abc/avm2/instructions/jumps/IfGeIns.java | 10 +- .../abc/avm2/instructions/jumps/IfGtIns.java | 10 +- .../abc/avm2/instructions/jumps/IfLeIns.java | 10 +- .../abc/avm2/instructions/jumps/IfLtIns.java | 10 +- .../abc/avm2/instructions/jumps/IfNGeIns.java | 10 +- .../abc/avm2/instructions/jumps/IfNGtIns.java | 10 +- .../abc/avm2/instructions/jumps/IfNLeIns.java | 10 +- .../abc/avm2/instructions/jumps/IfNLtIns.java | 10 +- .../abc/avm2/instructions/jumps/IfNeIns.java | 10 +- .../instructions/jumps/IfStrictEqIns.java | 10 +- .../instructions/jumps/IfStrictNeIns.java | 10 +- .../avm2/instructions/jumps/IfTrueIns.java | 4 +- .../abc/avm2/instructions/jumps/JumpIns.java | 4 +- .../instructions/jumps/LookupSwitchIns.java | 2 +- .../instructions/localregs/DecLocalIIns.java | 16 +- .../instructions/localregs/DecLocalIns.java | 16 +- .../instructions/localregs/GetLocal0Ins.java | 14 +- .../localregs/GetLocalTypeIns.java | 10 +- .../instructions/localregs/IncLocalIIns.java | 16 +- .../instructions/localregs/IncLocalIns.java | 16 +- .../avm2/instructions/localregs/KillIns.java | 2 +- .../localregs/SetLocalTypeIns.java | 74 +-- .../instructions/other/DeletePropertyIns.java | 14 +- .../instructions/other/FindPropertyIns.java | 10 +- .../other/FindPropertyStrictIns.java | 10 +- .../instructions/other/GetDescendantsIns.java | 10 +- .../instructions/other/GetGlobalScopeIns.java | 10 +- .../instructions/other/GetGlobalSlotIns.java | 12 +- .../avm2/instructions/other/GetLexIns.java | 6 +- .../instructions/other/GetPropertyIns.java | 10 +- .../instructions/other/GetScopeObjectIns.java | 2 +- .../avm2/instructions/other/GetSlotIns.java | 36 +- .../avm2/instructions/other/GetSuperIns.java | 10 +- .../avm2/instructions/other/HasNext2Ins.java | 8 +- .../avm2/instructions/other/HasNextIns.java | 6 +- .../abc/avm2/instructions/other/InIns.java | 6 +- .../instructions/other/InitPropertyIns.java | 10 +- .../avm2/instructions/other/NextNameIns.java | 6 +- .../avm2/instructions/other/NextValueIns.java | 6 +- .../instructions/other/ReturnValueIns.java | 6 +- .../instructions/other/ReturnVoidIns.java | 6 +- .../instructions/other/SetGlobalSlotIns.java | 10 +- .../instructions/other/SetPropertyIns.java | 78 +-- .../avm2/instructions/other/SetSlotIns.java | 100 +-- .../avm2/instructions/other/SetSuperIns.java | 14 +- .../abc/avm2/instructions/other/ThrowIns.java | 6 +- .../abc/avm2/instructions/stack/DupIns.java | 4 +- .../abc/avm2/instructions/stack/PopIns.java | 22 +- .../avm2/instructions/stack/PopScopeIns.java | 12 +- .../avm2/instructions/stack/PushByteIns.java | 6 +- .../instructions/stack/PushDoubleIns.java | 6 +- .../avm2/instructions/stack/PushFalseIns.java | 6 +- .../avm2/instructions/stack/PushIntIns.java | 6 +- .../instructions/stack/PushNamespaceIns.java | 6 +- .../avm2/instructions/stack/PushNanIns.java | 6 +- .../avm2/instructions/stack/PushNullIns.java | 6 +- .../avm2/instructions/stack/PushScopeIns.java | 2 +- .../avm2/instructions/stack/PushShortIns.java | 6 +- .../instructions/stack/PushStringIns.java | 6 +- .../avm2/instructions/stack/PushTrueIns.java | 6 +- .../avm2/instructions/stack/PushUIntIns.java | 6 +- .../instructions/stack/PushUndefinedIns.java | 6 +- .../avm2/instructions/stack/PushWithIns.java | 10 +- .../abc/avm2/instructions/stack/SwapIns.java | 4 +- .../avm2/instructions/types/ApplyTypeIns.java | 6 +- .../avm2/instructions/types/AsTypeIns.java | 8 +- .../instructions/types/AsTypeLateIns.java | 6 +- .../avm2/instructions/types/CoerceAIns.java | 6 +- .../avm2/instructions/types/CoerceIns.java | 6 +- .../avm2/instructions/types/CoerceSIns.java | 6 +- .../avm2/instructions/types/ConvertBIns.java | 6 +- .../avm2/instructions/types/ConvertDIns.java | 6 +- .../avm2/instructions/types/ConvertIIns.java | 6 +- .../avm2/instructions/types/ConvertOIns.java | 6 +- .../avm2/instructions/types/ConvertSIns.java | 6 +- .../avm2/instructions/types/ConvertUIns.java | 6 +- .../instructions/types/InstanceOfIns.java | 6 +- .../avm2/instructions/types/IsTypeIns.java | 8 +- .../instructions/types/IsTypeLateIns.java | 6 +- .../avm2/instructions/types/TypeOfIns.java | 6 +- .../avm2/instructions/xml/CheckFilterIns.java | 6 +- .../abc/avm2/instructions/xml/DXNSIns.java | 8 +- .../avm2/instructions/xml/DXNSLateIns.java | 4 +- .../avm2/instructions/xml/EscXAttrIns.java | 6 +- .../avm2/instructions/xml/EscXElemIns.java | 6 +- .../TreeItem.java => model/AVM2Item.java} | 20 +- .../AlchemyLoadAVM2Item.java} | 10 +- .../AlchemySignExtendAVM2Item.java} | 10 +- .../AlchemyStoreAVM2Item.java} | 10 +- .../ApplyTypeAVM2Item.java} | 10 +- .../BooleanAVM2Item.java} | 6 +- .../CallAVM2Item.java} | 12 +- .../CallMethodAVM2Item.java} | 8 +- .../CallPropertyAVM2Item.java} | 10 +- .../CallStaticAVM2Item.java} | 8 +- .../CallSuperAVM2Item.java} | 10 +- .../ClassAVM2Item.java} | 6 +- .../CoerceAVM2Item.java} | 8 +- .../ConstructAVM2Item.java} | 10 +- .../ConstructPropAVM2Item.java} | 10 +- .../ConstructSuperAVM2Item.java} | 8 +- .../ConvertAVM2Item.java} | 8 +- .../DecLocalAVM2Item.java} | 6 +- .../DecrementAVM2Item.java} | 8 +- .../DefaultXMLNamespace.java | 6 +- .../EscapeXAttrAVM2Item.java} | 8 +- .../EscapeXElemAVM2Item.java} | 8 +- .../FilteredCheckAVM2Item.java} | 8 +- .../FindPropertyAVM2Item.java} | 8 +- .../FloatValueAVM2Item.java} | 6 +- .../FullMultinameAVM2Item.java} | 38 +- .../GetDescendantsAVM2Item.java} | 10 +- .../GetLexAVM2Item.java} | 6 +- .../GetPropertyAVM2Item.java} | 10 +- .../GetSlotAVM2Item.java} | 8 +- .../GetSuperAVM2Item.java} | 10 +- .../HasNextAVM2Item.java} | 8 +- .../InTreeItem.java => model/InAVM2Item.java} | 8 +- .../IncLocalAVM2Item.java} | 6 +- .../IncrementAVM2Item.java} | 8 +- .../InitPropertyAVM2Item.java} | 14 +- .../IntegerValueAVM2Item.java} | 6 +- .../LocalRegAVM2Item.java} | 14 +- .../NameSpaceAVM2Item.java} | 6 +- .../{treemodel => model}/NameValuePair.java | 8 +- .../NanAVM2Item.java} | 6 +- .../NewActivationAVM2Item.java} | 8 +- .../NewArrayAVM2Item.java} | 8 +- .../NewFunctionAVM2Item.java} | 6 +- .../NewObjectAVM2Item.java} | 8 +- .../NextNameAVM2Item.java} | 8 +- .../NextValueAVM2Item.java} | 8 +- .../NotCompileTimeAVM2Item.java} | 10 +- .../NullAVM2Item.java} | 6 +- .../NumberValueAVM2Item.java} | 6 +- .../PostDecrementAVM2Item.java} | 10 +- .../PostIncrementAVM2Item.java} | 10 +- .../ReturnValueAVM2Item.java} | 10 +- .../ReturnVoidAVM2Item.java} | 8 +- .../ScriptAVM2Item.java} | 6 +- .../SetGlobalSlotAVM2Item.java} | 10 +- .../SetLocalAVM2Item.java} | 12 +- .../SetPropertyAVM2Item.java} | 16 +- .../SetSlotAVM2Item.java} | 22 +- .../SetSuperAVM2Item.java} | 12 +- .../SetTypeAVM2Item.java} | 6 +- .../StringAVM2Item.java} | 6 +- .../ThisAVM2Item.java} | 6 +- .../ThrowAVM2Item.java} | 8 +- .../UndefinedAVM2Item.java} | 6 +- .../UnparsedAVM2Item.java} | 6 +- .../WithAVM2Item.java} | 10 +- .../WithEndAVM2Item.java} | 8 +- .../WithObjectAVM2Item.java} | 8 +- .../XMLAVM2Item.java} | 12 +- .../clauses/AssignmentAVM2Item.java} | 4 +- .../clauses/DeclarationAVM2Item.java} | 36 +- .../clauses/ExceptionAVM2Item.java} | 8 +- .../clauses/FilterAVM2Item.java} | 10 +- .../clauses/ForEachInAVM2Item.java} | 34 +- .../clauses/ForInAVM2Item.java} | 34 +- .../clauses/TryAVM2Item.java} | 14 +- .../operations/AddAVM2Item.java} | 10 +- .../operations/AndAVM2Item.java} | 12 +- .../operations/AsTypeAVM2Item.java} | 10 +- .../operations/BitAndAVM2Item.java} | 10 +- .../operations/BitNotAVM2Item.java} | 12 +- .../operations/BitOrAVM2Item.java} | 10 +- .../operations/BitXorAVM2Item.java} | 10 +- .../operations/DeletePropertyAVM2Item.java} | 14 +- .../operations/DivideAVM2Item.java} | 10 +- .../operations/EqAVM2Item.java} | 16 +- .../operations/GeAVM2Item.java} | 16 +- .../operations/GtAVM2Item.java} | 16 +- .../operations/InAVM2Item.java} | 10 +- .../operations/InstanceOfAVM2Item.java} | 10 +- .../operations/IsTypeAVM2Item.java} | 10 +- .../operations/LShiftAVM2Item.java} | 10 +- .../operations/LeAVM2Item.java} | 16 +- .../operations/LtAVM2Item.java} | 16 +- .../operations/ModuloAVM2Item.java} | 10 +- .../operations/MultiplyAVM2Item.java} | 10 +- .../operations/NegAVM2Item.java} | 10 +- .../operations/NeqAVM2Item.java} | 16 +- .../operations/OrAVM2Item.java} | 12 +- .../operations/PreDecrementAVM2Item.java} | 12 +- .../operations/PreIncrementAVM2Item.java} | 10 +- .../operations/RShiftAVM2Item.java} | 10 +- .../operations/StrictEqAVM2Item.java} | 16 +- .../operations/StrictNeqAVM2Item.java} | 16 +- .../operations/SubtractAVM2Item.java} | 12 +- .../operations/TypeOfAVM2Item.java} | 10 +- .../operations/URShiftAVM2Item.java} | 10 +- .../flash/abc/types/MethodBody.java | 4 +- .../flash/abc/types/traits/TraitClass.java | 2 +- .../flash/abc/types/traits/TraitFunction.java | 2 +- .../types/traits/TraitMethodGetterSetter.java | 2 +- .../abc/types/traits/TraitSlotConst.java | 4 +- .../jpexs/decompiler/flash/action/Action.java | 272 ++++---- .../decompiler/flash/action/ActionGraph.java | 106 +-- .../flash/action/ActionGraphSource.java | 8 +- .../flash/action/UnknownJumpException.java | 6 +- .../action/flashlite/ActionFSCommand2.java | 6 +- .../action/flashlite/ActionStrictMode.java | 6 +- .../TreeItem.java => model/ActionItem.java} | 24 +- .../AsciiToCharActionItem.java} | 16 +- .../CallActionItem.java} | 16 +- .../CallFunctionActionItem.java} | 18 +- .../CallMethodActionItem.java} | 24 +- .../CastOpActionItem.java} | 16 +- .../CharToAsciiActionItem.java} | 20 +- .../CloneSpriteActionItem.java} | 16 +- .../{treemodel => model}/ConstantPool.java | 2 +- .../DecrementActionItem.java} | 16 +- .../DefineLocalActionItem.java} | 18 +- .../DefineRegisterActionItem.java} | 6 +- .../DeleteActionItem.java} | 16 +- .../DirectValueActionItem.java} | 20 +- .../EnumerateActionItem.java} | 14 +- .../EvalActionItem.java} | 12 +- .../ExtendsActionItem.java} | 14 +- .../FSCommand2ActionItem.java} | 16 +- .../FSCommandActionItem.java} | 10 +- .../FunctionActionItem.java} | 26 +- .../GetMemberActionItem.java} | 22 +- .../GetPropertyActionItem.java} | 16 +- .../GetTimeActionItem.java} | 10 +- .../GetURL2ActionItem.java} | 16 +- .../GetURLActionItem.java} | 10 +- .../GetVariableActionItem.java} | 18 +- .../GetVersionActionItem.java} | 10 +- .../GotoFrame2ActionItem.java} | 16 +- .../GotoFrameActionItem.java} | 10 +- .../GotoLabelActionItem.java} | 10 +- .../ImplementsOpActionItem.java} | 14 +- .../IncrementActionItem.java} | 16 +- .../InitArrayActionItem.java} | 16 +- .../InitObjectActionItem.java} | 18 +- .../LoadMovieActionItem.java} | 12 +- .../LoadMovieNumActionItem.java} | 20 +- .../LoadVariablesActionItem.java} | 12 +- .../LoadVariablesNumActionItem.java} | 20 +- .../MBAsciiToCharActionItem.java} | 16 +- .../MBCharToAsciiActionItem.java} | 16 +- .../MBStringExtractActionItem.java} | 16 +- .../MBStringLengthActionItem.java} | 16 +- .../NewMethodActionItem.java} | 26 +- .../NewObjectActionItem.java} | 16 +- .../NextFrameActionItem.java} | 10 +- .../PlayActionItem.java} | 10 +- .../PopActionItem.java} | 10 +- .../PostDecrementActionItem.java} | 32 +- .../PostIncrementActionItem.java} | 32 +- .../PrevFrameActionItem.java} | 10 +- .../PrintActionItem.java} | 20 +- .../PrintAsBitmapActionItem.java} | 22 +- .../PrintAsBitmapNumActionItem.java} | 20 +- .../PrintNumActionItem.java} | 20 +- .../RandomNumberActionItem.java} | 16 +- .../RemoveSpriteActionItem.java} | 16 +- .../ReturnActionItem.java} | 22 +- .../SetMemberActionItem.java} | 28 +- .../SetPropertyActionItem.java} | 24 +- .../SetTarget2ActionItem.java} | 16 +- .../SetTargetActionItem.java} | 10 +- .../SetTypeActionItem.java} | 6 +- .../SetVariableActionItem.java} | 26 +- .../StartDragActionItem.java} | 20 +- .../StopActionItem.java} | 10 +- .../StopAllSoundsActionItem.java} | 10 +- .../StopDragActionItem.java} | 10 +- .../StoreRegisterActionItem.java} | 20 +- .../StrictModeActionItem.java} | 8 +- .../StringExtractActionItem.java} | 16 +- .../StringLengthActionItem.java} | 12 +- .../TargetPathActionItem.java} | 16 +- .../ThrowActionItem.java} | 16 +- .../ToIntegerActionItem.java} | 16 +- .../ToNumberActionItem.java} | 16 +- .../ToStringActionItem.java} | 16 +- .../ToggleHighQualityActionItem.java} | 10 +- .../TraceActionItem.java} | 16 +- .../TypeOfActionItem.java} | 16 +- .../UnLoadMovieActionItem.java} | 12 +- .../UnLoadMovieNumActionItem.java} | 20 +- .../UnsupportedActionItem.java} | 8 +- .../clauses/ClassActionItem.java} | 24 +- .../clauses/ForInActionItem.java} | 28 +- .../clauses/IfFrameLoadedActionItem.java} | 22 +- .../clauses/InterfaceActionItem.java} | 20 +- .../clauses/LoopActionItem.java} | 10 +- .../clauses/TellTargetActionItem.java} | 19 +- .../clauses/TryActionItem.java} | 24 +- .../clauses/WithActionItem.java} | 18 +- .../operations/AddActionItem.java} | 14 +- .../operations/AndActionItem.java} | 14 +- .../operations/BitAndActionItem.java} | 14 +- .../operations/BitOrActionItem.java} | 14 +- .../operations/BitXorActionItem.java} | 14 +- .../operations/DivideActionItem.java} | 14 +- .../operations/EqActionItem.java} | 18 +- .../operations/GeActionItem.java} | 18 +- .../operations/GtActionItem.java} | 18 +- .../operations/InActionItem.java} | 12 +- .../operations/InstanceOfActionItem.java} | 14 +- .../operations/Inverted.java | 4 +- .../operations/LShiftActionItem.java} | 14 +- .../operations/LeActionItem.java} | 18 +- .../operations/LtActionItem.java} | 18 +- .../operations/ModuloActionItem.java} | 14 +- .../operations/MultiplyActionItem.java} | 14 +- .../operations/NeqActionItem.java} | 18 +- .../operations/OrActionItem.java} | 14 +- .../operations/PreDecrementActionItem.java} | 42 +- .../operations/PreIncrementActionItem.java} | 42 +- .../operations/RShiftActionItem.java} | 14 +- .../operations/StrictEqActionItem.java} | 18 +- .../operations/StrictNeqActionItem.java} | 18 +- .../operations/StringAddActionItem.java} | 14 +- .../operations/StringEqActionItem.java} | 14 +- .../operations/StringLtActionItem.java} | 14 +- .../operations/SubtractActionItem.java} | 18 +- .../operations/URShiftActionItem.java} | 14 +- .../flash/action/parser/pcode/ASMParser.java | 2 +- .../parser/script/ActionScriptParser.java | 614 +++++++++--------- ...erator.java => ActionSourceGenerator.java} | 98 +-- .../flash/action/special/ActionEnd.java | 4 +- .../flash/action/special/ActionNop.java | 4 +- .../flash/action/swf3/ActionGetURL.java | 28 +- .../flash/action/swf3/ActionGoToLabel.java | 6 +- .../flash/action/swf3/ActionGotoFrame.java | 6 +- .../flash/action/swf3/ActionNextFrame.java | 6 +- .../flash/action/swf3/ActionPlay.java | 6 +- .../flash/action/swf3/ActionPrevFrame.java | 6 +- .../flash/action/swf3/ActionSetTarget.java | 6 +- .../flash/action/swf3/ActionStop.java | 6 +- .../flash/action/swf3/ActionStopSounds.java | 6 +- .../action/swf3/ActionToggleQuality.java | 6 +- .../flash/action/swf3/ActionWaitForFrame.java | 10 +- .../flash/action/swf4/ActionAdd.java | 6 +- .../flash/action/swf4/ActionAnd.java | 6 +- .../flash/action/swf4/ActionAsciiToChar.java | 6 +- .../flash/action/swf4/ActionCall.java | 6 +- .../flash/action/swf4/ActionCharToAscii.java | 6 +- .../flash/action/swf4/ActionCloneSprite.java | 6 +- .../flash/action/swf4/ActionDivide.java | 6 +- .../flash/action/swf4/ActionEndDrag.java | 6 +- .../flash/action/swf4/ActionEquals.java | 6 +- .../flash/action/swf4/ActionGetProperty.java | 14 +- .../flash/action/swf4/ActionGetTime.java | 6 +- .../flash/action/swf4/ActionGetURL2.java | 52 +- .../flash/action/swf4/ActionGetVariable.java | 22 +- .../flash/action/swf4/ActionGotoFrame2.java | 6 +- .../flash/action/swf4/ActionIf.java | 4 +- .../flash/action/swf4/ActionJump.java | 4 +- .../flash/action/swf4/ActionLess.java | 6 +- .../action/swf4/ActionMBAsciiToChar.java | 6 +- .../action/swf4/ActionMBCharToAscii.java | 6 +- .../action/swf4/ActionMBStringExtract.java | 6 +- .../action/swf4/ActionMBStringLength.java | 6 +- .../flash/action/swf4/ActionMultiply.java | 6 +- .../flash/action/swf4/ActionNot.java | 4 +- .../flash/action/swf4/ActionOr.java | 6 +- .../flash/action/swf4/ActionPop.java | 20 +- .../flash/action/swf4/ActionPush.java | 24 +- .../flash/action/swf4/ActionRandomNumber.java | 6 +- .../flash/action/swf4/ActionRemoveSprite.java | 6 +- .../flash/action/swf4/ActionSetProperty.java | 40 +- .../flash/action/swf4/ActionSetTarget2.java | 6 +- .../flash/action/swf4/ActionSetVariable.java | 52 +- .../flash/action/swf4/ActionStartDrag.java | 10 +- .../flash/action/swf4/ActionStringAdd.java | 6 +- .../flash/action/swf4/ActionStringEquals.java | 6 +- .../action/swf4/ActionStringExtract.java | 6 +- .../flash/action/swf4/ActionStringLength.java | 6 +- .../flash/action/swf4/ActionStringLess.java | 6 +- .../flash/action/swf4/ActionSubtract.java | 6 +- .../flash/action/swf4/ActionToInteger.java | 6 +- .../flash/action/swf4/ActionTrace.java | 6 +- .../action/swf4/ActionWaitForFrame2.java | 6 +- .../flash/action/swf5/ActionAdd2.java | 6 +- .../flash/action/swf5/ActionBitAnd.java | 6 +- .../flash/action/swf5/ActionBitLShift.java | 6 +- .../flash/action/swf5/ActionBitOr.java | 6 +- .../flash/action/swf5/ActionBitRShift.java | 6 +- .../flash/action/swf5/ActionBitURShift.java | 6 +- .../flash/action/swf5/ActionBitXor.java | 6 +- .../flash/action/swf5/ActionCallFunction.java | 8 +- .../flash/action/swf5/ActionCallMethod.java | 6 +- .../flash/action/swf5/ActionConstantPool.java | 2 +- .../flash/action/swf5/ActionDecrement.java | 6 +- .../action/swf5/ActionDefineFunction.java | 10 +- .../flash/action/swf5/ActionDefineLocal.java | 8 +- .../flash/action/swf5/ActionDefineLocal2.java | 6 +- .../flash/action/swf5/ActionDelete.java | 10 +- .../flash/action/swf5/ActionDelete2.java | 10 +- .../flash/action/swf5/ActionEnumerate.java | 10 +- .../flash/action/swf5/ActionEquals2.java | 6 +- .../flash/action/swf5/ActionGetMember.java | 6 +- .../flash/action/swf5/ActionIncrement.java | 6 +- .../flash/action/swf5/ActionInitArray.java | 6 +- .../flash/action/swf5/ActionInitObject.java | 6 +- .../flash/action/swf5/ActionLess2.java | 6 +- .../flash/action/swf5/ActionModulo.java | 6 +- .../flash/action/swf5/ActionNewMethod.java | 6 +- .../flash/action/swf5/ActionNewObject.java | 6 +- .../action/swf5/ActionPushDuplicate.java | 4 +- .../flash/action/swf5/ActionReturn.java | 6 +- .../flash/action/swf5/ActionSetMember.java | 54 +- .../flash/action/swf5/ActionStackSwap.java | 4 +- .../action/swf5/ActionStoreRegister.java | 40 +- .../flash/action/swf5/ActionTargetPath.java | 6 +- .../flash/action/swf5/ActionToNumber.java | 6 +- .../flash/action/swf5/ActionToString.java | 6 +- .../flash/action/swf5/ActionTypeOf.java | 6 +- .../flash/action/swf5/ActionWith.java | 10 +- .../flash/action/swf6/ActionEnumerate2.java | 10 +- .../flash/action/swf6/ActionGreater.java | 6 +- .../flash/action/swf6/ActionInstanceOf.java | 6 +- .../flash/action/swf6/ActionStrictEquals.java | 6 +- .../action/swf6/ActionStringGreater.java | 6 +- .../flash/action/swf7/ActionCastOp.java | 6 +- .../action/swf7/ActionDefineFunction2.java | 10 +- .../flash/action/swf7/ActionExtends.java | 6 +- .../flash/action/swf7/ActionImplementsOp.java | 6 +- .../flash/action/swf7/ActionThrow.java | 6 +- .../flash/action/swf7/ActionTry.java | 20 +- .../decompiler/flash/graph/LogicalOpItem.java | 10 - .../decompiler/flash/gui/GraphFrame.java | 4 +- .../decompiler/flash/gui/GraphTreeFrame.java | 2 +- .../flash/gui/abc/ASMSourceEditorPane.java | 2 +- .../flash/gui/action/ActionPanel.java | 4 +- .../decompiler/flash/helpers/Helper.java | 2 +- .../decompiler/flash/xfl/XFLConverter.java | 2 +- .../decompiler/{flash => }/graph/Block.java | 3 +- .../decompiler/{flash => }/graph/Graph.java | 19 +- .../{flash => }/graph/GraphPart.java | 2 +- .../{flash => }/graph/GraphPartMulti.java | 2 +- .../{flash => }/graph/GraphPath.java | 2 +- .../{flash => }/graph/GraphSource.java | 2 +- .../{flash => }/graph/GraphSourceItem.java | 2 +- .../graph/GraphSourceItemContainer.java | 2 +- .../{flash => }/graph/GraphSourceItemPos.java | 2 +- .../{flash => }/graph/GraphTargetItem.java | 3 +- .../decompiler/{flash => }/graph/Loop.java | 2 +- .../{flash => }/graph/MarkItem.java | 2 +- .../{flash => }/graph/SourceGenerator.java | 15 +- .../{flash/graph => graph/model}/AndItem.java | 6 +- .../graph => graph/model}/BinaryOp.java | 4 +- .../graph => graph/model}/BinaryOpItem.java | 6 +- .../graph => graph/model}/BlockItem.java | 6 +- .../graph => graph/model}/BreakItem.java | 5 +- .../model}/CommaExpressionItem.java | 5 +- .../graph => graph/model}/CommentItem.java | 3 +- .../graph => graph/model}/ContinueItem.java | 5 +- .../graph => graph/model}/DoWhileItem.java | 7 +- .../graph => graph/model}/DuplicateItem.java | 5 +- .../graph => graph/model}/ExitItem.java | 2 +- .../{flash/graph => graph/model}/ForItem.java | 7 +- .../{flash/graph => graph/model}/IfItem.java | 6 +- .../model}/IntegerValueItem.java | 4 +- .../decompiler/graph/model/LogicalOpItem.java | 12 + .../graph => graph/model}/LoopItem.java | 6 +- .../{flash/graph => graph/model}/NotItem.java | 7 +- .../{flash/graph => graph/model}/OrItem.java | 6 +- .../model}/ParenthesisItem.java | 5 +- .../graph => graph/model}/ScriptEndItem.java | 3 +- .../graph => graph/model}/SwitchItem.java | 8 +- .../graph => graph/model}/TernarOpItem.java | 5 +- .../graph => graph/model}/TrueItem.java | 4 +- .../{flash/graph => graph/model}/UnaryOp.java | 4 +- .../graph => graph/model}/UnaryOpItem.java | 7 +- .../model}/UniversalLoopItem.java | 6 +- .../graph => graph/model}/WhileItem.java | 7 +- 546 files changed, 3659 insertions(+), 3517 deletions(-) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/TreeItem.java => model/AVM2Item.java} (83%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/AlchemyLoadTreeItem.java => model/AlchemyLoadAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/AlchemySignExtendTreeItem.java => model/AlchemySignExtendAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/AlchemyStoreTreeItem.java => model/AlchemyStoreAVM2Item.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ApplyTypeTreeItem.java => model/ApplyTypeAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/BooleanTreeItem.java => model/BooleanAVM2Item.java} (87%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/CallTreeItem.java => model/CallAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/CallMethodTreeItem.java => model/CallMethodAVM2Item.java} (87%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/CallPropertyTreeItem.java => model/CallPropertyAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/CallStaticTreeItem.java => model/CallStaticAVM2Item.java} (87%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/CallSuperTreeItem.java => model/CallSuperAVM2Item.java} (83%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ClassTreeItem.java => model/ClassAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/CoerceTreeItem.java => model/CoerceAVM2Item.java} (87%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ConstructTreeItem.java => model/ConstructAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ConstructPropTreeItem.java => model/ConstructPropAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ConstructSuperTreeItem.java => model/ConstructSuperAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ConvertTreeItem.java => model/ConvertAVM2Item.java} (88%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/DecLocalTreeItem.java => model/DecLocalAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/DecrementTreeItem.java => model/DecrementAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel => model}/DefaultXMLNamespace.java (87%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/EscapeXAttrTreeItem.java => model/EscapeXAttrAVM2Item.java} (83%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/EscapeXElemTreeItem.java => model/EscapeXElemAVM2Item.java} (83%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/FilteredCheckTreeItem.java => model/FilteredCheckAVM2Item.java} (83%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/FindPropertyTreeItem.java => model/FindPropertyAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/FloatValueTreeItem.java => model/FloatValueAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/FullMultinameTreeItem.java => model/FullMultinameAVM2Item.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/GetDescendantsTreeItem.java => model/GetDescendantsAVM2Item.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/GetLexTreeItem.java => model/GetLexAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/GetPropertyTreeItem.java => model/GetPropertyAVM2Item.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/GetSlotTreeItem.java => model/GetSlotAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/GetSuperTreeItem.java => model/GetSuperAVM2Item.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/HasNextTreeItem.java => model/HasNextAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/InTreeItem.java => model/InAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/IncLocalTreeItem.java => model/IncLocalAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/IncrementTreeItem.java => model/IncrementAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/InitPropertyTreeItem.java => model/InitPropertyAVM2Item.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/IntegerValueTreeItem.java => model/IntegerValueAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/LocalRegTreeItem.java => model/LocalRegAVM2Item.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NameSpaceTreeItem.java => model/NameSpaceAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel => model}/NameValuePair.java (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NanTreeItem.java => model/NanAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NewActivationTreeItem.java => model/NewActivationAVM2Item.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NewArrayTreeItem.java => model/NewArrayAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NewFunctionTreeItem.java => model/NewFunctionAVM2Item.java} (88%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NewObjectTreeItem.java => model/NewObjectAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NextNameTreeItem.java => model/NextNameAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NextValueTreeItem.java => model/NextValueAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NotCompileTimeTreeItem.java => model/NotCompileTimeAVM2Item.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NullTreeItem.java => model/NullAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/NumberValueTreeItem.java => model/NumberValueAVM2Item.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/PostDecrementTreeItem.java => model/PostDecrementAVM2Item.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/PostIncrementTreeItem.java => model/PostIncrementAVM2Item.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ReturnValueTreeItem.java => model/ReturnValueAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ReturnVoidTreeItem.java => model/ReturnVoidAVM2Item.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ScriptTreeItem.java => model/ScriptAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/SetGlobalSlotTreeItem.java => model/SetGlobalSlotAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/SetLocalTreeItem.java => model/SetLocalAVM2Item.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/SetPropertyTreeItem.java => model/SetPropertyAVM2Item.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/SetSlotTreeItem.java => model/SetSlotAVM2Item.java} (74%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/SetSuperTreeItem.java => model/SetSuperAVM2Item.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/SetTypeTreeItem.java => model/SetTypeAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/StringTreeItem.java => model/StringAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ThisTreeItem.java => model/ThisAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/ThrowTreeItem.java => model/ThrowAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/UndefinedTreeItem.java => model/UndefinedAVM2Item.java} (86%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/UnparsedTreeItem.java => model/UnparsedAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/WithTreeItem.java => model/WithAVM2Item.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/WithEndTreeItem.java => model/WithEndAVM2Item.java} (82%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/WithObjectTreeItem.java => model/WithObjectAVM2Item.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/XMLTreeItem.java => model/XMLAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/clauses/AssignmentTreeItem.java => model/clauses/AssignmentAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/clauses/DeclarationTreeItem.java => model/clauses/DeclarationAVM2Item.java} (60%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/clauses/ExceptionTreeItem.java => model/clauses/ExceptionAVM2Item.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/clauses/FilterTreeItem.java => model/clauses/FilterAVM2Item.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/clauses/ForEachInTreeItem.java => model/clauses/ForEachInAVM2Item.java} (66%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/clauses/ForInTreeItem.java => model/clauses/ForInAVM2Item.java} (66%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/clauses/TryTreeItem.java => model/clauses/TryAVM2Item.java} (89%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/AddTreeItem.java => model/operations/AddAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/AndTreeItem.java => model/operations/AndAVM2Item.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/AsTypeTreeItem.java => model/operations/AsTypeAVM2Item.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/BitAndTreeItem.java => model/operations/BitAndAVM2Item.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/BitNotTreeItem.java => model/operations/BitNotAVM2Item.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/BitOrTreeItem.java => model/operations/BitOrAVM2Item.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/BitXorTreeItem.java => model/operations/BitXorAVM2Item.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/DeletePropertyTreeItem.java => model/operations/DeletePropertyAVM2Item.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/DivideTreeItem.java => model/operations/DivideAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/EqTreeItem.java => model/operations/EqAVM2Item.java} (67%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/GeTreeItem.java => model/operations/GeAVM2Item.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/GtTreeItem.java => model/operations/GtAVM2Item.java} (67%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/InTreeItem.java => model/operations/InAVM2Item.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/InstanceOfTreeItem.java => model/operations/InstanceOfAVM2Item.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/IsTypeTreeItem.java => model/operations/IsTypeAVM2Item.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/LShiftTreeItem.java => model/operations/LShiftAVM2Item.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/LeTreeItem.java => model/operations/LeAVM2Item.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/LtTreeItem.java => model/operations/LtAVM2Item.java} (67%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/ModuloTreeItem.java => model/operations/ModuloAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/MultiplyTreeItem.java => model/operations/MultiplyAVM2Item.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/NegTreeItem.java => model/operations/NegAVM2Item.java} (76%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/NeqTreeItem.java => model/operations/NeqAVM2Item.java} (67%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/OrTreeItem.java => model/operations/OrAVM2Item.java} (75%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/PreDecrementTreeItem.java => model/operations/PreDecrementAVM2Item.java} (68%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/PreIncrementTreeItem.java => model/operations/PreIncrementAVM2Item.java} (74%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/RShiftTreeItem.java => model/operations/RShiftAVM2Item.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/StrictEqTreeItem.java => model/operations/StrictEqAVM2Item.java} (69%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/StrictNeqTreeItem.java => model/operations/StrictNeqAVM2Item.java} (69%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/SubtractTreeItem.java => model/operations/SubtractAVM2Item.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/TypeOfTreeItem.java => model/operations/TypeOfAVM2Item.java} (85%) rename trunk/src/com/jpexs/decompiler/flash/abc/avm2/{treemodel/operations/URShiftTreeItem.java => model/operations/URShiftAVM2Item.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/TreeItem.java => model/ActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/AsciiToCharTreeItem.java => model/AsciiToCharActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/CallTreeItem.java => model/CallActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/CallFunctionTreeItem.java => model/CallFunctionActionItem.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/CallMethodTreeItem.java => model/CallMethodActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/CastOpTreeItem.java => model/CastOpActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/CharToAsciiTreeItem.java => model/CharToAsciiActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/CloneSpriteTreeItem.java => model/CloneSpriteActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel => model}/ConstantPool.java (93%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/DecrementTreeItem.java => model/DecrementActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/DefineLocalTreeItem.java => model/DefineLocalActionItem.java} (76%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/DefineRegisterTreeItem.java => model/DefineRegisterActionItem.java} (83%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/DeleteTreeItem.java => model/DeleteActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/DirectValueTreeItem.java => model/DirectValueActionItem.java} (88%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/EnumerateTreeItem.java => model/EnumerateActionItem.java} (69%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/EvalTreeItem.java => model/EvalActionItem.java} (76%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ExtendsTreeItem.java => model/ExtendsActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/FSCommand2TreeItem.java => model/FSCommand2ActionItem.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/FSCommandTreeItem.java => model/FSCommandActionItem.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/FunctionTreeItem.java => model/FunctionActionItem.java} (89%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GetMemberTreeItem.java => model/GetMemberActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GetPropertyTreeItem.java => model/GetPropertyActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GetTimeTreeItem.java => model/GetTimeActionItem.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GetURL2TreeItem.java => model/GetURL2ActionItem.java} (74%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GetURLTreeItem.java => model/GetURLActionItem.java} (81%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GetVariableTreeItem.java => model/GetVariableActionItem.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GetVersionTreeItem.java => model/GetVersionActionItem.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GotoFrame2TreeItem.java => model/GotoFrame2ActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GotoFrameTreeItem.java => model/GotoFrameActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/GotoLabelTreeItem.java => model/GotoLabelActionItem.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ImplementsOpTreeItem.java => model/ImplementsOpActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/IncrementTreeItem.java => model/IncrementActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/InitArrayTreeItem.java => model/InitArrayActionItem.java} (75%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/InitObjectTreeItem.java => model/InitObjectActionItem.java} (76%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/LoadMovieTreeItem.java => model/LoadMovieActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/LoadMovieNumTreeItem.java => model/LoadMovieNumActionItem.java} (66%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/LoadVariablesTreeItem.java => model/LoadVariablesActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/LoadVariablesNumTreeItem.java => model/LoadVariablesNumActionItem.java} (66%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/MBAsciiToCharTreeItem.java => model/MBAsciiToCharActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/MBCharToAsciiTreeItem.java => model/MBCharToAsciiActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/MBStringExtractTreeItem.java => model/MBStringExtractActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/MBStringLengthTreeItem.java => model/MBStringLengthActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/NewMethodTreeItem.java => model/NewMethodActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/NewObjectTreeItem.java => model/NewObjectActionItem.java} (74%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/NextFrameTreeItem.java => model/NextFrameActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PlayTreeItem.java => model/PlayActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PopTreeItem.java => model/PopActionItem.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PostDecrementTreeItem.java => model/PostDecrementActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PostIncrementTreeItem.java => model/PostIncrementActionItem.java} (74%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PrevFrameTreeItem.java => model/PrevFrameActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PrintTreeItem.java => model/PrintActionItem.java} (61%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PrintAsBitmapTreeItem.java => model/PrintAsBitmapActionItem.java} (59%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PrintAsBitmapNumTreeItem.java => model/PrintAsBitmapNumActionItem.java} (59%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/PrintNumTreeItem.java => model/PrintNumActionItem.java} (59%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/RandomNumberTreeItem.java => model/RandomNumberActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/RemoveSpriteTreeItem.java => model/RemoveSpriteActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ReturnTreeItem.java => model/ReturnActionItem.java} (75%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/SetMemberTreeItem.java => model/SetMemberActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/SetPropertyTreeItem.java => model/SetPropertyActionItem.java} (75%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/SetTarget2TreeItem.java => model/SetTarget2ActionItem.java} (69%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/SetTargetTreeItem.java => model/SetTargetActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/SetTypeTreeItem.java => model/SetTypeActionItem.java} (83%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/SetVariableTreeItem.java => model/SetVariableActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StartDragTreeItem.java => model/StartDragActionItem.java} (76%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StopTreeItem.java => model/StopActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StopAllSoundsTreeItem.java => model/StopAllSoundsActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StopDragTreeItem.java => model/StopDragActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StoreRegisterTreeItem.java => model/StoreRegisterActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StrictModeTreeItem.java => model/StrictModeActionItem.java} (80%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StringExtractTreeItem.java => model/StringExtractActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/StringLengthTreeItem.java => model/StringLengthActionItem.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/TargetPathTreeItem.java => model/TargetPathActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ThrowTreeItem.java => model/ThrowActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ToIntegerTreeItem.java => model/ToIntegerActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ToNumberTreeItem.java => model/ToNumberActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ToStringTreeItem.java => model/ToStringActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/ToggleHighQualityTreeItem.java => model/ToggleHighQualityActionItem.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/TraceTreeItem.java => model/TraceActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/TypeOfTreeItem.java => model/TypeOfActionItem.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/UnLoadMovieTreeItem.java => model/UnLoadMovieActionItem.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/UnLoadMovieNumTreeItem.java => model/UnLoadMovieNumActionItem.java} (63%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/UnsupportedTreeItem.java => model/UnsupportedActionItem.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/ClassTreeItem.java => model/clauses/ClassActionItem.java} (78%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/ForInTreeItem.java => model/clauses/ForInActionItem.java} (79%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/IfFrameLoadedTreeItem.java => model/clauses/IfFrameLoadedActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/InterfaceTreeItem.java => model/clauses/InterfaceActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/LoopTreeItem.java => model/clauses/LoopActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/TellTargetTreeItem.java => model/clauses/TellTargetActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/TryTreeItem.java => model/clauses/TryActionItem.java} (84%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/clauses/WithTreeItem.java => model/clauses/WithActionItem.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/AddTreeItem.java => model/operations/AddActionItem.java} (77%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/AndTreeItem.java => model/operations/AndActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/BitAndTreeItem.java => model/operations/BitAndActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/BitOrTreeItem.java => model/operations/BitOrActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/BitXorTreeItem.java => model/operations/BitXorActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/DivideTreeItem.java => model/operations/DivideActionItem.java} (74%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/EqTreeItem.java => model/operations/EqActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/GeTreeItem.java => model/operations/GeActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/GtTreeItem.java => model/operations/GtActionItem.java} (67%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/InTreeItem.java => model/operations/InActionItem.java} (68%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/InstanceOfTreeItem.java => model/operations/InstanceOfActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel => model}/operations/Inverted.java (83%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/LShiftTreeItem.java => model/operations/LShiftActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/LeTreeItem.java => model/operations/LeActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/LtTreeItem.java => model/operations/LtActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/ModuloTreeItem.java => model/operations/ModuloActionItem.java} (74%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/MultiplyTreeItem.java => model/operations/MultiplyActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/NeqTreeItem.java => model/operations/NeqActionItem.java} (71%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/OrTreeItem.java => model/operations/OrActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/PreDecrementTreeItem.java => model/operations/PreDecrementActionItem.java} (66%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/PreIncrementTreeItem.java => model/operations/PreIncrementActionItem.java} (66%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/RShiftTreeItem.java => model/operations/RShiftActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/StrictEqTreeItem.java => model/operations/StrictEqActionItem.java} (68%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/StrictNeqTreeItem.java => model/operations/StrictNeqActionItem.java} (69%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/StringAddTreeItem.java => model/operations/StringAddActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/StringEqTreeItem.java => model/operations/StringEqActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/StringLtTreeItem.java => model/operations/StringLtActionItem.java} (70%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/SubtractTreeItem.java => model/operations/SubtractActionItem.java} (73%) rename trunk/src/com/jpexs/decompiler/flash/action/{treemodel/operations/URShiftTreeItem.java => model/operations/URShiftActionItem.java} (72%) rename trunk/src/com/jpexs/decompiler/flash/action/parser/script/{ActionScriptSourceGenerator.java => ActionSourceGenerator.java} (88%) delete mode 100644 trunk/src/com/jpexs/decompiler/flash/graph/LogicalOpItem.java rename trunk/src/com/jpexs/decompiler/{flash => }/graph/Block.java (87%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/Graph.java (96%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphPart.java (96%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphPartMulti.java (94%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphPath.java (95%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphSource.java (95%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphSourceItem.java (93%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphSourceItemContainer.java (94%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphSourceItemPos.java (92%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/GraphTargetItem.java (95%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/Loop.java (94%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/MarkItem.java (92%) rename trunk/src/com/jpexs/decompiler/{flash => }/graph/SourceGenerator.java (71%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/AndItem.java (83%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/BinaryOp.java (88%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/BinaryOpItem.java (92%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/BlockItem.java (82%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/BreakItem.java (73%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/CommaExpressionItem.java (86%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/CommentItem.java (89%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/ContinueItem.java (73%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/DoWhileItem.java (88%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/DuplicateItem.java (87%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/ExitItem.java (54%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/ForItem.java (90%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/IfItem.java (91%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/IntegerValueItem.java (86%) create mode 100644 trunk/src/com/jpexs/decompiler/graph/model/LogicalOpItem.java rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/LoopItem.java (80%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/NotItem.java (77%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/OrItem.java (83%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/ParenthesisItem.java (84%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/ScriptEndItem.java (89%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/SwitchItem.java (90%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/TernarOpItem.java (86%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/TrueItem.java (68%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/UnaryOp.java (86%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/UnaryOpItem.java (84%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/UniversalLoopItem.java (87%) rename trunk/src/com/jpexs/decompiler/{flash/graph => graph/model}/WhileItem.java (88%) diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java index 6dcfa40c1..0b6f8d511 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -41,22 +41,22 @@ import com.jpexs.decompiler.flash.action.swf5.ActionNewMethod; import com.jpexs.decompiler.flash.action.swf5.ActionNewObject; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.ClassTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.InterfaceTreeItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.InterfaceActionItem; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.flv.AUDIODATA; import com.jpexs.decompiler.flash.flv.FLVOutputStream; import com.jpexs.decompiler.flash.flv.FLVTAG; import com.jpexs.decompiler.flash.flv.VIDEODATA; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Cache; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.collections.MyEntry; @@ -1345,11 +1345,11 @@ public class SWF { public static final String validNextCharacters = validFirstCharacters + "0123456789"; public static final String fooCharacters = "bcdfghjklmnpqrstvwz"; public static final String fooJoinCharacters = "aeiouy"; - private List> allVariableNames = new ArrayList<>(); + private List> allVariableNames = new ArrayList<>(); private HashSet allVariableNamesStr = new HashSet<>(); private List allFunctions = new ArrayList<>(); - private HashMap allStrings = new HashMap<>(); - private HashMap usageTypes = new HashMap<>(); + private HashMap allStrings = new HashMap<>(); + private HashMap usageTypes = new HashMap<>(); private String fooString(String orig, boolean firstUppercase, int rndSize) { boolean exists; @@ -1451,7 +1451,7 @@ public class SWF { return null; } - private static void getVariables(ConstantPool constantPool, List localData, Stack stack, List output, ActionGraphSource code, int ip, List> variables, List functions, HashMap strings, List visited, HashMap usageTypes, String path) { + private static void getVariables(ConstantPool constantPool, List localData, Stack stack, List output, ActionGraphSource code, int ip, List> variables, List functions, HashMap strings, List visited, HashMap usageTypes, String path) { boolean debugMode = false; while ((ip > -1) && ip < code.size()) { if (visited.contains(ip)) { @@ -1539,14 +1539,14 @@ public class SWF { usageType = "member"; } - if (name instanceof DirectValueTreeItem) { - variables.add(new MyEntry<>((DirectValueTreeItem) name, constantPool)); - usageTypes.put((DirectValueTreeItem) name, usageType); + if (name instanceof DirectValueActionItem) { + variables.add(new MyEntry<>((DirectValueActionItem) name, constantPool)); + usageTypes.put((DirectValueActionItem) name, usageType); } //for..in return - if (((ins instanceof ActionEquals) || (ins instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueTreeItem)) { - stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList())); + if (((ins instanceof ActionEquals) || (ins instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueActionItem)) { + stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList())); } if (ins instanceof ActionConstantPool) { @@ -1566,8 +1566,8 @@ public class SWF { if (ins instanceof ActionPush) { if (!stack.isEmpty()) { GraphTargetItem top = stack.peek(); - if (top instanceof DirectValueTreeItem) { - DirectValueTreeItem dvt = (DirectValueTreeItem) top; + if (top instanceof DirectValueActionItem) { + DirectValueActionItem dvt = (DirectValueActionItem) top; if ((dvt.value instanceof String) || (dvt.value instanceof ConstantIndex)) { if (constantPool == null) { constantPool = new ConstantPool(dvt.constants); @@ -1602,7 +1602,7 @@ public class SWF { }; } - private static void getVariables(List> variables, List functions, HashMap strings, HashMap usageType, ActionGraphSource code, int addr, String path) { + private static void getVariables(List> variables, List functions, HashMap strings, HashMap usageType, ActionGraphSource code, int addr, String path) { List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); try { getVariables(null, localData, new Stack(), new ArrayList(), code, code.adr2pos(addr), variables, functions, strings, new ArrayList(), usageType, path); @@ -1611,8 +1611,8 @@ public class SWF { } } - private List> getVariables(List> variables, List functions, HashMap strings, HashMap usageType, ASMSource src, String path) { - List> ret = new ArrayList<>(); + private List> getVariables(List> variables, List functions, HashMap strings, HashMap usageType, ASMSource src, String path) { + List> ret = new ArrayList<>(); List actions = src.getActions(version); actionsMap.put(src, actions); getVariables(variables, functions, strings, usageType, new ActionGraphSource(actions, version, new HashMap(), new HashMap(), new HashMap()), 0, path); @@ -1796,7 +1796,7 @@ public class SWF { getVariables(objs, ""); informListeners("rename", ""); int fc = 0; - for (MyEntry it : allVariableNames) { + for (MyEntry it : allVariableNames) { String name = it.key.toStringNoH(it.value); allVariableNamesStr.add(name); } @@ -1829,17 +1829,17 @@ public class SWF { List dec = Action.actionsToTree(dia.getActions(version), version, staticOperation, ""/*FIXME*/); GraphTargetItem name = null; for (GraphTargetItem it : dec) { - if (it instanceof ClassTreeItem) { - ClassTreeItem cti = (ClassTreeItem) it; + if (it instanceof ClassActionItem) { + ClassActionItem cti = (ClassActionItem) it; List methods = new ArrayList<>(); methods.addAll(cti.functions); methods.addAll(cti.staticFunctions); for (GraphTargetItem gti : methods) { - if (gti instanceof FunctionTreeItem) { - FunctionTreeItem fun = (FunctionTreeItem) gti; - if (fun.calculatedFunctionName instanceof DirectValueTreeItem) { - DirectValueTreeItem dvf = (DirectValueTreeItem) fun.calculatedFunctionName; + if (gti instanceof FunctionActionItem) { + FunctionActionItem fun = (FunctionActionItem) gti; + if (fun.calculatedFunctionName instanceof DirectValueActionItem) { + DirectValueActionItem dvf = (DirectValueActionItem) fun.calculatedFunctionName; String fname = dvf.toStringNoH(null); String changed = deobfuscateName(fname, false, "method", renameType, selected); if (changed != null) { @@ -1858,8 +1858,8 @@ public class SWF { vars.add(item.key); } for (GraphTargetItem gti : vars) { - if (gti instanceof DirectValueTreeItem) { - DirectValueTreeItem dvf = (DirectValueTreeItem) gti; + if (gti instanceof DirectValueActionItem) { + DirectValueActionItem dvf = (DirectValueActionItem) gti; String vname = dvf.toStringNoH(null); String changed = deobfuscateName(vname, false, "attribute", renameType, selected); if (changed != null) { @@ -1871,8 +1871,8 @@ public class SWF { name = cti.className; break; } - if (it instanceof InterfaceTreeItem) { - InterfaceTreeItem ift = (InterfaceTreeItem) it; + if (it instanceof InterfaceActionItem) { + InterfaceActionItem ift = (InterfaceActionItem) it; name = ift.name; } } @@ -1880,11 +1880,11 @@ public class SWF { if (name != null) { int pos = 0; - while (name instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) name; + while (name instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) name; GraphTargetItem memberName = mem.memberName; - if (memberName instanceof DirectValueTreeItem) { - DirectValueTreeItem dvt = (DirectValueTreeItem) memberName; + if (memberName instanceof DirectValueActionItem) { + DirectValueActionItem dvt = (DirectValueActionItem) memberName; String nameStr = dvt.toStringNoH(null); if (classNameParts != null) { if (classNameParts.length - 1 - pos < 0) { @@ -1905,10 +1905,10 @@ public class SWF { } name = mem.object; } - if (name instanceof GetVariableTreeItem) { - GetVariableTreeItem var = (GetVariableTreeItem) name; - if (var.name instanceof DirectValueTreeItem) { - DirectValueTreeItem dvt = (DirectValueTreeItem) var.name; + if (name instanceof GetVariableActionItem) { + GetVariableActionItem var = (GetVariableActionItem) name; + if (var.name instanceof DirectValueActionItem) { + DirectValueActionItem dvt = (DirectValueActionItem) var.name; String nameStr = dvt.toStringNoH(null); if (classNameParts != null) { if (classNameParts.length - 1 - pos < 0) { @@ -1960,18 +1960,18 @@ public class SWF { } HashSet stringsNoVarH = new HashSet<>(); - List allVariableNamesDv = new ArrayList<>(); - for (MyEntry it : allVariableNames) { + List allVariableNamesDv = new ArrayList<>(); + for (MyEntry it : allVariableNames) { allVariableNamesDv.add(it.key); } - for (DirectValueTreeItem ti : allStrings.keySet()) { + for (DirectValueActionItem ti : allStrings.keySet()) { if (!allVariableNamesDv.contains(ti)) { stringsNoVarH.add(System.identityHashCode(allStrings.get(ti)) + "_" + ti.toStringNoH(allStrings.get(ti))); } } int vc = 0; - for (MyEntry it : allVariableNames) { + for (MyEntry it : allVariableNames) { vc++; String name = it.key.toStringNoH(it.value); String changed = deobfuscateName(name, false, usageTypes.get(it.key), renameType, selected); diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java index 7aff89a5e..89dc1bca0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -26,15 +26,14 @@ import com.jpexs.decompiler.flash.action.swf4.*; import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.action.swf6.*; import com.jpexs.decompiler.flash.action.swf7.*; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.*; @@ -71,6 +70,7 @@ import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.InflaterInputStream; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; /** * Class for reading data from SWF file @@ -620,8 +620,8 @@ public class SWFInputStream extends InputStream { //for..in return if (deobfuscate) { - if (((ins instanceof ActionEquals) || (ins instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueTreeItem)) { - stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList())); + if (((ins instanceof ActionEquals) || (ins instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueActionItem)) { + stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList())); } try { ins.translate(localData, stack, output, Graph.SOP_SKIP_STATIC, null); @@ -1015,11 +1015,11 @@ public class SWFInputStream extends InputStream { } else if (!(a instanceof GraphSourceItemContainer)) { if (deobfuscate) { //return in for..in, TODO:Handle this better way - if (((a instanceof ActionEquals) || (a instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueTreeItem)) { - stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList())); + if (((a instanceof ActionEquals) || (a instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueActionItem)) { + stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList())); } if ((a instanceof ActionStoreRegister) && stack.isEmpty()) { - stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList())); + stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList())); } a.translate(localData, stack, output, Graph.SOP_SKIP_STATIC, path); } diff --git a/trunk/src/com/jpexs/decompiler/flash/TagNode.java b/trunk/src/com/jpexs/decompiler/flash/TagNode.java index cfb27d26f..15904f013 100644 --- a/trunk/src/com/jpexs/decompiler/flash/TagNode.java +++ b/trunk/src/com/jpexs/decompiler/flash/TagNode.java @@ -17,7 +17,7 @@ package com.jpexs.decompiler.flash; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.graph.Graph; +import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index 076088a69..f4c445956 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -58,8 +58,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.types.*; import com.jpexs.decompiler.flash.abc.avm2.instructions.xml.*; import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser; import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.*; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.*; +import com.jpexs.decompiler.flash.abc.avm2.model.*; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.*; import com.jpexs.decompiler.flash.abc.types.ABCException; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; @@ -68,10 +68,10 @@ import com.jpexs.decompiler.flash.abc.types.traits.Trait; import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import com.jpexs.decompiler.flash.abc.types.traits.Traits; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.*; @@ -887,13 +887,13 @@ public class AVM2Code implements Serializable { public List clearTemporaryRegisters(List output) { for (int i = 0; i < output.size(); i++) { - if (output.get(i) instanceof SetLocalTreeItem) { - if (isKilled(((SetLocalTreeItem) output.get(i)).regIndex, 0, code.size() - 1)) { + if (output.get(i) instanceof SetLocalAVM2Item) { + if (isKilled(((SetLocalAVM2Item) output.get(i)).regIndex, 0, code.size() - 1)) { output.remove(i); i--; } - } else if (output.get(i) instanceof WithTreeItem) { - clearTemporaryRegisters(((WithTreeItem) output.get(i)).items); + } else if (output.get(i) instanceof WithAVM2Item) { + clearTemporaryRegisters(((WithAVM2Item) output.get(i)).items); } } return output; @@ -1012,8 +1012,8 @@ public class AVM2Code implements Serializable { } } }*/ - if ((ins.definition instanceof GetLocalTypeIns) && (!output.isEmpty()) && (output.get(output.size() - 1) instanceof SetLocalTreeItem) && (((SetLocalTreeItem) output.get(output.size() - 1)).regIndex == ((GetLocalTypeIns) ins.definition).getRegisterId(ins)) && isKilled(((SetLocalTreeItem) output.get(output.size() - 1)).regIndex, start, end)) { - SetLocalTreeItem slt = (SetLocalTreeItem) output.remove(output.size() - 1); + if ((ins.definition instanceof GetLocalTypeIns) && (!output.isEmpty()) && (output.get(output.size() - 1) instanceof SetLocalAVM2Item) && (((SetLocalAVM2Item) output.get(output.size() - 1)).regIndex == ((GetLocalTypeIns) ins.definition).getRegisterId(ins)) && isKilled(((SetLocalAVM2Item) output.get(output.size() - 1)).regIndex, start, end)) { + SetLocalAVM2Item slt = (SetLocalAVM2Item) output.remove(output.size() - 1); stack.push(slt.getValue()); ip++; } else if ((ins.definition instanceof SetLocalTypeIns) && (ip + 1 <= end) && (isKilled(((SetLocalTypeIns) ins.definition).getRegisterId(ins), ip, end))) { //set_local_x,get_local_x..kill x @@ -1081,7 +1081,7 @@ public class AVM2Code implements Serializable { break;//FIXME?o } GraphTargetItem v = stack.pop(); - stack.push(new LocalRegTreeItem(ins, reg, v)); + stack.push(new LocalRegAVM2Item(ins, reg, v)); stack.push(v); } else { break; @@ -1139,7 +1139,7 @@ public class AVM2Code implements Serializable { } //What to do when hasDup is false? ins.definition.translate(isStatic, scriptIndex, classIndex, localRegs, stack, scopeStack, constants, ins, method_info, output, body, abc, localRegNames, fullyQualifiedNames, path); - NewFunctionTreeItem nft = (NewFunctionTreeItem) stack.peek(); + NewFunctionAVM2Item nft = (NewFunctionAVM2Item) stack.peek(); nft.functionName = functionName; ip++; } else { @@ -1263,16 +1263,16 @@ public class AVM2Code implements Serializable { if (initTraits != null) { for (int i = 0; i < list.size(); i++) { GraphTargetItem ti = list.get(i); - if ((ti instanceof InitPropertyTreeItem) || (ti instanceof SetPropertyTreeItem)) { + if ((ti instanceof InitPropertyAVM2Item) || (ti instanceof SetPropertyAVM2Item)) { int multinameIndex = 0; GraphTargetItem value = null; - if (ti instanceof InitPropertyTreeItem) { - multinameIndex = ((InitPropertyTreeItem) ti).propertyName.multinameIndex; - value = ((InitPropertyTreeItem) ti).value; + if (ti instanceof InitPropertyAVM2Item) { + multinameIndex = ((InitPropertyAVM2Item) ti).propertyName.multinameIndex; + value = ((InitPropertyAVM2Item) ti).value; } - if (ti instanceof SetPropertyTreeItem) { - multinameIndex = ((SetPropertyTreeItem) ti).propertyName.multinameIndex; - value = ((SetPropertyTreeItem) ti).value; + if (ti instanceof SetPropertyAVM2Item) { + multinameIndex = ((SetPropertyAVM2Item) ti).propertyName.multinameIndex; + value = ((SetPropertyAVM2Item) ti).value; } for (Trait t : initTraits.traits) { if (t.name_index == multinameIndex) { @@ -1296,9 +1296,9 @@ public class AVM2Code implements Serializable { if (isStaticInitializer) { List newList = new ArrayList<>(); for (GraphTargetItem ti : list) { - if (!(ti instanceof ReturnVoidTreeItem)) { - if (!(ti instanceof InitPropertyTreeItem)) { - if (!(ti instanceof SetPropertyTreeItem)) { + if (!(ti instanceof ReturnVoidAVM2Item)) { + if (!(ti instanceof InitPropertyAVM2Item)) { + if (!(ti instanceof SetPropertyAVM2Item)) { newList.add(ti); } } @@ -1317,15 +1317,15 @@ public class AVM2Code implements Serializable { List declaredSlots = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { GraphTargetItem ti = list.get(i); - if (ti instanceof SetLocalTreeItem) { - int reg = ((SetLocalTreeItem) ti).regIndex; + if (ti instanceof SetLocalAVM2Item) { + int reg = ((SetLocalAVM2Item) ti).regIndex; if (!declaredRegisters[reg]) { - list.set(i, new DeclarationTreeItem(ti)); + list.set(i, new DeclarationAVM2Item(ti)); declaredRegisters[reg] = true; } } - if (ti instanceof SetSlotTreeItem) { - SetSlotTreeItem ssti = (SetSlotTreeItem) ti; + if (ti instanceof SetSlotAVM2Item) { + SetSlotAVM2Item ssti = (SetSlotAVM2Item) ti; Slot sl = new Slot(ssti.scope, ssti.slotName); if (!declaredSlots.contains(sl)) { String type = "*"; @@ -1336,7 +1336,7 @@ public class AVM2Code implements Serializable { } } } - list.set(i, new DeclarationTreeItem(ti, type)); + list.set(i, new DeclarationAVM2Item(ti, type)); declaredSlots.add(sl); } } @@ -2049,7 +2049,7 @@ public class AVM2Code implements Serializable { if (r.size() > 1) { if (!stack.isEmpty()) { GraphTargetItem it = stack.pop(); - stack.push(new NotCompileTimeTreeItem(null, it)); + stack.push(new NotCompileTimeAVM2Item(null, it)); } } } @@ -2099,7 +2099,7 @@ public class AVM2Code implements Serializable { if ((ins instanceof AVM2Instruction) && (((AVM2Instruction) ins).definition instanceof NewFunctionIns)) { - stack.push(new BooleanTreeItem(null, true)); + stack.push(new BooleanAVM2Item(null, true)); } else { ins.translate(localData, stack, output, Graph.SOP_USE_STATIC, path); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertOutput.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertOutput.java index 846c57c08..b91887e31 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertOutput.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertOutput.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.abc.avm2; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownJumpException.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownJumpException.java index 0e83a2d51..7dfdc56c5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownJumpException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownJumpException.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.abc.avm2; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java index 0e8b60e1a..a3995d6d2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java @@ -27,40 +27,40 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.GetLocalTypeIn import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.KillIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnValueIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PushIntegerTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FilteredCheckTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.HasNextTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.InTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextNameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextValueTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NullTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnValueTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnVoidTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetTypeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.FilterTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ForEachInTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ForInTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.TryTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictEqTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictNeqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FilteredCheckAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.HasNextAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.InAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NextNameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NextValueAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NullAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ReturnValueAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ReturnVoidAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetLocalAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetTypeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.WithAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ExceptionAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.FilterAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ForEachInAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ForInAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.TryAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictEqAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictNeqAVM2Item; import com.jpexs.decompiler.flash.abc.types.ABCException; import com.jpexs.decompiler.flash.abc.types.MethodBody; -import com.jpexs.decompiler.flash.graph.BreakItem; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphPartMulti; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.IfItem; -import com.jpexs.decompiler.flash.graph.Loop; -import com.jpexs.decompiler.flash.graph.LoopItem; -import com.jpexs.decompiler.flash.graph.NotItem; -import com.jpexs.decompiler.flash.graph.SwitchItem; -import com.jpexs.decompiler.flash.graph.WhileItem; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphPartMulti; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.LoopItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.SwitchItem; +import com.jpexs.decompiler.graph.model.WhileItem; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -253,7 +253,7 @@ public class AVM2Graph extends Graph { if (swins.operands.length >= 3) { if (swins.operands[0] == swins.getBytes().length) { if (code.adr2pos(code.pos2adr(f) + swins.operands[2]) < finStart) { - stack.push(new ExceptionTreeItem(body.exceptions[e])); + stack.push(new ExceptionAVM2Item(body.exceptions[e])); GraphPart fepart = null; for (GraphPart p : allParts) { if (p.start == f + 1) { @@ -309,7 +309,7 @@ public class AVM2Graph extends Graph { break; } } - stack.add(new ExceptionTreeItem(catchedExceptions.get(e))); + stack.add(new ExceptionAVM2Item(catchedExceptions.get(e))); List localData2 = new ArrayList<>(); localData2.addAll(localData); localData2.set(DATA_SCOPESTACK, new Stack()); @@ -332,7 +332,7 @@ public class AVM2Graph extends Graph { List tryCommands = printGraph(new ArrayList(), localData, stack, allParts, parent, part, stopPart2, loops, staticOperation, path); output.clear(); - output.add(new TryTreeItem(tryCommands, catchedExceptions, catchedCommands, finallyCommands)); + output.add(new TryAVM2Item(tryCommands, catchedExceptions, catchedCommands, finallyCommands)); ip = returnPos; } @@ -366,11 +366,11 @@ public class AVM2Graph extends Graph { if (this.code.code.get(part.getPosAt(part.getHeight() - 2)).definition instanceof KillIns) { if (this.code.code.get(part.getPosAt(part.getHeight() - 3)).definition instanceof GetLocalTypeIns) { if (output.size() >= 2) { - if (output.get(output.size() - 2) instanceof SetLocalTreeItem) { + if (output.get(output.size() - 2) instanceof SetLocalAVM2Item) { ret = new ArrayList<>(); ret.addAll(output); ret.remove(ret.size() - 1); - ret.add(new ReturnValueTreeItem(this.code.code.get(part.end), ((SetLocalTreeItem) output.get(output.size() - 2)).value)); + ret.add(new ReturnValueAVM2Item(this.code.code.get(part.end), ((SetLocalAVM2Item) output.get(output.size() - 2)).value)); return ret; } } @@ -386,20 +386,20 @@ public class AVM2Graph extends Graph { } if (((part.nextParts.size() == 2) && (!stack.isEmpty()) - && (stack.peek() instanceof StrictEqTreeItem) + && (stack.peek() instanceof StrictEqAVM2Item) && (part.nextParts.get(0).getHeight() >= 2) && (this.code.code.get(this.code.fixIPAfterDebugLine(part.nextParts.get(0).start)).definition instanceof PushIntegerTypeIns) && (!part.nextParts.get(0).nextParts.isEmpty()) && (this.code.code.get(part.nextParts.get(0).nextParts.get(0).end).definition instanceof LookupSwitchIns)) || ((part.nextParts.size() == 2) && (!stack.isEmpty()) - && (stack.peek() instanceof StrictNeqTreeItem) + && (stack.peek() instanceof StrictNeqAVM2Item) && (part.nextParts.get(1).getHeight() >= 2) && (this.code.code.get(this.code.fixIPAfterDebugLine(part.nextParts.get(1).start)).definition instanceof PushIntegerTypeIns) && (!part.nextParts.get(1).nextParts.isEmpty()) && (this.code.code.get(part.nextParts.get(1).nextParts.get(0).end).definition instanceof LookupSwitchIns))) { - if (stack.peek() instanceof StrictEqTreeItem) { + if (stack.peek() instanceof StrictEqAVM2Item) { ignoredSwitches.add(part.nextParts.get(0).nextParts.get(0).end); } else { ignoredSwitches.add(part.nextParts.get(1).nextParts.get(0).end); @@ -407,26 +407,26 @@ public class AVM2Graph extends Graph { ret = new ArrayList<>(); ret.addAll(output); boolean reversed = false; - if (stack.peek() instanceof StrictEqTreeItem) { + if (stack.peek() instanceof StrictEqAVM2Item) { reversed = true; } GraphTargetItem switchedObject = null; if (!output.isEmpty()) { - if (output.get(output.size() - 1) instanceof SetLocalTreeItem) { - switchedObject = ((SetLocalTreeItem) output.get(output.size() - 1)).value; + if (output.get(output.size() - 1) instanceof SetLocalAVM2Item) { + switchedObject = ((SetLocalAVM2Item) output.get(output.size() - 1)).value; } } if (switchedObject == null) { - switchedObject = new NullTreeItem(null); + switchedObject = new NullAVM2Item(null); } HashMap caseValuesMap = new HashMap<>(); GraphTargetItem tar = stack.pop(); - if (tar instanceof StrictEqTreeItem) { - tar = ((StrictEqTreeItem) tar).leftSide; + if (tar instanceof StrictEqAVM2Item) { + tar = ((StrictEqAVM2Item) tar).leftSide; } - if (tar instanceof StrictNeqTreeItem) { - tar = ((StrictNeqTreeItem) tar).leftSide; + if (tar instanceof StrictNeqAVM2Item) { + tar = ((StrictNeqAVM2Item) tar).leftSide; } caseValuesMap.put(this.code.code.get(part.nextParts.get(reversed ? 0 : 1).start).operands[0], tar); @@ -438,11 +438,11 @@ public class AVM2Graph extends Graph { part = part.nextParts.get(reversed ? 1 : 0); translatePart(localData, part, stack, staticOperation, null); tar = stack.pop(); - if (tar instanceof StrictEqTreeItem) { - tar = ((StrictEqTreeItem) tar).leftSide; + if (tar instanceof StrictEqAVM2Item) { + tar = ((StrictEqAVM2Item) tar).leftSide; } - if (tar instanceof StrictNeqTreeItem) { - tar = ((StrictNeqTreeItem) tar).leftSide; + if (tar instanceof StrictNeqAVM2Item) { + tar = ((StrictNeqAVM2Item) tar).leftSide; } if (this.code.code.get(part.end).definition instanceof IfStrictNeIns) { reversed = false; @@ -565,30 +565,30 @@ public class AVM2Graph extends Graph { if (loopItem instanceof WhileItem) { WhileItem w = (WhileItem) loopItem; - if ((!w.expression.isEmpty()) && (w.expression.get(w.expression.size() - 1) instanceof HasNextTreeItem)) { - if (((HasNextTreeItem) w.expression.get(w.expression.size() - 1)).collection != null) { - if (((HasNextTreeItem) w.expression.get(w.expression.size() - 1)).collection.getNotCoerced().getThroughRegister() instanceof FilteredCheckTreeItem) { - //GraphTargetItem gti = ((HasNextTreeItem) ((HasNextTreeItem) w.expression.get(w.expression.size() - 1))).collection.getNotCoerced().getThroughRegister(); + if ((!w.expression.isEmpty()) && (w.expression.get(w.expression.size() - 1) instanceof HasNextAVM2Item)) { + if (((HasNextAVM2Item) w.expression.get(w.expression.size() - 1)).collection != null) { + if (((HasNextAVM2Item) w.expression.get(w.expression.size() - 1)).collection.getNotCoerced().getThroughRegister() instanceof FilteredCheckAVM2Item) { + //GraphTargetItem gti = ((HasNextAVM2Item) ((HasNextAVM2Item) w.expression.get(w.expression.size() - 1))).collection.getNotCoerced().getThroughRegister(); if (w.commands.size() >= 3) { //((w.commands.size() == 3) || (w.commands.size() == 4)) { int pos = 0; - while (w.commands.get(pos) instanceof SetLocalTreeItem) { + while (w.commands.get(pos) instanceof SetLocalAVM2Item) { pos++; } GraphTargetItem ft = w.commands.get(pos); - if (ft instanceof WithTreeItem) { + if (ft instanceof WithAVM2Item) { ft = w.commands.get(pos + 1); if (ft instanceof IfItem) { IfItem ift = (IfItem) ft; if (ift.onTrue.size() > 0) { ft = ift.onTrue.get(0); - if (ft instanceof SetPropertyTreeItem) { - SetPropertyTreeItem spt = (SetPropertyTreeItem) ft; - if (spt.object instanceof LocalRegTreeItem) { - int regIndex = ((LocalRegTreeItem) spt.object).regIndex; - HasNextTreeItem iti = (HasNextTreeItem) w.expression.get(w.expression.size() - 1); + if (ft instanceof SetPropertyAVM2Item) { + SetPropertyAVM2Item spt = (SetPropertyAVM2Item) ft; + if (spt.object instanceof LocalRegAVM2Item) { + int regIndex = ((LocalRegAVM2Item) spt.object).regIndex; + HasNextAVM2Item iti = (HasNextAVM2Item) w.expression.get(w.expression.size() - 1); @SuppressWarnings("unchecked") HashMap localRegs = (HashMap) localData.get(DATA_LOCALREGS); - localRegs.put(regIndex, new FilterTreeItem(null, iti.collection.getThroughRegister(), ift.expression)); + localRegs.put(regIndex, new FilterAVM2Item(null, iti.collection.getThroughRegister(), ift.expression)); return null; } } @@ -597,13 +597,13 @@ public class AVM2Graph extends Graph { } } } else if (!w.commands.isEmpty()) { - if (w.commands.get(0) instanceof SetTypeTreeItem) { - SetTypeTreeItem sti = (SetTypeTreeItem) w.commands.remove(0); + if (w.commands.get(0) instanceof SetTypeAVM2Item) { + SetTypeAVM2Item sti = (SetTypeAVM2Item) w.commands.remove(0); GraphTargetItem gti = sti.getValue().getNotCoerced(); - if (gti instanceof NextValueTreeItem) { - return new ForEachInTreeItem(w.src, w.loop, new InTreeItem(null, sti.getObject(), ((HasNextTreeItem) w.expression.get(w.expression.size() - 1)).collection), w.commands); - } else if (gti instanceof NextNameTreeItem) { - return new ForInTreeItem(w.src, w.loop, new InTreeItem(null, sti.getObject(), ((HasNextTreeItem) w.expression.get(w.expression.size() - 1)).collection), w.commands); + if (gti instanceof NextValueAVM2Item) { + return new ForEachInAVM2Item(w.src, w.loop, new InAVM2Item(null, sti.getObject(), ((HasNextAVM2Item) w.expression.get(w.expression.size() - 1)).collection), w.commands); + } else if (gti instanceof NextNameAVM2Item) { + return new ForInAVM2Item(w.src, w.loop, new InAVM2Item(null, sti.getObject(), ((HasNextAVM2Item) w.expression.get(w.expression.size() - 1)).collection), w.commands); } } } @@ -617,7 +617,7 @@ public class AVM2Graph extends Graph { protected void finalProcess(List list, int level) { if (level == 0) { if (!list.isEmpty()) { - if (list.get(list.size() - 1) instanceof ReturnVoidTreeItem) { + if (list.get(list.size() - 1) instanceof ReturnVoidAVM2Item) { list.remove(list.size() - 1); } } @@ -638,8 +638,8 @@ public class AVM2Graph extends Graph { list.addAll(ret); } for (int i = 0; i < list.size(); i++) { - if (list.get(i) instanceof SetTypeTreeItem) { - if (((SetTypeTreeItem) list.get(i)).getValue() instanceof ExceptionTreeItem) { + if (list.get(i) instanceof SetTypeAVM2Item) { + if (((SetTypeAVM2Item) list.get(i)).getValue() instanceof ExceptionAVM2Item) { list.remove(i); i--; continue; @@ -647,34 +647,34 @@ public class AVM2Graph extends Graph { } if (list.get(i) instanceof IfItem) { IfItem ifi = (IfItem) list.get(i); - if (((ifi.expression instanceof HasNextTreeItem) + if (((ifi.expression instanceof HasNextAVM2Item) || ((ifi.expression instanceof NotItem) - && (((NotItem) ifi.expression).getOriginal() instanceof HasNextTreeItem)))) { - HasNextTreeItem hnt = null; + && (((NotItem) ifi.expression).getOriginal() instanceof HasNextAVM2Item)))) { + HasNextAVM2Item hnt = null; List body = new ArrayList<>(); List nextbody = new ArrayList<>(); if (ifi.expression instanceof NotItem) { - hnt = (HasNextTreeItem) ((NotItem) ifi.expression).getOriginal(); + hnt = (HasNextAVM2Item) ((NotItem) ifi.expression).getOriginal(); body.addAll(ifi.onFalse); for (int j = i + 1; j < list.size();) { body.add(list.remove(i + 1)); } nextbody = ifi.onTrue; } else { - hnt = (HasNextTreeItem) ifi.expression; + hnt = (HasNextAVM2Item) ifi.expression; body = ifi.onTrue; nextbody = ifi.onFalse; } if (!body.isEmpty()) { - if (body.get(0) instanceof SetTypeTreeItem) { - SetTypeTreeItem sti = (SetTypeTreeItem) body.remove(0); + if (body.get(0) instanceof SetTypeAVM2Item) { + SetTypeAVM2Item sti = (SetTypeAVM2Item) body.remove(0); GraphTargetItem gti = sti.getValue().getNotCoerced(); GraphTargetItem repl = null; - if (gti instanceof NextValueTreeItem) { - repl = new ForEachInTreeItem(ifi.src, new Loop(0, null, null), new InTreeItem(null, sti.getObject(), hnt.collection), body); - } else if (gti instanceof NextNameTreeItem) { - repl = new ForInTreeItem(ifi.src, new Loop(0, null, null), new InTreeItem(null, sti.getObject(), hnt.collection), body); + if (gti instanceof NextValueAVM2Item) { + repl = new ForEachInAVM2Item(ifi.src, new Loop(0, null, null), new InAVM2Item(null, sti.getObject(), hnt.collection), body); + } else if (gti instanceof NextNameAVM2Item) { + repl = new ForInAVM2Item(ifi.src, new Loop(0, null, null), new InAVM2Item(null, sti.getObject(), hnt.collection), body); } if (repl != null) { list.remove(i); @@ -694,8 +694,8 @@ public class AVM2Graph extends Graph { return true; } for (GraphTargetItem i : output) { - if (i instanceof SetLocalTreeItem) { - if (code.isKilled(((SetLocalTreeItem) i).regIndex, 0, code.code.size() - 1)) { + if (i instanceof SetLocalAVM2Item) { + if (code.isKilled(((SetLocalAVM2Item) i).regIndex, 0, code.code.size() - 1)) { continue; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java index cb6fb9279..a8c1bb447 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java @@ -4,10 +4,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConvertOutput; import com.jpexs.decompiler.flash.abc.types.MethodBody; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java index 85de03747..3769bb6c0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java @@ -27,9 +27,9 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnVoidIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ThrowIns; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java index 4fb1266df..a1c76fff1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.abc.avm2.instructions; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.Stack; public interface IfTypeIns { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java index b96e29560..508d4cf87 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.Serializable; import java.util.HashMap; @@ -78,7 +78,7 @@ public class InstructionDefinition implements Serializable { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { } - protected FullMultinameTreeItem resolveMultiname(Stack stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins) { + protected FullMultinameAVM2Item resolveMultiname(Stack stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins) { GraphTargetItem ns = null; GraphTargetItem name = null; if (constants.constant_multiname[multinameIndex].needsName()) { @@ -87,7 +87,7 @@ public class InstructionDefinition implements Serializable { if (constants.constant_multiname[multinameIndex].needsNs()) { ns = (GraphTargetItem) stack.pop(); } - return new FullMultinameTreeItem(ins, multinameIndex, name, ns); + return new FullMultinameAVM2Item(ins, multinameIndex, name, ns); } protected int resolvedCount(ConstantPool constants, int multinameIndex) { @@ -102,7 +102,7 @@ public class InstructionDefinition implements Serializable { } - protected String resolveMultinameNoPop(int pos, Stack stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins, List fullyQualifiedNames) { + protected String resolveMultinameNoPop(int pos, Stack stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins, List fullyQualifiedNames) { String ns = ""; String name; if (constants.constant_multiname[multinameIndex].needsNs()) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/SetTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/SetTypeIns.java index d6d787294..a9c744635 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/SetTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/SetTypeIns.java @@ -17,12 +17,12 @@ package com.jpexs.decompiler.flash.abc.avm2.instructions; import com.jpexs.decompiler.flash.abc.ABC; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import java.util.HashMap; import java.util.List; import java.util.Stack; public interface SetTypeIns { - public abstract String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames); + public abstract String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf32Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf32Ins.java index 7db878e55..ad7260040 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf32Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf32Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyLoadTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyLoadAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Lf32Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); - stack.push(new AlchemyLoadTreeItem(ins, ofs, instructionName)); + stack.push(new AlchemyLoadAVM2Item(ins, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf64Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf64Ins.java index f7834e2b3..65f36d817 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf64Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Lf64Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyLoadTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyLoadAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Lf64Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); - stack.push(new AlchemyLoadTreeItem(ins, ofs, instructionName)); + stack.push(new AlchemyLoadAVM2Item(ins, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li16Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li16Ins.java index 546916cab..42ed2ab88 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li16Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li16Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyLoadTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyLoadAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Li16Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); - stack.push(new AlchemyLoadTreeItem(ins, ofs, instructionName)); + stack.push(new AlchemyLoadAVM2Item(ins, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li32Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li32Ins.java index 3a3ab30bd..8f7eca422 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li32Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li32Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyLoadTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyLoadAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Li32Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); - stack.push(new AlchemyLoadTreeItem(ins, ofs, instructionName)); + stack.push(new AlchemyLoadAVM2Item(ins, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li8Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li8Ins.java index 1c26162ce..44c71bb9b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li8Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Li8Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyLoadTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyLoadAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Li8Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); - stack.push(new AlchemyLoadTreeItem(ins, ofs, instructionName)); + stack.push(new AlchemyLoadAVM2Item(ins, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf32Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf32Ins.java index 40d79a1f4..6d47f5a08 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf32Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf32Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyStoreTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyStoreAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -52,6 +52,6 @@ public class Sf32Ins extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); GraphTargetItem value = stack.pop(); - stack.push(new AlchemyStoreTreeItem(ins, value, ofs, instructionName)); + stack.push(new AlchemyStoreAVM2Item(ins, value, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf64Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf64Ins.java index 3f7a3c5bf..3ddfd9f50 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf64Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sf64Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyStoreTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyStoreAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -52,6 +52,6 @@ public class Sf64Ins extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); GraphTargetItem value = stack.pop(); - stack.push(new AlchemyStoreTreeItem(ins, value, ofs, instructionName)); + stack.push(new AlchemyStoreAVM2Item(ins, value, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si16Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si16Ins.java index 550792583..73148a42e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si16Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si16Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyStoreTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyStoreAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -52,6 +52,6 @@ public class Si16Ins extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); GraphTargetItem value = stack.pop(); - stack.push(new AlchemyStoreTreeItem(ins, value, ofs, instructionName)); + stack.push(new AlchemyStoreAVM2Item(ins, value, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si32Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si32Ins.java index 81602848b..63baa6c04 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si32Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si32Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyStoreTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyStoreAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -52,6 +52,6 @@ public class Si32Ins extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); GraphTargetItem value = stack.pop(); - stack.push(new AlchemyStoreTreeItem(ins, value, ofs, instructionName)); + stack.push(new AlchemyStoreAVM2Item(ins, value, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si8Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si8Ins.java index 42c3d5bae..47baa619e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si8Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Si8Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemyStoreTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemyStoreAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -52,6 +52,6 @@ public class Si8Ins extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem ofs = stack.pop(); GraphTargetItem value = stack.pop(); - stack.push(new AlchemyStoreTreeItem(ins, value, ofs, instructionName)); + stack.push(new AlchemyStoreAVM2Item(ins, value, ofs, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi16Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi16Ins.java index 4aa7284bd..c849056f8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi16Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi16Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemySignExtendTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemySignExtendAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Sxi16Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem value = stack.pop(); - stack.push(new AlchemySignExtendTreeItem(ins, value, instructionName)); + stack.push(new AlchemySignExtendAVM2Item(ins, value, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi1Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi1Ins.java index 69aa33b83..d80cdb377 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi1Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi1Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemySignExtendTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemySignExtendAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Sxi1Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem value = stack.pop(); - stack.push(new AlchemySignExtendTreeItem(ins, value, instructionName)); + stack.push(new AlchemySignExtendAVM2Item(ins, value, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi8Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi8Ins.java index 7b21259d6..26aa29a89 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi8Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/alchemy/Sxi8Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.AlchemySignExtendTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AlchemySignExtendAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,6 +51,6 @@ public class Sxi8Ins extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem value = stack.pop(); - stack.push(new AlchemySignExtendTreeItem(ins, value, instructionName)); + stack.push(new AlchemySignExtendAVM2Item(ins, value, instructionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java index c780ea0e9..183edf3ed 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java @@ -19,9 +19,9 @@ package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.AddAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class AddIIns extends AddIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new AddTreeItem(ins, v1, v2)); + stack.push(new AddAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java index b44d26d80..2559049d3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.AddAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -60,7 +60,7 @@ public class AddIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new AddTreeItem(ins, v1, v2)); + stack.push(new AddAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java index 650972ab3..9cffa6e76 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -54,7 +54,7 @@ public class DecrementIIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new DecrementTreeItem(ins, (GraphTargetItem) stack.pop())); + stack.push(new DecrementAVM2Item(ins, (GraphTargetItem) stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java index 3bab759b6..38826450e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -54,7 +54,7 @@ public class DecrementIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new DecrementTreeItem(ins, (GraphTargetItem) stack.pop())); + stack.push(new DecrementAVM2Item(ins, (GraphTargetItem) stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java index b2c5e5919..ab6b4293b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.DivideTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.DivideAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -59,7 +59,7 @@ public class DivideIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new DivideTreeItem(ins, v1, v2)); + stack.push(new DivideAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java index c058b4263..80f204e67 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IncrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class IncrementIIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new IncrementTreeItem(ins, (GraphTargetItem) stack.pop())); + stack.push(new IncrementAVM2Item(ins, (GraphTargetItem) stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java index 657a271a4..47ad9dc41 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IncrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class IncrementIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new IncrementTreeItem(ins, (GraphTargetItem) stack.pop())); + stack.push(new IncrementAVM2Item(ins, (GraphTargetItem) stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java index 022d8945f..33ae61c7d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.ModuloTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.ModuloAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,7 +51,7 @@ public class ModuloIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new ModuloTreeItem(ins, v1, v2)); + stack.push(new ModuloAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java index 3eb17a33a..ac037592e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.MultiplyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.MultiplyAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class MultiplyIIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new MultiplyTreeItem(ins, v1, v2)); + stack.push(new MultiplyAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java index 70d14d46c..10a802031 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.MultiplyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.MultiplyAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -59,7 +59,7 @@ public class MultiplyIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new MultiplyTreeItem(ins, v1, v2)); + stack.push(new MultiplyAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java index 62b1195ff..1aa8b1caa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.NegAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class NegateIIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v = (GraphTargetItem) stack.pop(); - stack.push(new NegTreeItem(ins, v)); + stack.push(new NegAVM2Item(ins, v)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java index f8955a749..0a7da72bb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.NegAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class NegateIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v = (GraphTargetItem) stack.pop(); - stack.push(new NegTreeItem(ins, v)); + stack.push(new NegAVM2Item(ins, v)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java index 332bae818..3015e989e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.NotItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.NotItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java index 69037c389..91d90ddb9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.SubtractAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class SubtractIIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new SubtractTreeItem(ins, v1, v2)); + stack.push(new SubtractAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java index 192434170..df56a49ef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.SubtractAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class SubtractIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new SubtractTreeItem(ins, v1, v2)); + stack.push(new SubtractAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java index 3ba0e3f4e..dd59ebb94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitAndTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.BitAndAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -46,7 +46,7 @@ public class BitAndIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new BitAndTreeItem(ins, v1, v2)); + stack.push(new BitAndAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java index 8b91cf3ac..697c41d81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitNotTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.BitNotAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,7 +44,7 @@ public class BitNotIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v = (GraphTargetItem) stack.pop(); - stack.push(new BitNotTreeItem(ins, v)); + stack.push(new BitNotAVM2Item(ins, v)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java index df3370fb8..2d0744198 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitOrTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.BitOrAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -46,7 +46,7 @@ public class BitOrIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new BitOrTreeItem(ins, v1, v2)); + stack.push(new BitOrAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java index 3ea5ca3f8..d2cde40c5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitXorTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.BitXorAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -46,7 +46,7 @@ public class BitXorIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new BitXorTreeItem(ins, v1, v2)); + stack.push(new BitXorAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java index a3928274f..58831175b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LShiftTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LShiftAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class LShiftIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LShiftTreeItem(ins, v1, v2)); + stack.push(new LShiftAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java index 34cc11d60..f62787f3a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.RShiftTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.RShiftAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class RShiftIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new RShiftTreeItem(ins, v1, v2)); + stack.push(new RShiftAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java index 9dde4619c..313874a47 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.URShiftTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.URShiftAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class URShiftIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new URShiftTreeItem(ins, v1, v2)); + stack.push(new URShiftAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/EqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/EqualsIns.java index ed76cfa52..97e394225 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/EqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/EqualsIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.EqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.EqAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -46,7 +46,7 @@ public class EqualsIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new EqTreeItem(ins, v1, v2)); + stack.push(new EqAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterEqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterEqualsIns.java index e1808765d..a86b7c22b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterEqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterEqualsIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class GreaterEqualsIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GeTreeItem(ins, v1, v2)); + stack.push(new GeAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterThanIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterThanIns.java index 89d30218f..56960c9dd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterThanIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/GreaterThanIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GtAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class GreaterThanIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GtTreeItem(ins, v1, v2)); + stack.push(new GtAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessEqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessEqualsIns.java index 49e2b6283..1eceda239 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessEqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessEqualsIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class LessEqualsIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LeTreeItem(ins, v1, v2)); + stack.push(new LeAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessThanIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessThanIns.java index 36bdd322d..837d80a00 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessThanIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/LessThanIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LtAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class LessThanIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LtTreeItem(ins, v1, v2)); + stack.push(new LtAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/StrictEqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/StrictEqualsIns.java index 72b169195..9683a052a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/StrictEqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparison/StrictEqualsIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictEqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictEqAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class StrictEqualsIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new StrictEqTreeItem(ins, v1, v2)); + stack.push(new StrictEqAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java index 098c90924..3d9697a51 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java @@ -22,18 +22,18 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConstructTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXAttrTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXElemTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetLexTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.StringTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.XMLTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConstructAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.EscapeXAttrAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.EscapeXElemAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FindPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetLexAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.StringAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.XMLAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.AddAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -60,12 +60,12 @@ public class ConstructIns extends InstructionDefinition { public static boolean walkXML(GraphTargetItem item, List list) { boolean ret = true; - if (item instanceof StringTreeItem) { + if (item instanceof StringAVM2Item) { list.add(item); - } else if (item instanceof AddTreeItem) { - ret = ret && walkXML(((AddTreeItem) item).leftSide, list); - ret = ret && walkXML(((AddTreeItem) item).rightSide, list); - } else if ((item instanceof EscapeXElemTreeItem) || (item instanceof EscapeXAttrTreeItem)) { + } else if (item instanceof AddAVM2Item) { + ret = ret && walkXML(((AddAVM2Item) item).leftSide, list); + ret = ret && walkXML(((AddAVM2Item) item).rightSide, list); + } else if ((item instanceof EscapeXElemAVM2Item) || (item instanceof EscapeXAttrAVM2Item)) { list.add(item); } else { return false; @@ -82,18 +82,18 @@ public class ConstructIns extends InstructionDefinition { } GraphTargetItem obj = (GraphTargetItem) stack.pop(); - FullMultinameTreeItem xmlMult = null; + FullMultinameAVM2Item xmlMult = null; boolean isXML = false; - if (obj instanceof GetPropertyTreeItem) { - GetPropertyTreeItem gpt = (GetPropertyTreeItem) obj; - if (gpt.object instanceof FindPropertyTreeItem) { - FindPropertyTreeItem fpt = (FindPropertyTreeItem) gpt.object; + if (obj instanceof GetPropertyAVM2Item) { + GetPropertyAVM2Item gpt = (GetPropertyAVM2Item) obj; + if (gpt.object instanceof FindPropertyAVM2Item) { + FindPropertyAVM2Item fpt = (FindPropertyAVM2Item) gpt.object; xmlMult = fpt.propertyName; isXML = xmlMult.isXML(constants, localRegNames, fullyQualifiedNames) && xmlMult.isXML(constants, localRegNames, fullyQualifiedNames); } } - if (obj instanceof GetLexTreeItem) { - GetLexTreeItem glt = (GetLexTreeItem) obj; + if (obj instanceof GetLexAVM2Item) { + GetLexAVM2Item glt = (GetLexAVM2Item) obj; isXML = glt.propertyName.getName(constants, fullyQualifiedNames).equals("XML"); } @@ -102,13 +102,13 @@ public class ConstructIns extends InstructionDefinition { GraphTargetItem arg = args.get(0); List xmlLines = new ArrayList<>(); if (walkXML(arg, xmlLines)) { - stack.push(new XMLTreeItem(ins, xmlLines)); + stack.push(new XMLAVM2Item(ins, xmlLines)); return; } } } - stack.push(new ConstructTreeItem(ins, obj, args)); + stack.push(new ConstructAVM2Item(ins, obj, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java index f01972017..516c94b48 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java @@ -22,11 +22,11 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConstructPropTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.XMLTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConstructPropAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.XMLAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -61,7 +61,7 @@ public class ConstructPropIns extends InstructionDefinition { for (int a = 0; a < argCount; a++) { args.add(0, (GraphTargetItem) stack.pop()); } - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); if (multiname.isXML(constants, localRegNames, fullyQualifiedNames)) { @@ -69,13 +69,13 @@ public class ConstructPropIns extends InstructionDefinition { GraphTargetItem arg = args.get(0); List xmlLines = new ArrayList<>(); if (ConstructIns.walkXML(arg, xmlLines)) { - stack.push(new XMLTreeItem(ins, xmlLines)); + stack.push(new XMLAVM2Item(ins, xmlLines)); return; } } } - stack.push(new ConstructPropTreeItem(ins, obj, multiname, args)); + stack.push(new ConstructPropAVM2Item(ins, obj, multiname, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java index de56d487b..521c87987 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConstructSuperTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConstructSuperAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -57,7 +57,7 @@ public class ConstructSuperIns extends InstructionDefinition { args.add(0, (GraphTargetItem) stack.pop()); } GraphTargetItem obj = (GraphTargetItem) stack.pop(); - output.add(new ConstructSuperTreeItem(ins, obj, args)); + output.add(new ConstructSuperAVM2Item(ins, obj, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java index f7a9f97d8..e2a7671ca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewActivationTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NewActivationAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class NewActivationIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new NewActivationTreeItem(ins)); + stack.push(new NewActivationAVM2Item(ins)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java index df53021c2..74e8ea2bd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewArrayTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NewArrayAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -42,7 +42,7 @@ public class NewArrayIns extends InstructionDefinition { for (int a = 0; a < argCount; a++) { args.add(0, (GraphTargetItem) stack.pop()); } - stack.push(new NewArrayTreeItem(ins, args)); + stack.push(new NewArrayAVM2Item(ins, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java index f0c039852..6052c0a48 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ExceptionAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class NewCatchIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int exInfo = ins.operands[0]; - stack.push(new ExceptionTreeItem(body.exceptions[exInfo])); + stack.push(new ExceptionAVM2Item(body.exceptions[exInfo])); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java index 8edce7134..43e671ac9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.UnparsedTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.UnparsedAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -39,7 +39,7 @@ public class NewClassIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int clsIndex = ins.operands[0]; String baseType = stack.pop().toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); - stack.push(new UnparsedTreeItem(ins, "new " + abc.constants.constant_multiname[abc.instance_info[clsIndex].name_index].getName(constants, fullyQualifiedNames) + ".class extends " + baseType)); + stack.push(new UnparsedAVM2Item(ins, "new " + abc.constants.constant_multiname[abc.instance_info[clsIndex].name_index].getName(constants, fullyQualifiedNames) + ".class extends " + baseType)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java index 6893371da..43a6718b7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewFunctionTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NewFunctionAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; @@ -53,7 +53,7 @@ public class NewFunctionIns extends InstructionDefinition { paramStr = method_info[methodIndex].getParamStr(constants, mybody, abc, fullyQualifiedNames); } - stack.push(new NewFunctionTreeItem(ins, "", paramStr, method_info[methodIndex].getReturnTypeStr(constants, fullyQualifiedNames), bodyStr)); + stack.push(new NewFunctionAVM2Item(ins, "", paramStr, method_info[methodIndex].getReturnTypeStr(constants, fullyQualifiedNames), bodyStr)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java index 7df782805..70e0fbd8c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NameValuePair; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewObjectTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NameValuePair; +import com.jpexs.decompiler.flash.abc.avm2.model.NewObjectAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -45,7 +45,7 @@ public class NewObjectIns extends InstructionDefinition { GraphTargetItem name = (GraphTargetItem) stack.pop(); args.add(0, new NameValuePair(name, value)); } - stack.push(new NewObjectTreeItem(ins, args)); + stack.push(new NewObjectAVM2Item(ins, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java index 294434461..a13723c60 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -58,7 +58,7 @@ public class CallIns extends InstructionDefinition { } GraphTargetItem receiver = (GraphTargetItem) stack.pop(); GraphTargetItem function = (GraphTargetItem) stack.pop(); - stack.push(new CallTreeItem(ins, receiver, function, args)); + stack.push(new CallAVM2Item(ins, receiver, function, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java index 999daaa17..59dd64fe8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallMethodTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallMethodAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -59,7 +59,7 @@ public class CallMethodIns extends InstructionDefinition { } GraphTargetItem receiver = (GraphTargetItem) stack.pop(); String methodName = method_info[methodIndex].getName(constants); - stack.push(new CallMethodTreeItem(ins, receiver, methodName, args)); + stack.push(new CallMethodAVM2Item(ins, receiver, methodName, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java index 8c3261d24..89b666305 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java @@ -19,10 +19,10 @@ package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -43,10 +43,10 @@ public class CallPropLexIns extends CallPropertyIns { for (int a = 0; a < argCount; a++) { args.add(0, (GraphTargetItem) stack.pop()); } - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem receiver = (GraphTargetItem) stack.pop(); - stack.push(new CallPropertyTreeItem(ins, false, receiver, multiname, args)); + stack.push(new CallPropertyAVM2Item(ins, false, receiver, multiname, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java index f58fd00aa..fe86d0f33 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -62,11 +62,11 @@ public class CallPropVoidIns extends InstructionDefinition { for (int a = 0; a < argCount; a++) { args.add(0, (GraphTargetItem) stack.pop()); } - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem receiver = (GraphTargetItem) stack.pop(); - output.add(new CallPropertyTreeItem(ins, true, receiver, multiname, args)); + output.add(new CallPropertyAVM2Item(ins, true, receiver, multiname, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java index 1e4e2a234..3ba02ff50 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -60,11 +60,11 @@ public class CallPropertyIns extends InstructionDefinition { for (int a = 0; a < argCount; a++) { args.add(0, (GraphTargetItem) stack.pop()); } - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem receiver = (GraphTargetItem) stack.pop(); - stack.push(new CallPropertyTreeItem(ins, false, receiver, multiname, args)); + stack.push(new CallPropertyAVM2Item(ins, false, receiver, multiname, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java index fda14c207..2ac849517 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallStaticTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallStaticAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -59,7 +59,7 @@ public class CallStaticIns extends InstructionDefinition { } GraphTargetItem receiver = (GraphTargetItem) stack.pop(); String methodName = method_info[methodIndex].getName(constants); - stack.push(new CallStaticTreeItem(ins, receiver, methodName, args)); + stack.push(new CallStaticAVM2Item(ins, receiver, methodName, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java index ab276a7de..b6a4056af 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallSuperTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallSuperAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -60,10 +60,10 @@ public class CallSuperIns extends InstructionDefinition { for (int a = 0; a < argCount; a++) { args.add(0, (GraphTargetItem) stack.pop()); } - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem receiver = (GraphTargetItem) stack.pop(); - stack.push(new CallSuperTreeItem(ins, false, receiver, multiname, args)); + stack.push(new CallSuperAVM2Item(ins, false, receiver, multiname, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java index de8ebc3d7..1bd08c15b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallSuperTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CallSuperAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -60,10 +60,10 @@ public class CallSuperVoidIns extends InstructionDefinition { for (int a = 0; a < argCount; a++) { args.add(0, (GraphTargetItem) stack.pop()); } - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem receiver = (GraphTargetItem) stack.pop(); - output.add(new CallSuperTreeItem(ins, true, receiver, multiname, args)); + output.add(new CallSuperAVM2Item(ins, true, receiver, multiname, args)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java index 7660a49b6..db1fa28bc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.EqTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NeqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.EqAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.NeqAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfEqIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new EqTreeItem(ins, v1, v2)); + stack.push(new EqAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new NeqTreeItem(ins, v1, v2)); + stack.push(new NeqAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java index f8ef1b55f..a88f336fe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java @@ -23,8 +23,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.NotItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.NotItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java index 773eb8f1a..c790f6a2a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LtAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfGeIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GeTreeItem(ins, v1, v2)); + stack.push(new GeAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LtTreeItem(ins, v1, v2)); + stack.push(new LtAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java index 2f737b038..080fc48fc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GtAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfGtIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GtTreeItem(ins, v1, v2)); + stack.push(new GtAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LeTreeItem(ins, v1, v2)); + stack.push(new LeAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java index 2c53f9e56..8debfe931 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GtAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfLeIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LeTreeItem(ins, v1, v2)); + stack.push(new LeAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GtTreeItem(ins, v1, v2)); + stack.push(new GtAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java index 453fb8ee9..399cb857c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LtAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfLtIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LtTreeItem(ins, v1, v2)); + stack.push(new LtAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GeTreeItem(ins, v1, v2)); + stack.push(new GeAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java index 5bad91019..16a25ce19 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LtAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfNGeIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LtTreeItem(ins, v1, v2)); + stack.push(new LtAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GeTreeItem(ins, v1, v2)); + stack.push(new GeAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java index bb71348e9..b5dd03f93 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GtAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfNGtIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LeTreeItem(ins, v1, v2)); + stack.push(new LeAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GtTreeItem(ins, v1, v2)); + stack.push(new GtAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java index d3682c1f1..a5c3aed54 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GtAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfNLeIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GtTreeItem(ins, v1, v2)); + stack.push(new GtAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LeTreeItem(ins, v1, v2)); + stack.push(new LeAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java index 66c76e046..c2236be5f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.GeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.LtAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfNLtIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new GeTreeItem(ins, v1, v2)); + stack.push(new GeAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new LtTreeItem(ins, v1, v2)); + stack.push(new LtAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java index 121c48d4f..26a0bc167 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.EqTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NeqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.EqAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.NeqAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfNeIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new NeqTreeItem(ins, v1, v2)); + stack.push(new NeqAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new EqTreeItem(ins, v1, v2)); + stack.push(new EqAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java index 0ff3ef3df..4f8e3b3dc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictEqTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictNeqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictEqAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictNeqAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfStrictEqIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new StrictEqTreeItem(ins, v1, v2)); + stack.push(new StrictEqAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new StrictNeqTreeItem(ins, v1, v2)); + stack.push(new StrictNeqAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java index 90586726e..f3bf06fce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictEqTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictNeqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictEqAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictNeqAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,14 +40,14 @@ public class IfStrictNeIns extends InstructionDefinition implements IfTypeIns { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new StrictNeqTreeItem(ins, v1, v2)); + stack.push(new StrictNeqAVM2Item(ins, v1, v2)); } @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); - stack.push(new StrictEqTreeItem(ins, v1, v2)); + stack.push(new StrictEqAVM2Item(ins, v1, v2)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java index 8226a8efa..fbdc07455 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java @@ -23,8 +23,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.NotItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.NotItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java index a68ce8aa9..51cb85d71 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java @@ -22,7 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class JumpIns extends InstructionDefinition implements IfTypeIns { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - //stack.push(new BooleanTreeItem(ins, Boolean.TRUE));// + ins.operands[0]); + //stack.push(new BooleanAVM2Item(ins, Boolean.TRUE));// + ins.operands[0]); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java index 025fa0610..20b8bbafb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java @@ -22,7 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java index b3732c057..92f2f2f24 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java @@ -21,12 +21,12 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecLocalTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NotCompileTimeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.DecLocalAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NotCompileTimeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.SubtractAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -59,11 +59,11 @@ public class DecLocalIIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int regIndex = ins.operands[0]; - output.add(new DecLocalTreeItem(ins, regIndex)); + output.add(new DecLocalAVM2Item(ins, regIndex)); if (localRegs.containsKey(regIndex)) { - localRegs.put(regIndex, new NotCompileTimeTreeItem(ins, new SubtractTreeItem(ins, localRegs.get(regIndex), new IntegerValueTreeItem(ins, Long.valueOf(1))))); + localRegs.put(regIndex, new NotCompileTimeAVM2Item(ins, new SubtractAVM2Item(ins, localRegs.get(regIndex), new IntegerValueAVM2Item(ins, Long.valueOf(1))))); } else { - //localRegs.put(regIndex, new SubtractTreeItem(ins, new IntegerValueTreeItem(ins, new Long(0)), new IntegerValueTreeItem(ins, new Long(1)))); + //localRegs.put(regIndex, new SubtractAVM2Item(ins, new IntegerValueAVM2Item(ins, new Long(0)), new IntegerValueAVM2Item(ins, new Long(1)))); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java index 2654d0c6e..fa4e27eaf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java @@ -21,12 +21,12 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecLocalTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NotCompileTimeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.DecLocalAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NotCompileTimeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.SubtractAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -59,11 +59,11 @@ public class DecLocalIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int regIndex = ins.operands[0]; - output.add(new DecLocalTreeItem(ins, regIndex)); + output.add(new DecLocalAVM2Item(ins, regIndex)); if (localRegs.containsKey(regIndex)) { - localRegs.put(regIndex, new NotCompileTimeTreeItem(ins, new SubtractTreeItem(ins, localRegs.get(regIndex), new IntegerValueTreeItem(ins, Long.valueOf(1))))); + localRegs.put(regIndex, new NotCompileTimeAVM2Item(ins, new SubtractAVM2Item(ins, localRegs.get(regIndex), new IntegerValueAVM2Item(ins, Long.valueOf(1))))); } else { - //localRegs.put(regIndex, new SubtractTreeItem(ins, new IntegerValueTreeItem(ins, new Long(0)), new IntegerValueTreeItem(ins, new Long(1)))); + //localRegs.put(regIndex, new SubtractAVM2Item(ins, new IntegerValueAVM2Item(ins, new Long(0)), new IntegerValueAVM2Item(ins, new Long(1)))); } } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java index 101427315..4c293ee5f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java @@ -19,11 +19,11 @@ package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ScriptTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThisTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ClassAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ScriptAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ThisAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,13 +42,13 @@ public class GetLocal0Ins extends GetLocalTypeIns { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { if ((classIndex >= abc.instance_info.length) || classIndex < 0) { - stack.push(new ScriptTreeItem(scriptIndex)); + stack.push(new ScriptAVM2Item(scriptIndex)); return; } if (isStatic) { - stack.push(new ClassTreeItem(abc.instance_info[classIndex].getName(constants))); + stack.push(new ClassAVM2Item(abc.instance_info[classIndex].getName(constants))); } else { - stack.push(new ThisTreeItem(abc.instance_info[classIndex].getName(constants))); + stack.push(new ThisAVM2Item(abc.instance_info[classIndex].getName(constants))); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java index 5ae6a83eb..52d7e7cd2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.UndefinedTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.UndefinedAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,10 +39,10 @@ public abstract class GetLocalTypeIns extends InstructionDefinition { GraphTargetItem computedValue = localRegs.get(getRegisterId(ins)); if (computedValue == null) { if (!localRegNames.containsKey(getRegisterId(ins))) { - computedValue = new UndefinedTreeItem(null); //In some obfuscated code there seems to be reading of undefined registers + computedValue = new UndefinedAVM2Item(null); //In some obfuscated code there seems to be reading of undefined registers } } - stack.push(new LocalRegTreeItem(ins, getRegisterId(ins), computedValue)); + stack.push(new LocalRegAVM2Item(ins, getRegisterId(ins), computedValue)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java index c367edfc9..2a627b057 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java @@ -20,12 +20,12 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncLocalTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NotCompileTimeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IncLocalAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NotCompileTimeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.AddAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,11 +39,11 @@ public class IncLocalIIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int regIndex = ins.operands[0]; - output.add(new IncLocalTreeItem(ins, regIndex)); + output.add(new IncLocalAVM2Item(ins, regIndex)); if (localRegs.containsKey(regIndex)) { - localRegs.put(regIndex, new NotCompileTimeTreeItem(ins, new AddTreeItem(ins, localRegs.get(regIndex), new IntegerValueTreeItem(ins, Long.valueOf(1))))); + localRegs.put(regIndex, new NotCompileTimeAVM2Item(ins, new AddAVM2Item(ins, localRegs.get(regIndex), new IntegerValueAVM2Item(ins, Long.valueOf(1))))); } else { - //localRegs.put(regIndex, new AddTreeItem(ins, null, new IntegerValueTreeItem(ins, new Long(1)))); + //localRegs.put(regIndex, new AddAVM2Item(ins, null, new IntegerValueAVM2Item(ins, new Long(1)))); } } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java index 0d65bc919..9c56dfbda 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java @@ -20,12 +20,12 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncLocalTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NotCompileTimeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IncLocalAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NotCompileTimeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.AddAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,11 +39,11 @@ public class IncLocalIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int regIndex = ins.operands[0]; - output.add(new IncLocalTreeItem(ins, regIndex)); + output.add(new IncLocalAVM2Item(ins, regIndex)); if (localRegs.containsKey(regIndex)) { - localRegs.put(regIndex, new NotCompileTimeTreeItem(ins, new AddTreeItem(ins, localRegs.get(regIndex), new IntegerValueTreeItem(ins, Long.valueOf(1))))); + localRegs.put(regIndex, new NotCompileTimeAVM2Item(ins, new AddAVM2Item(ins, localRegs.get(regIndex), new IntegerValueAVM2Item(ins, Long.valueOf(1))))); } else { - //localRegs.put(regIndex, new AddTreeItem(ins, null, new IntegerValueTreeItem(ins, new Long(1)))); + //localRegs.put(regIndex, new AddAVM2Item(ins, null, new IntegerValueAVM2Item(ins, new Long(1)))); } } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java index b9671e028..453260435 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java @@ -21,7 +21,7 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java index 752d8152c..6e895142d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java @@ -21,20 +21,20 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewActivationTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NotCompileTimeTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreDecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FindPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.IncrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NewActivationAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NotCompileTimeAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.PostDecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.PostIncrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetLocalAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreDecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -50,56 +50,56 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S int regId = getRegisterId(ins); GraphTargetItem value = (GraphTargetItem) stack.pop(); if (localRegs.containsKey(regId)) { - localRegs.put(regId, new NotCompileTimeTreeItem(ins, value)); + localRegs.put(regId, new NotCompileTimeAVM2Item(ins, value)); } else { localRegs.put(regId, value); } - if (value instanceof NewActivationTreeItem) { + if (value instanceof NewActivationAVM2Item) { return; } - if (value instanceof FindPropertyTreeItem) { + if (value instanceof FindPropertyAVM2Item) { return; } - if (value.getNotCoerced() instanceof IncrementTreeItem) { - GraphTargetItem inside = ((IncrementTreeItem) value.getNotCoerced()).object.getNotCoerced().getThroughDuplicate(); - if (inside instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) inside).regIndex == regId) { + if (value.getNotCoerced() instanceof IncrementAVM2Item) { + GraphTargetItem inside = ((IncrementAVM2Item) value.getNotCoerced()).object.getNotCoerced().getThroughDuplicate(); + if (inside instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) inside).regIndex == regId) { if (stack.size() > 0) { GraphTargetItem top = stack.peek().getNotCoerced().getThroughDuplicate(); if (top == inside) { stack.pop(); - stack.push(new PostIncrementTreeItem(ins, inside)); - } else if ((top instanceof IncrementTreeItem) && (((IncrementTreeItem) top).object == inside)) { + stack.push(new PostIncrementAVM2Item(ins, inside)); + } else if ((top instanceof IncrementAVM2Item) && (((IncrementAVM2Item) top).object == inside)) { stack.pop(); - stack.push(new PreIncrementTreeItem(ins, inside)); + stack.push(new PreIncrementAVM2Item(ins, inside)); } else { - output.add(new PostIncrementTreeItem(ins, inside)); + output.add(new PostIncrementAVM2Item(ins, inside)); } } else { - output.add(new PostIncrementTreeItem(ins, inside)); + output.add(new PostIncrementAVM2Item(ins, inside)); } return; } } } - if (value.getNotCoerced() instanceof DecrementTreeItem) { - GraphTargetItem inside = ((DecrementTreeItem) value.getNotCoerced()).object.getNotCoerced().getThroughDuplicate(); - if (inside instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) inside).regIndex == regId) { + if (value.getNotCoerced() instanceof DecrementAVM2Item) { + GraphTargetItem inside = ((DecrementAVM2Item) value.getNotCoerced()).object.getNotCoerced().getThroughDuplicate(); + if (inside instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) inside).regIndex == regId) { if (stack.size() > 0) { GraphTargetItem top = stack.peek().getNotCoerced().getThroughDuplicate(); if (top == inside) { stack.pop(); - stack.push(new PostDecrementTreeItem(ins, inside)); - } else if ((top instanceof DecrementTreeItem) && (((DecrementTreeItem) top).object == inside)) { + stack.push(new PostDecrementAVM2Item(ins, inside)); + } else if ((top instanceof DecrementAVM2Item) && (((DecrementAVM2Item) top).object == inside)) { stack.pop(); - stack.push(new PreDecrementTreeItem(ins, inside)); + stack.push(new PreDecrementAVM2Item(ins, inside)); } else { - output.add(new PostDecrementTreeItem(ins, inside)); + output.add(new PostDecrementAVM2Item(ins, inside)); } } else { - output.add(new PostDecrementTreeItem(ins, inside)); + output.add(new PostDecrementAVM2Item(ins, inside)); } return; } @@ -108,12 +108,12 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S //if(val.startsWith("catchscope ")) return; //if(val.startsWith("newactivation()")) return; - output.add(new SetLocalTreeItem(ins, regId, value)); + output.add(new SetLocalAVM2Item(ins, regId, value)); } @Override - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { - return TreeItem.localRegName(localRegNames, getRegisterId(ins)); + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + return AVM2Item.localRegName(localRegNames, getRegisterId(ins)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java index 2928681a5..8279c869e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java @@ -22,11 +22,11 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.DeletePropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.BooleanAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.DeletePropertyAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,10 +51,10 @@ public class DeletePropertyIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - stack.add(new BooleanTreeItem(ins, Boolean.TRUE));//property successfully deleted - output.add(new DeletePropertyTreeItem(ins, obj, multiname)); + stack.add(new BooleanAVM2Item(ins, Boolean.TRUE));//property successfully deleted + output.add(new DeletePropertyAVM2Item(ins, obj, multiname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java index 83acd4492..205bdd6fa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FindPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -48,8 +48,8 @@ public class FindPropertyIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); - stack.push(new FindPropertyTreeItem(ins, multiname)); //resolve right object + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); + stack.push(new FindPropertyAVM2Item(ins, multiname)); //resolve right object } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java index 8c9519590..1b62adad3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FindPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -47,8 +47,8 @@ public class FindPropertyStrictIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); - stack.push(new FindPropertyTreeItem(ins, multiname)); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); + stack.push(new FindPropertyAVM2Item(ins, multiname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java index e50a15b94..d1acc77b9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetDescendantsTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetDescendantsAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -48,9 +48,9 @@ public class GetDescendantsIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - stack.push(new GetDescendantsTreeItem(ins, obj, multiname)); + stack.push(new GetDescendantsAVM2Item(ins, obj, multiname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java index a2dadedfc..367f074df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ScriptTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ClassAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ScriptAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,9 +44,9 @@ public class GetGlobalScopeIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { if (scopeStack.isEmpty()) { if (classIndex == -1) { - stack.push(new ScriptTreeItem(scriptIndex)); + stack.push(new ScriptAVM2Item(scriptIndex)); } else { - stack.push(new ClassTreeItem(abc.instance_info[classIndex].getName(constants))); + stack.push(new ClassAVM2Item(abc.instance_info[classIndex].getName(constants))); } return; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java index 3c68d1420..bdb051d1f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java @@ -21,12 +21,12 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSlotTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.GetSlotAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ExceptionAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,8 +42,8 @@ public class GetGlobalSlotIns extends InstructionDefinition { int slotIndex = ins.operands[0]; GraphTargetItem obj = (GraphTargetItem) scopeStack.get(0); //scope Multiname slotname = null; - if (obj instanceof ExceptionTreeItem) { - slotname = constants.constant_multiname[((ExceptionTreeItem) obj).exception.name_index]; + if (obj instanceof ExceptionAVM2Item) { + slotname = constants.constant_multiname[((ExceptionAVM2Item) obj).exception.name_index]; } else { for (int t = 0; t < body.traits.traits.length; t++) { @@ -55,7 +55,7 @@ public class GetGlobalSlotIns extends InstructionDefinition { } } - stack.push(new GetSlotTreeItem(ins, obj, slotname)); + stack.push(new GetSlotAVM2Item(ins, obj, slotname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java index 911beff98..411dd9337 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetLexTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.GetLexAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.flash.abc.types.Multiname; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,7 +39,7 @@ public class GetLexIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; Multiname multiname = constants.constant_multiname[multinameIndex]; - stack.push(new GetLexTreeItem(ins, multiname)); + stack.push(new GetLexAVM2Item(ins, multiname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java index 52fff1f92..8ec61fde6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetPropertyAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,9 +38,9 @@ public class GetPropertyIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - stack.push(new GetPropertyTreeItem(ins, obj, multiname)); + stack.push(new GetPropertyAVM2Item(ins, obj, multiname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java index 16d37d525..76d9c944c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java @@ -22,7 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java index d3de866ee..bb7c771d0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java @@ -21,17 +21,17 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSlotTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewActivationTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ScriptTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThisTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ClassAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetSlotAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NewActivationAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ScriptAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ThisAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ExceptionAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.traits.Trait; import com.jpexs.decompiler.flash.abc.types.traits.TraitWithSlot; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -48,22 +48,22 @@ public class GetSlotIns extends InstructionDefinition { GraphTargetItem obj = (GraphTargetItem) stack.pop(); //scope obj = obj.getThroughRegister(); Multiname slotname = null; - if (obj instanceof ExceptionTreeItem) { - slotname = constants.constant_multiname[((ExceptionTreeItem) obj).exception.name_index]; - } else if (obj instanceof ClassTreeItem) { - slotname = ((ClassTreeItem) obj).className; - } else if (obj instanceof ThisTreeItem) { - slotname = ((ThisTreeItem) obj).className; - } else if (obj instanceof ScriptTreeItem) { - for (int t = 0; t < abc.script_info[((ScriptTreeItem) obj).scriptIndex].traits.traits.length; t++) { - Trait tr = abc.script_info[((ScriptTreeItem) obj).scriptIndex].traits.traits[t]; + if (obj instanceof ExceptionAVM2Item) { + slotname = constants.constant_multiname[((ExceptionAVM2Item) obj).exception.name_index]; + } else if (obj instanceof ClassAVM2Item) { + slotname = ((ClassAVM2Item) obj).className; + } else if (obj instanceof ThisAVM2Item) { + slotname = ((ThisAVM2Item) obj).className; + } else if (obj instanceof ScriptAVM2Item) { + for (int t = 0; t < abc.script_info[((ScriptAVM2Item) obj).scriptIndex].traits.traits.length; t++) { + Trait tr = abc.script_info[((ScriptAVM2Item) obj).scriptIndex].traits.traits[t]; if (tr instanceof TraitWithSlot) { if (((TraitWithSlot) tr).getSlotIndex() == slotIndex) { slotname = tr.getName(abc); } } } - } else if (obj instanceof NewActivationTreeItem) { + } else if (obj instanceof NewActivationAVM2Item) { for (int t = 0; t < body.traits.traits.length; t++) { if (body.traits.traits[t] instanceof TraitWithSlot) { @@ -74,7 +74,7 @@ public class GetSlotIns extends InstructionDefinition { } } - stack.push(new GetSlotTreeItem(ins, obj, slotname)); + stack.push(new GetSlotAVM2Item(ins, obj, slotname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java index c831748a8..be8c44b4e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSuperTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetSuperAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,9 +38,9 @@ public class GetSuperIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - stack.push(new GetSuperTreeItem(ins, obj, multiname)); + stack.push(new GetSuperAVM2Item(ins, obj, multiname)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java index 00ff83a19..43c6f4684 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.HasNextTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.HasNextAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,6 +39,6 @@ public class HasNext2Ins extends InstructionDefinition { int objectReg = ins.operands[0]; int indexReg = ins.operands[1]; //stack.push("_loc_" + objectReg + ".hasNext(cnt=_loc_" + indexReg + ")"); - stack.push(new HasNextTreeItem(ins, new LocalRegTreeItem(ins, indexReg, localRegs.get(indexReg)), localRegs.get(objectReg))); + stack.push(new HasNextAVM2Item(ins, new LocalRegAVM2Item(ins, indexReg, localRegs.get(indexReg)), localRegs.get(objectReg))); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java index 77d47671d..b0018fbe3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.HasNextTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.HasNextAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class HasNextIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem curIndex = (GraphTargetItem) stack.pop(); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - stack.push(new HasNextTreeItem(ins, curIndex, obj)); + stack.push(new HasNextAVM2Item(ins, curIndex, obj)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java index 507c0f1b1..28d03f9a6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.InTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.InAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class InIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem obj = (GraphTargetItem) stack.pop(); GraphTargetItem name = (GraphTargetItem) stack.pop(); - stack.push(new InTreeItem(ins, name, obj)); + stack.push(new InAVM2Item(ins, name, obj)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java index 2e4f2ba3e..7de9a0450 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.InitPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.InitPropertyAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,9 +40,9 @@ public class InitPropertyIns extends InstructionDefinition { int multinameIndex = ins.operands[0]; GraphTargetItem val = (GraphTargetItem) stack.pop(); - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - output.add(new InitPropertyTreeItem(ins, obj, multiname, val)); + output.add(new InitPropertyAVM2Item(ins, obj, multiname, val)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java index ccb108aaf..a7965da20 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextNameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NextNameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class NextNameIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem index = stack.pop(); GraphTargetItem obj = stack.pop(); - stack.push(new NextNameTreeItem(ins, index, obj)); + stack.push(new NextNameAVM2Item(ins, index, obj)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java index 4169b0a33..76a5d537a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NextValueAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class NextValueIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem index = stack.pop(); GraphTargetItem obj = stack.pop(); - stack.push(new NextValueTreeItem(ins, index, obj)); + stack.push(new NextValueAVM2Item(ins, index, obj)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java index 648bfe46b..5300f89af 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ReturnValueAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class ReturnValueIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - output.add(new ReturnValueTreeItem(ins, (GraphTargetItem) stack.pop())); + output.add(new ReturnValueAVM2Item(ins, (GraphTargetItem) stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java index e69e71478..d0d190bf0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java @@ -19,9 +19,9 @@ package com.jpexs.decompiler.flash.abc.avm2.instructions.other; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnVoidTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ReturnVoidAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,6 +34,6 @@ public class ReturnVoidIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - output.add(new ReturnVoidTreeItem(ins)); + output.add(new ReturnVoidAVM2Item(ins)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java index ab4727c24..29e8c841d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetGlobalSlotTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.SetGlobalSlotAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,11 +38,11 @@ public class SetGlobalSlotIns extends InstructionDefinition implements SetTypeIn @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - output.add(new SetGlobalSlotTreeItem(ins, ins.operands[0], (GraphTargetItem) stack.pop())); + output.add(new SetGlobalSlotAVM2Item(ins, ins.operands[0], (GraphTargetItem) stack.pop())); } @Override - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { return "globalslot" + ins.operands[0]; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java index a48b09cb7..d7d570332 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java @@ -22,19 +22,19 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetPropertyTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreDecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.IncrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.PostDecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.PostIncrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreDecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -49,17 +49,17 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; GraphTargetItem value = (GraphTargetItem) stack.pop(); - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - if (value.getThroughDuplicate().getThroughRegister().getThroughDuplicate() instanceof IncrementTreeItem) { - GraphTargetItem inside = ((IncrementTreeItem) value.getThroughDuplicate().getThroughRegister().getThroughDuplicate()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); - if (inside instanceof GetPropertyTreeItem) { - GetPropertyTreeItem insideProp = ((GetPropertyTreeItem) inside); + if (value.getThroughDuplicate().getThroughRegister().getThroughDuplicate() instanceof IncrementAVM2Item) { + GraphTargetItem inside = ((IncrementAVM2Item) value.getThroughDuplicate().getThroughRegister().getThroughDuplicate()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); + if (inside instanceof GetPropertyAVM2Item) { + GetPropertyAVM2Item insideProp = ((GetPropertyAVM2Item) inside); if (insideProp.propertyName.compareSame(multiname)) { GraphTargetItem insideObj = obj.getThroughDuplicate(); - if (insideObj instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) insideObj).computedValue != null) { - insideObj = ((LocalRegTreeItem) insideObj).computedValue.getThroughNotCompilable().getThroughDuplicate(); + if (insideObj instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) insideObj).computedValue != null) { + insideObj = ((LocalRegAVM2Item) insideObj).computedValue.getThroughNotCompilable().getThroughDuplicate(); } } if (insideProp.object.getThroughDuplicate() == insideObj) { @@ -67,15 +67,15 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns GraphTargetItem top = stack.peek().getNotCoerced().getThroughDuplicate(); if (top == insideProp) { stack.pop(); - stack.push(new PostIncrementTreeItem(ins, insideProp)); - } else if ((top instanceof IncrementTreeItem) && (((IncrementTreeItem) top).object == inside)) { + stack.push(new PostIncrementAVM2Item(ins, insideProp)); + } else if ((top instanceof IncrementAVM2Item) && (((IncrementAVM2Item) top).object == inside)) { stack.pop(); - stack.push(new PreIncrementTreeItem(ins, insideProp)); + stack.push(new PreIncrementAVM2Item(ins, insideProp)); } else { - output.add(new PostIncrementTreeItem(ins, insideProp)); + output.add(new PostIncrementAVM2Item(ins, insideProp)); } } else { - output.add(new PostIncrementTreeItem(ins, insideProp)); + output.add(new PostIncrementAVM2Item(ins, insideProp)); } return; } @@ -83,15 +83,15 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns } } - if (value.getThroughDuplicate().getThroughRegister().getThroughDuplicate() instanceof DecrementTreeItem) { - GraphTargetItem inside = ((DecrementTreeItem) value.getThroughDuplicate().getThroughRegister().getThroughDuplicate()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); - if (inside instanceof GetPropertyTreeItem) { - GetPropertyTreeItem insideProp = ((GetPropertyTreeItem) inside); + if (value.getThroughDuplicate().getThroughRegister().getThroughDuplicate() instanceof DecrementAVM2Item) { + GraphTargetItem inside = ((DecrementAVM2Item) value.getThroughDuplicate().getThroughRegister().getThroughDuplicate()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); + if (inside instanceof GetPropertyAVM2Item) { + GetPropertyAVM2Item insideProp = ((GetPropertyAVM2Item) inside); if (insideProp.propertyName.compareSame(multiname)) { GraphTargetItem insideObj = obj.getThroughDuplicate(); - if (insideObj instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) insideObj).computedValue != null) { - insideObj = ((LocalRegTreeItem) insideObj).computedValue.getThroughNotCompilable().getThroughDuplicate(); + if (insideObj instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) insideObj).computedValue != null) { + insideObj = ((LocalRegAVM2Item) insideObj).computedValue.getThroughNotCompilable().getThroughDuplicate(); } } if (insideProp.object.getThroughDuplicate() == insideObj) { @@ -99,26 +99,26 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns GraphTargetItem top = stack.peek().getNotCoerced().getThroughDuplicate(); if (top == insideProp) { stack.pop(); - stack.push(new PostDecrementTreeItem(ins, insideProp)); - } else if ((top instanceof DecrementTreeItem) && (((DecrementTreeItem) top).object == inside)) { + stack.push(new PostDecrementAVM2Item(ins, insideProp)); + } else if ((top instanceof DecrementAVM2Item) && (((DecrementAVM2Item) top).object == inside)) { stack.pop(); - stack.push(new PreDecrementTreeItem(ins, insideProp)); + stack.push(new PreDecrementAVM2Item(ins, insideProp)); } else { - output.add(new PostDecrementTreeItem(ins, insideProp)); + output.add(new PostDecrementAVM2Item(ins, insideProp)); } } else { - output.add(new PostDecrementTreeItem(ins, insideProp)); + output.add(new PostDecrementAVM2Item(ins, insideProp)); } return; } } } } - output.add(new SetPropertyTreeItem(ins, obj, multiname, value)); + output.add(new SetPropertyAVM2Item(ins, obj, multiname, value)); } @Override - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; String multiname = resolveMultinameNoPop(0, stack, abc.constants, multinameIndex, ins, fullyQualifiedNames); GraphTargetItem obj = stack.get(1 + resolvedCount(abc.constants, multinameIndex)); //pod vrcholem diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java index a8f3bdd2b..129287ca7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java @@ -22,27 +22,27 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSlotTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewActivationTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ScriptTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetSlotTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThisTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreDecrementTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ClassAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.GetSlotAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.IncrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.NewActivationAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.PostDecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.PostIncrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ScriptAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetSlotAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ThisAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ExceptionAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreDecrementAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.traits.Trait; import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import com.jpexs.decompiler.flash.abc.types.traits.TraitWithSlot; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -60,26 +60,26 @@ public class SetSlotIns extends InstructionDefinition implements SetTypeIns { GraphTargetItem obj = (GraphTargetItem) stack.pop(); //scopeId obj = obj.getThroughRegister(); Multiname slotname = null; - if (obj instanceof NewActivationTreeItem) { - ((NewActivationTreeItem) obj).slots.put(slotIndex, value); + if (obj instanceof NewActivationAVM2Item) { + ((NewActivationAVM2Item) obj).slots.put(slotIndex, value); } - if (obj instanceof ExceptionTreeItem) { - slotname = constants.constant_multiname[((ExceptionTreeItem) obj).exception.name_index]; - } else if (obj instanceof ClassTreeItem) { - slotname = ((ClassTreeItem) obj).className; - } else if (obj instanceof ThisTreeItem) { - slotname = ((ThisTreeItem) obj).className; - } else if (obj instanceof ScriptTreeItem) { - for (int t = 0; t < abc.script_info[((ScriptTreeItem) obj).scriptIndex].traits.traits.length; t++) { - Trait tr = abc.script_info[((ScriptTreeItem) obj).scriptIndex].traits.traits[t]; + if (obj instanceof ExceptionAVM2Item) { + slotname = constants.constant_multiname[((ExceptionAVM2Item) obj).exception.name_index]; + } else if (obj instanceof ClassAVM2Item) { + slotname = ((ClassAVM2Item) obj).className; + } else if (obj instanceof ThisAVM2Item) { + slotname = ((ThisAVM2Item) obj).className; + } else if (obj instanceof ScriptAVM2Item) { + for (int t = 0; t < abc.script_info[((ScriptAVM2Item) obj).scriptIndex].traits.traits.length; t++) { + Trait tr = abc.script_info[((ScriptAVM2Item) obj).scriptIndex].traits.traits[t]; if (tr instanceof TraitWithSlot) { if (((TraitWithSlot) tr).getSlotIndex() == slotIndex) { slotname = tr.getName(abc); } } } - } else if (obj instanceof NewActivationTreeItem) { + } else if (obj instanceof NewActivationAVM2Item) { for (int t = 0; t < body.traits.traits.length; t++) { if (body.traits.traits[t] instanceof TraitWithSlot) { @@ -92,8 +92,8 @@ public class SetSlotIns extends InstructionDefinition implements SetTypeIns { } if (slotname != null) { - if (value instanceof LocalRegTreeItem) { - LocalRegTreeItem lr = (LocalRegTreeItem) value; + if (value instanceof LocalRegAVM2Item) { + LocalRegAVM2Item lr = (LocalRegAVM2Item) value; String slotNameStr = slotname.getName(constants, fullyQualifiedNames); if (localRegNames.containsKey(lr.regIndex)) { if (localRegNames.get(lr.regIndex).equals(slotNameStr)) { @@ -103,61 +103,61 @@ public class SetSlotIns extends InstructionDefinition implements SetTypeIns { } } - if (value.getNotCoerced().getThroughDuplicate() instanceof IncrementTreeItem) { - GraphTargetItem inside = ((IncrementTreeItem) value.getNotCoerced()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); - if (inside instanceof GetSlotTreeItem) { - GetSlotTreeItem slotItem = (GetSlotTreeItem) inside; + if (value.getNotCoerced().getThroughDuplicate() instanceof IncrementAVM2Item) { + GraphTargetItem inside = ((IncrementAVM2Item) value.getNotCoerced()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); + if (inside instanceof GetSlotAVM2Item) { + GetSlotAVM2Item slotItem = (GetSlotAVM2Item) inside; if ((slotItem.scope.getThroughRegister() == obj.getThroughRegister()) && (slotItem.slotName == slotname)) { if (stack.size() > 0) { GraphTargetItem top = stack.peek().getNotCoerced().getThroughDuplicate(); if (top == inside) { stack.pop(); - stack.push(new PostIncrementTreeItem(ins, inside)); - } else if ((top instanceof IncrementTreeItem) && (((IncrementTreeItem) top).object == inside)) { + stack.push(new PostIncrementAVM2Item(ins, inside)); + } else if ((top instanceof IncrementAVM2Item) && (((IncrementAVM2Item) top).object == inside)) { stack.pop(); - stack.push(new PreIncrementTreeItem(ins, inside)); + stack.push(new PreIncrementAVM2Item(ins, inside)); } else { - output.add(new PostIncrementTreeItem(ins, inside)); + output.add(new PostIncrementAVM2Item(ins, inside)); } } else { - output.add(new PostIncrementTreeItem(ins, inside)); + output.add(new PostIncrementAVM2Item(ins, inside)); } return; } } } - if (value.getNotCoerced().getThroughDuplicate() instanceof DecrementTreeItem) { - GraphTargetItem inside = ((DecrementTreeItem) value.getNotCoerced()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); - if (inside instanceof GetSlotTreeItem) { - GetSlotTreeItem slotItem = (GetSlotTreeItem) inside; + if (value.getNotCoerced().getThroughDuplicate() instanceof DecrementAVM2Item) { + GraphTargetItem inside = ((DecrementAVM2Item) value.getNotCoerced()).object.getThroughRegister().getNotCoerced().getThroughDuplicate(); + if (inside instanceof GetSlotAVM2Item) { + GetSlotAVM2Item slotItem = (GetSlotAVM2Item) inside; if ((slotItem.scope.getThroughRegister() == obj.getThroughRegister()) && (slotItem.slotName == slotname)) { if (stack.size() > 0) { GraphTargetItem top = stack.peek().getNotCoerced().getThroughDuplicate(); if (top == inside) { stack.pop(); - stack.push(new PostDecrementTreeItem(ins, inside)); - } else if ((top instanceof DecrementTreeItem) && (((DecrementTreeItem) top).object == inside)) { + stack.push(new PostDecrementAVM2Item(ins, inside)); + } else if ((top instanceof DecrementAVM2Item) && (((DecrementAVM2Item) top).object == inside)) { stack.pop(); - stack.push(new PreDecrementTreeItem(ins, inside)); + stack.push(new PreDecrementAVM2Item(ins, inside)); } else { - output.add(new PostDecrementTreeItem(ins, inside)); + output.add(new PostDecrementAVM2Item(ins, inside)); } } else { - output.add(new PostDecrementTreeItem(ins, inside)); + output.add(new PostDecrementAVM2Item(ins, inside)); } return; } } } - output.add(new SetSlotTreeItem(ins, obj, slotname, value)); + output.add(new SetSlotAVM2Item(ins, obj, slotname, value)); } @Override - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int slotIndex = ins.operands[0]; ////String obj = stack.get(1); String slotname = ""; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java index c2c6160ed..eadf84247 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java @@ -22,11 +22,11 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetSuperTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetSuperAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,13 +42,13 @@ public class SetSuperIns extends InstructionDefinition implements SetTypeIns { int multinameIndex = ins.operands[0]; GraphTargetItem value = (GraphTargetItem) stack.pop(); - FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); + FullMultinameAVM2Item multiname = resolveMultiname(stack, constants, multinameIndex, ins); GraphTargetItem obj = (GraphTargetItem) stack.pop(); - output.add(new SetSuperTreeItem(ins, value, obj, multiname)); + output.add(new SetSuperAVM2Item(ins, value, obj, multiname)); } @Override - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; String multiname = resolveMultinameNoPop(1, stack, abc.constants, multinameIndex, ins, fullyQualifiedNames); String obj = stack.get(1 + resolvedCount(abc.constants, multinameIndex)).toString(abc.constants, localRegNames, fullyQualifiedNames); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java index d112c6cd9..396b06036 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThrowTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ThrowAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class ThrowIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - output.add(new ThrowTreeItem(ins, (GraphTargetItem) stack.pop())); + output.add(new ThrowAVM2Item(ins, (GraphTargetItem) stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java index 3cea9d4ba..4ab1c265a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java @@ -22,8 +22,8 @@ import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.DuplicateItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.DuplicateItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java index 7ad08cd9c..ce945686d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java @@ -16,15 +16,19 @@ */ package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; +import com.jpexs.decompiler.flash.abc.avm2.model.CallAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallMethodAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallSuperAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallStaticAVM2Item; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.*; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,17 +48,17 @@ public class PopIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { if (stack.size() > 0) { GraphTargetItem top = stack.pop(); - if (top instanceof CallPropertyTreeItem) { + if (top instanceof CallPropertyAVM2Item) { output.add(top); - } else if (top instanceof CallSuperTreeItem) { + } else if (top instanceof CallSuperAVM2Item) { output.add(top); - } else if (top instanceof CallStaticTreeItem) { + } else if (top instanceof CallStaticAVM2Item) { output.add(top); - } else if (top instanceof CallMethodTreeItem) { + } else if (top instanceof CallMethodAVM2Item) { output.add(top); - } else if (top instanceof CallTreeItem) { + } else if (top instanceof CallAVM2Item) { output.add(top); - } else if (top instanceof AssignmentTreeItem) { + } else if (top instanceof AssignmentAVM2Item) { output.add(top); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java index 955a6a404..2cc8feb59 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java @@ -21,11 +21,11 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithEndTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithObjectTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.WithEndAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.WithObjectAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,9 +44,9 @@ public class PopScopeIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem scope = (GraphTargetItem) scopeStack.pop(); - if (scope instanceof WithObjectTreeItem) { - scope = ((WithObjectTreeItem) scope).scope; - output.add(new WithEndTreeItem(ins, scope)); + if (scope instanceof WithObjectAVM2Item) { + scope = ((WithObjectAVM2Item) scope).scope; + output.add(new WithEndAVM2Item(ins, scope)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java index d1210311a..d4a250629 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class PushByteIns extends InstructionDefinition implements PushIntegerTyp @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new IntegerValueTreeItem(ins, Long.valueOf(ins.operands[0]))); + stack.push(new IntegerValueAVM2Item(ins, Long.valueOf(ins.operands[0]))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java index ae595fda0..6887b854f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FloatValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FloatValueAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class PushDoubleIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new FloatValueTreeItem(ins, constants.constant_double[ins.operands[0]])); + stack.push(new FloatValueAVM2Item(ins, constants.constant_double[ins.operands[0]])); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java index 93358e0fd..fa9e5955d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.BooleanAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushFalseIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new BooleanTreeItem(ins, Boolean.FALSE)); + stack.push(new BooleanAVM2Item(ins, Boolean.FALSE)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java index 5984fb24d..a9498e698 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class PushIntIns extends InstructionDefinition implements PushIntegerType @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new IntegerValueTreeItem(ins, constants.constant_int[ins.operands[0]])); + stack.push(new IntegerValueAVM2Item(ins, constants.constant_int[ins.operands[0]])); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNamespaceIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNamespaceIns.java index 7f6f86174..ffebba744 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNamespaceIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNamespaceIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NameSpaceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NameSpaceAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class PushNamespaceIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new NameSpaceTreeItem(ins, ins.operands[0])); + stack.push(new NameSpaceAVM2Item(ins, ins.operands[0])); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNanIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNanIns.java index 0db3f3b42..5b5ec024e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNanIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNanIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NanAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class PushNanIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new NanTreeItem(ins)); + stack.push(new NanAVM2Item(ins)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNullIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNullIns.java index 038487b6d..2568d0f16 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNullIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNullIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.NullTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.NullAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class PushNullIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new NullTreeItem(ins)); + stack.push(new NullAVM2Item(ins)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java index 88bf50f64..59819cea9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java @@ -22,7 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java index cea21d1b4..a63af8616 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class PushShortIns extends InstructionDefinition implements PushIntegerTy @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new IntegerValueTreeItem(ins, Long.valueOf(ins.operands[0]))); + stack.push(new IntegerValueAVM2Item(ins, Long.valueOf(ins.operands[0]))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java index bf980561a..ad46289a6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.StringTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.StringAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class PushStringIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new StringTreeItem(ins, constants.constant_string[ins.operands[0]])); + stack.push(new StringAVM2Item(ins, constants.constant_string[ins.operands[0]])); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java index 4b399e693..e4f957adc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.BooleanAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushTrueIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new BooleanTreeItem(ins, Boolean.TRUE)); + stack.push(new BooleanAVM2Item(ins, Boolean.TRUE)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java index 3352fb258..c4f9edcbc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class PushUIntIns extends InstructionDefinition implements PushIntegerTyp @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new IntegerValueTreeItem(ins, constants.constant_uint[ins.operands[0]])); + stack.push(new IntegerValueAVM2Item(ins, constants.constant_uint[ins.operands[0]])); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUndefinedIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUndefinedIns.java index abe067542..d02bbc42d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUndefinedIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUndefinedIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.UndefinedTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.UndefinedAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class PushUndefinedIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new UndefinedTreeItem(ins)); + stack.push(new UndefinedAVM2Item(ins)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java index 66c4cf5d4..5eaf4c4d0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java @@ -20,11 +20,11 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithObjectTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.WithObjectAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.WithAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,9 +38,9 @@ public class PushWithIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem w = (GraphTargetItem) stack.pop(); - WithObjectTreeItem wot = new WithObjectTreeItem(ins, w); + WithObjectAVM2Item wot = new WithObjectAVM2Item(ins, w); scopeStack.push(wot); - output.add(new WithTreeItem(ins, w)); + output.add(new WithAVM2Item(ins, w)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java index c1feac2db..4c8c6f77a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java @@ -23,8 +23,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java index 00aa9a8bd..bc2e5a62f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ApplyTypeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ApplyTypeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.*; public class ApplyTypeIns extends InstructionDefinition { @@ -51,7 +51,7 @@ public class ApplyTypeIns extends InstructionDefinition { for (int i = 0; i < argCount; i++) { params.add(0, stack.pop()); } - stack.push(new ApplyTypeTreeItem(ins, stack.pop(), params)); + stack.push(new ApplyTypeAVM2Item(ins, stack.pop(), params)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java index 50d2b30e7..9a9cdcd56 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.AsTypeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -50,7 +50,7 @@ public class AsTypeIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem val = (GraphTargetItem) stack.pop(); - stack.push(new AsTypeTreeItem(ins, val, new FullMultinameTreeItem(ins, ins.operands[0]))); + stack.push(new AsTypeAVM2Item(ins, val, new FullMultinameAVM2Item(ins, ins.operands[0]))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java index dc2267d4e..ce50d4052 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.AsTypeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -47,7 +47,7 @@ public class AsTypeLateIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem cls = (GraphTargetItem) stack.pop(); GraphTargetItem val = (GraphTargetItem) stack.pop(); - stack.push(new AsTypeTreeItem(ins, val, cls)); + stack.push(new AsTypeAVM2Item(ins, val, cls)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java index ca22fac7c..97fefba0e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CoerceAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -45,7 +45,7 @@ public class CoerceAIns extends InstructionDefinition implements CoerceOrConvert @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new CoerceTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new CoerceAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java index 42930e946..ad7a1d6a0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CoerceAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,7 +44,7 @@ public class CoerceIns extends InstructionDefinition implements CoerceOrConvertT @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; - stack.push(new CoerceTreeItem(ins, (GraphTargetItem) stack.pop(), constants.constant_multiname[multinameIndex].getName(constants, fullyQualifiedNames))); + stack.push(new CoerceAVM2Item(ins, (GraphTargetItem) stack.pop(), constants.constant_multiname[multinameIndex].getName(constants, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java index 5f79510bf..2d7335b92 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CoerceAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class CoerceSIns extends InstructionDefinition implements CoerceOrConvert @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new CoerceTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new CoerceAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java index b495d08d5..90405cbec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -52,7 +52,7 @@ public class ConvertBIns extends InstructionDefinition implements CoerceOrConver @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new ConvertTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new ConvertAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java index b89240d40..21f8e7e52 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -60,7 +60,7 @@ public class ConvertDIns extends InstructionDefinition implements CoerceOrConver @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new ConvertTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new ConvertAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java index 60e24536b..4562e35cf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -58,7 +58,7 @@ public class ConvertIIns extends InstructionDefinition implements CoerceOrConver @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new ConvertTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new ConvertAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java index a7e09c812..5b856d91e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class ConvertOIns extends InstructionDefinition implements CoerceOrConver @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new ConvertTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new ConvertAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java index 66499319f..b4dcc5ef4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class ConvertSIns extends InstructionDefinition implements CoerceOrConver @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new ConvertTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new ConvertAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java index bdae8ce09..3a73c8853 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class ConvertUIns extends InstructionDefinition implements CoerceOrConver @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new ConvertTreeItem(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); + stack.push(new ConvertAVM2Item(ins, (GraphTargetItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/InstanceOfIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/InstanceOfIns.java index b35194fe1..6e0654c8a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/InstanceOfIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/InstanceOfIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.InstanceOfTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.InstanceOfAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class InstanceOfIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem type = (GraphTargetItem) stack.pop(); GraphTargetItem value = (GraphTargetItem) stack.pop(); - stack.push(new InstanceOfTreeItem(ins, value, type)); + stack.push(new InstanceOfAVM2Item(ins, value, type)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeIns.java index 7edd99429..593ffdf9f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeIns.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.IsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.IsTypeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,7 +39,7 @@ public class IsTypeIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { int multinameIndex = ins.operands[0]; GraphTargetItem value = (GraphTargetItem) stack.pop(); - stack.push(new IsTypeTreeItem(ins, value, new FullMultinameTreeItem(ins, multinameIndex))); + stack.push(new IsTypeAVM2Item(ins, value, new FullMultinameAVM2Item(ins, multinameIndex))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeLateIns.java index 12cc038cf..9930622fe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeLateIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.IsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.IsTypeAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IsTypeLateIns extends InstructionDefinition { public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem type = (GraphTargetItem) stack.pop(); GraphTargetItem value = (GraphTargetItem) stack.pop(); - stack.push(new IsTypeTreeItem(ins, value, type)); + stack.push(new IsTypeAVM2Item(ins, value, type)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/TypeOfIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/TypeOfIns.java index 5a9a1f0af..9e9bcd77c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/TypeOfIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/TypeOfIns.java @@ -20,9 +20,9 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.TypeOfTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.operations.TypeOfAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class TypeOfIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new TypeOfTreeItem(ins, (GraphTargetItem) stack.pop())); + stack.push(new TypeOfAVM2Item(ins, (GraphTargetItem) stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java index 84a53d011..c992dbf6c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FilteredCheckTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FilteredCheckAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class CheckFilterIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { GraphTargetItem obj = stack.pop(); - stack.push(new FilteredCheckTreeItem(ins, obj)); + stack.push(new FilteredCheckAVM2Item(ins, obj)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java index 90e1d040f..5c3579447 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java @@ -22,11 +22,11 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DefaultXMLNamespace; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.StringTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.DefaultXMLNamespace; +import com.jpexs.decompiler.flash.abc.avm2.model.StringAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -47,6 +47,6 @@ public class DXNSIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - output.add(new DefaultXMLNamespace(ins, new StringTreeItem(ins, constants.constant_string[ins.operands[0]]))); + output.add(new DefaultXMLNamespace(ins, new StringAVM2Item(ins, constants.constant_string[ins.operands[0]]))); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java index 96fe34b24..95ea26c98 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.DefaultXMLNamespace; +import com.jpexs.decompiler.flash.abc.avm2.model.DefaultXMLNamespace; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java index 852fb5e6e..87189c22d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXAttrTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.EscapeXAttrAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,7 +43,7 @@ public class EscXAttrIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new EscapeXAttrTreeItem(ins, stack.pop())); + stack.push(new EscapeXAttrAVM2Item(ins, stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java index 77d14db1d..1120a0fb7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java @@ -21,9 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXElemTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.EscapeXElemAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,7 +43,7 @@ public class EscXElemIns extends InstructionDefinition { @Override public void translate(boolean isStatic, int scriptIndex, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames, String path) { - stack.push(new EscapeXElemTreeItem(ins, stack.pop())); + stack.push(new EscapeXElemAVM2Item(ins, stack.pop())); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java index 5461183f0..83ae483d5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; -public abstract class TreeItem extends GraphTargetItem { +public abstract class AVM2Item extends GraphTargetItem { public AVM2Instruction instruction; public boolean hidden = false; - public TreeItem(GraphSourceItem instruction, int precedence) { + public AVM2Item(GraphSourceItem instruction, int precedence) { super(instruction, precedence); } @@ -78,9 +78,9 @@ public abstract class TreeItem extends GraphTargetItem { if (object.precedence > PRECEDENCE_PRIMARY) { obStr = "(" + obStr + ")"; } - if (object instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) object).computedValue != null) { - if (((LocalRegTreeItem) object).computedValue.getThroughNotCompilable() instanceof FindPropertyTreeItem) { + if (object instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) object).computedValue != null) { + if (((LocalRegAVM2Item) object).computedValue.getThroughNotCompilable() instanceof FindPropertyAVM2Item) { obStr = ""; } } @@ -88,8 +88,8 @@ public abstract class TreeItem extends GraphTargetItem { if (obStr.equals("")) { return propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); } - if (propertyName instanceof FullMultinameTreeItem) { - if (((FullMultinameTreeItem) propertyName).name != null) { + if (propertyName instanceof FullMultinameAVM2Item) { + if (((FullMultinameAVM2Item) propertyName).name != null) { return obStr + propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); } else { return obStr + "." + propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemyLoadTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemyLoadTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java index 4fb2e6257..78b4d0278 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemyLoadTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; @@ -26,12 +26,12 @@ import java.util.List; * * @author JPEXS */ -public class AlchemyLoadTreeItem extends TreeItem { +public class AlchemyLoadAVM2Item extends AVM2Item { private String name; private GraphTargetItem ofs; - public AlchemyLoadTreeItem(GraphSourceItem instruction, GraphTargetItem ofs, String name) { + public AlchemyLoadAVM2Item(GraphSourceItem instruction, GraphTargetItem ofs, String name) { super(instruction, PRECEDENCE_PRIMARY); this.name = name; this.ofs = ofs; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemySignExtendTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemySignExtendTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java index fb42b1f86..4a1e7274c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemySignExtendTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; @@ -26,11 +26,11 @@ import java.util.List; * * @author JPEXS */ -public class AlchemySignExtendTreeItem extends TreeItem { +public class AlchemySignExtendAVM2Item extends AVM2Item { private String name; - public AlchemySignExtendTreeItem(GraphSourceItem instruction, GraphTargetItem value, String name) { + public AlchemySignExtendAVM2Item(GraphSourceItem instruction, GraphTargetItem value, String name) { super(instruction, PRECEDENCE_PRIMARY); this.name = name; this.value = value; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemyStoreTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemyStoreTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java index 72e51aa26..ba4b4d5c9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/AlchemyStoreTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; @@ -26,12 +26,12 @@ import java.util.List; * * @author JPEXS */ -public class AlchemyStoreTreeItem extends TreeItem { +public class AlchemyStoreAVM2Item extends AVM2Item { private String name; private GraphTargetItem ofs; - public AlchemyStoreTreeItem(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem ofs, String name) { + public AlchemyStoreAVM2Item(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem ofs, String name) { super(instruction, PRECEDENCE_PRIMARY); this.name = name; this.ofs = ofs; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ApplyTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ApplyTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java index 2d0c884b6..da48e2e56 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ApplyTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; -public class ApplyTypeTreeItem extends TreeItem { +public class ApplyTypeAVM2Item extends AVM2Item { public GraphTargetItem object; public List params; - public ApplyTypeTreeItem(AVM2Instruction instruction, GraphTargetItem object, List params) { + public ApplyTypeAVM2Item(AVM2Instruction instruction, GraphTargetItem object, List params) { super(instruction, PRECEDENCE_PRIMARY); this.params = params; this.object = object; @@ -45,7 +45,7 @@ public class ApplyTypeTreeItem extends TreeItem { ret.append(hilight(",")); } GraphTargetItem p = params.get(i); - if (p instanceof NullTreeItem) { + if (p instanceof NullAVM2Item) { ret.append("*"); } else { ret.append(p.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames))); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BooleanTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BooleanTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java index 2a0b16719..2aace08cf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BooleanTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class BooleanTreeItem extends TreeItem { +public class BooleanAVM2Item extends AVM2Item { public Boolean value; - public BooleanTreeItem(AVM2Instruction instruction, Boolean value) { + public BooleanAVM2Item(AVM2Instruction instruction, Boolean value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java index b81bc1435..df5db8f4a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class CallTreeItem extends TreeItem { +public class CallAVM2Item extends AVM2Item { public GraphTargetItem receiver; public GraphTargetItem function; public List arguments; - public CallTreeItem(AVM2Instruction instruction, GraphTargetItem receiver, GraphTargetItem function, List arguments) { + public CallAVM2Item(AVM2Instruction instruction, GraphTargetItem receiver, GraphTargetItem function, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.receiver = receiver; this.function = function; @@ -45,10 +45,10 @@ public class CallTreeItem extends TreeItem { args = args + arguments.get(a).toString(constants, localRegNames, fullyQualifiedNames); } /*String recPart = ""; receiver.toString(constants, localRegNames) + hilight("."); - if (receiver instanceof NewActivationTreeItem) { + if (receiver instanceof NewActivationAVM2Item) { recPart = ""; } - if (receiver instanceof ThisTreeItem) { + if (receiver instanceof ThisAVM2Item) { recPart = ""; }*/ String fstr = function.toString(constants, localRegNames, fullyQualifiedNames); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallMethodTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java index 8114e2d5c..ff69fc30f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; -public class CallMethodTreeItem extends TreeItem { +public class CallMethodAVM2Item extends AVM2Item { public GraphTargetItem receiver; public String methodName; public List arguments; - public CallMethodTreeItem(AVM2Instruction instruction, GraphTargetItem receiver, String methodName, List arguments) { + public CallMethodAVM2Item(AVM2Instruction instruction, GraphTargetItem receiver, String methodName, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.receiver = receiver; this.methodName = methodName; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java index b444ba1be..68f774cbe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class CallPropertyTreeItem extends TreeItem { +public class CallPropertyAVM2Item extends AVM2Item { public GraphTargetItem receiver; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; public List arguments; public boolean isVoid; - public CallPropertyTreeItem(AVM2Instruction instruction, boolean isVoid, GraphTargetItem receiver, FullMultinameTreeItem propertyName, List arguments) { + public CallPropertyAVM2Item(AVM2Instruction instruction, boolean isVoid, GraphTargetItem receiver, FullMultinameAVM2Item propertyName, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.receiver = receiver; this.propertyName = propertyName; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallStaticTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallStaticTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java index 71f6fd7f3..b36e13eb9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallStaticTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; -public class CallStaticTreeItem extends TreeItem { +public class CallStaticAVM2Item extends AVM2Item { public GraphTargetItem receiver; public String methodName; public List arguments; - public CallStaticTreeItem(AVM2Instruction instruction, GraphTargetItem receiver, String methodName, List arguments) { + public CallStaticAVM2Item(AVM2Instruction instruction, GraphTargetItem receiver, String methodName, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.receiver = receiver; this.methodName = methodName; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallSuperTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java index 6b7e697c5..a0b85cf57 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; -public class CallSuperTreeItem extends TreeItem { +public class CallSuperAVM2Item extends AVM2Item { public GraphTargetItem receiver; - public FullMultinameTreeItem multiname; + public FullMultinameAVM2Item multiname; public List arguments; public boolean isVoid; - public CallSuperTreeItem(AVM2Instruction instruction, boolean isVoid, GraphTargetItem receiver, FullMultinameTreeItem multiname, List arguments) { + public CallSuperAVM2Item(AVM2Instruction instruction, boolean isVoid, GraphTargetItem receiver, FullMultinameAVM2Item multiname, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.receiver = receiver; this.multiname = multiname; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ClassTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ClassTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java index 2e3b8407f..b5849dfa1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ClassTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; -public class ClassTreeItem extends TreeItem { +public class ClassAVM2Item extends AVM2Item { public Multiname className; - public ClassTreeItem(Multiname className) { + public ClassAVM2Item(Multiname className) { super(null, PRECEDENCE_PRIMARY); this.className = className; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CoerceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CoerceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java index edf4ec179..3ffcd2bbc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CoerceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class CoerceTreeItem extends TreeItem { +public class CoerceAVM2Item extends AVM2Item { //public GraphTargetItem value; public String type; - public CoerceTreeItem(AVM2Instruction instruction, GraphTargetItem value, String type) { + public CoerceAVM2Item(AVM2Instruction instruction, GraphTargetItem value, String type) { super(instruction, NOPRECEDENCE); this.value = value; this.type = type; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java index ef98b2a6c..391fb9d3f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class ConstructTreeItem extends TreeItem { +public class ConstructAVM2Item extends AVM2Item { public GraphTargetItem object; public List args; - public ConstructTreeItem(AVM2Instruction instruction, GraphTargetItem object, List args) { + public ConstructAVM2Item(AVM2Instruction instruction, GraphTargetItem object, List args) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.args = args; @@ -42,7 +42,7 @@ public class ConstructTreeItem extends TreeItem { } argStr = argStr + args.get(a).toString(constants, localRegNames, fullyQualifiedNames); } - if (object instanceof NewFunctionTreeItem) { + if (object instanceof NewFunctionAVM2Item) { return object.toString(constants, localRegNames, fullyQualifiedNames); } String obStr = object.toString(constants, localRegNames, fullyQualifiedNames); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructPropTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructPropTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java index 04ed9880f..fd362d6bb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructPropTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class ConstructPropTreeItem extends TreeItem { +public class ConstructPropAVM2Item extends AVM2Item { public GraphTargetItem object; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; public List args; - public ConstructPropTreeItem(AVM2Instruction instruction, GraphTargetItem object, FullMultinameTreeItem propertyName, List args) { + public ConstructPropAVM2Item(AVM2Instruction instruction, GraphTargetItem object, FullMultinameAVM2Item propertyName, List args) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.propertyName = propertyName; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructSuperTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java index 2279b2027..04e9a8754 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; -public class ConstructSuperTreeItem extends TreeItem { +public class ConstructSuperAVM2Item extends AVM2Item { public GraphTargetItem object; public List args; - public ConstructSuperTreeItem(AVM2Instruction instruction, GraphTargetItem object, List args) { + public ConstructSuperAVM2Item(AVM2Instruction instruction, GraphTargetItem object, List args) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.args = args; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConvertTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java similarity index 88% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConvertTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java index 8aecf8aad..0e111d96d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConvertTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class ConvertTreeItem extends TreeItem { +public class ConvertAVM2Item extends AVM2Item { //public GraphTargetItem value; public String type; - public ConvertTreeItem(AVM2Instruction instruction, GraphTargetItem value, String type) { + public ConvertAVM2Item(AVM2Instruction instruction, GraphTargetItem value, String type) { super(instruction, NOPRECEDENCE); this.value = value; this.type = type; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java index 488567297..340ff3754 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class DecLocalTreeItem extends TreeItem { +public class DecLocalAVM2Item extends AVM2Item { public int regIndex; - public DecLocalTreeItem(AVM2Instruction instruction, int regIndex) { + public DecLocalAVM2Item(AVM2Instruction instruction, int regIndex) { super(instruction, PRECEDENCE_POSTFIX); this.regIndex = regIndex; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java index 394d90d20..2242bd584 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class DecrementTreeItem extends TreeItem { +public class DecrementAVM2Item extends AVM2Item { public GraphTargetItem object; - public DecrementTreeItem(AVM2Instruction instruction, GraphTargetItem object) { + public DecrementAVM2Item(AVM2Instruction instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_ADDITIVE); this.object = object; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DefaultXMLNamespace.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DefaultXMLNamespace.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java index 591e94c2d..fa51c8169 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DefaultXMLNamespace.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -27,7 +27,7 @@ import java.util.List; * * @author Jindra */ -public class DefaultXMLNamespace extends TreeItem { +public class DefaultXMLNamespace extends AVM2Item { private GraphTargetItem ns; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXAttrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXAttrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java index b324f9752..d1f9a2cb7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXAttrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -27,11 +27,11 @@ import java.util.List; * * @author Jindra */ -public class EscapeXAttrTreeItem extends TreeItem { +public class EscapeXAttrAVM2Item extends AVM2Item { public GraphTargetItem expression; - public EscapeXAttrTreeItem(AVM2Instruction instruction, GraphTargetItem expression) { + public EscapeXAttrAVM2Item(AVM2Instruction instruction, GraphTargetItem expression) { super(instruction, NOPRECEDENCE); this.expression = expression; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXElemTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXElemTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java index da32559a6..8dcb7f5f9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXElemTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -27,11 +27,11 @@ import java.util.List; * * @author Jindra */ -public class EscapeXElemTreeItem extends TreeItem { +public class EscapeXElemAVM2Item extends AVM2Item { public GraphTargetItem expression; - public EscapeXElemTreeItem(AVM2Instruction instruction, GraphTargetItem expression) { + public EscapeXElemAVM2Item(AVM2Instruction instruction, GraphTargetItem expression) { super(instruction, NOPRECEDENCE); this.expression = expression; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FilteredCheckTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FilteredCheckTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java index a18c76e50..e27ce505b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FilteredCheckTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -27,11 +27,11 @@ import java.util.List; * * @author JPEXS */ -public class FilteredCheckTreeItem extends TreeItem { +public class FilteredCheckAVM2Item extends AVM2Item { GraphTargetItem object; - public FilteredCheckTreeItem(AVM2Instruction instruction, GraphTargetItem object) { + public FilteredCheckAVM2Item(AVM2Instruction instruction, GraphTargetItem object) { super(instruction, NOPRECEDENCE); this.object = object; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FindPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FindPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java index e3bf65f47..5c5e6e0bb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FindPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class FindPropertyTreeItem extends TreeItem { +public class FindPropertyAVM2Item extends AVM2Item { - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; - public FindPropertyTreeItem(AVM2Instruction instruction, FullMultinameTreeItem propertyName) { + public FindPropertyAVM2Item(AVM2Instruction instruction, FullMultinameAVM2Item propertyName) { super(instruction, PRECEDENCE_PRIMARY); this.propertyName = propertyName; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FloatValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FloatValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java index e1d1cfbd7..05d4667dc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FloatValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class FloatValueTreeItem extends NumberValueTreeItem { +public class FloatValueAVM2Item extends NumberValueAVM2Item { public Double value; - public FloatValueTreeItem(AVM2Instruction instruction, Double value) { + public FloatValueAVM2Item(AVM2Instruction instruction, Double value) { super(instruction); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FullMultinameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FullMultinameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java index a0c404384..52fccb67d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FullMultinameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java @@ -14,36 +14,36 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.types.Namespace; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class FullMultinameTreeItem extends TreeItem { +public class FullMultinameAVM2Item extends AVM2Item { public int multinameIndex; public GraphTargetItem name; public GraphTargetItem namespace; - public FullMultinameTreeItem(AVM2Instruction instruction, int multinameIndex, GraphTargetItem name) { + public FullMultinameAVM2Item(AVM2Instruction instruction, int multinameIndex, GraphTargetItem name) { super(instruction, PRECEDENCE_PRIMARY); this.multinameIndex = multinameIndex; this.name = name; this.namespace = null; } - public FullMultinameTreeItem(AVM2Instruction instruction, int multinameIndex) { + public FullMultinameAVM2Item(AVM2Instruction instruction, int multinameIndex) { super(instruction, PRECEDENCE_PRIMARY); this.multinameIndex = multinameIndex; this.name = null; this.namespace = null; } - public FullMultinameTreeItem(AVM2Instruction instruction, int multinameIndex, GraphTargetItem name, GraphTargetItem namespace) { + public FullMultinameAVM2Item(AVM2Instruction instruction, int multinameIndex, GraphTargetItem name, GraphTargetItem namespace) { super(instruction, PRECEDENCE_PRIMARY); this.multinameIndex = multinameIndex; this.name = name; @@ -92,7 +92,7 @@ public class FullMultinameTreeItem extends TreeItem { return ret; } - public boolean compareSame(FullMultinameTreeItem other) { + public boolean compareSame(FullMultinameAVM2Item other) { if (multinameIndex != other.multinameIndex) { return false; } @@ -100,9 +100,9 @@ public class FullMultinameTreeItem extends TreeItem { if (name != null) { name = name.getThroughDuplicate(); } - while (tiName instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) tiName).computedValue != null) { - tiName = ((LocalRegTreeItem) tiName).computedValue.getThroughNotCompilable().getThroughDuplicate(); + while (tiName instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) tiName).computedValue != null) { + tiName = ((LocalRegAVM2Item) tiName).computedValue.getThroughNotCompilable().getThroughDuplicate(); } else { break; } @@ -112,9 +112,9 @@ public class FullMultinameTreeItem extends TreeItem { if (tiName2 != null) { tiName2 = tiName2.getThroughDuplicate(); } - while (tiName2 instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) tiName2).computedValue != null) { - tiName2 = ((LocalRegTreeItem) tiName2).computedValue.getThroughNotCompilable().getThroughDuplicate(); + while (tiName2 instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) tiName2).computedValue != null) { + tiName2 = ((LocalRegAVM2Item) tiName2).computedValue.getThroughNotCompilable().getThroughDuplicate(); } else { break; } @@ -127,9 +127,9 @@ public class FullMultinameTreeItem extends TreeItem { if (tiNameSpace != null) { tiNameSpace = tiNameSpace.getThroughDuplicate(); } - while (tiNameSpace instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) tiNameSpace).computedValue != null) { - tiNameSpace = ((LocalRegTreeItem) tiNameSpace).computedValue.getThroughNotCompilable().getThroughDuplicate(); + while (tiNameSpace instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) tiNameSpace).computedValue != null) { + tiNameSpace = ((LocalRegAVM2Item) tiNameSpace).computedValue.getThroughNotCompilable().getThroughDuplicate(); } } @@ -137,9 +137,9 @@ public class FullMultinameTreeItem extends TreeItem { if (tiNameSpace2 != null) { tiNameSpace2 = tiNameSpace2.getThroughDuplicate(); } - while (tiNameSpace2 instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) tiNameSpace2).computedValue != null) { - tiNameSpace2 = ((LocalRegTreeItem) tiNameSpace2).computedValue.getThroughNotCompilable().getThroughDuplicate(); + while (tiNameSpace2 instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) tiNameSpace2).computedValue != null) { + tiNameSpace2 = ((LocalRegAVM2Item) tiNameSpace2).computedValue.getThroughNotCompilable().getThroughDuplicate(); } } if (tiNameSpace != tiNameSpace2) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetDescendantsTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetDescendantsTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java index 1cf7cc82e..1f8018ad4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetDescendantsTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class GetDescendantsTreeItem extends TreeItem { +public class GetDescendantsAVM2Item extends AVM2Item { public GraphTargetItem object; - public FullMultinameTreeItem multiname; + public FullMultinameAVM2Item multiname; - public GetDescendantsTreeItem(AVM2Instruction instruction, GraphTargetItem object, FullMultinameTreeItem multiname) { + public GetDescendantsAVM2Item(AVM2Instruction instruction, GraphTargetItem object, FullMultinameAVM2Item multiname) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.multiname = multiname; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetLexTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetLexTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java index 614de7152..62a79c68d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetLexTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; @@ -22,11 +22,11 @@ import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; -public class GetLexTreeItem extends TreeItem { +public class GetLexAVM2Item extends AVM2Item { public Multiname propertyName; - public GetLexTreeItem(AVM2Instruction instruction, Multiname propertyName) { + public GetLexAVM2Item(AVM2Instruction instruction, Multiname propertyName) { super(instruction, PRECEDENCE_PRIMARY); this.propertyName = propertyName; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java index b8a09c1e5..6d22e4e1e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class GetPropertyTreeItem extends TreeItem { +public class GetPropertyAVM2Item extends AVM2Item { public GraphTargetItem object; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; - public GetPropertyTreeItem(AVM2Instruction instruction, GraphTargetItem object, FullMultinameTreeItem propertyName) { + public GetPropertyAVM2Item(AVM2Instruction instruction, GraphTargetItem object, FullMultinameAVM2Item propertyName) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.propertyName = propertyName; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSlotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSlotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java index 76b13d6cc..61555c222 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSlotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.types.Multiname; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class GetSlotTreeItem extends TreeItem { +public class GetSlotAVM2Item extends AVM2Item { public Multiname slotName; public GraphTargetItem scope; - public GetSlotTreeItem(AVM2Instruction instruction, GraphTargetItem scope, Multiname slotName) { + public GetSlotAVM2Item(AVM2Instruction instruction, GraphTargetItem scope, Multiname slotName) { super(instruction, PRECEDENCE_PRIMARY); this.slotName = slotName; this.scope = scope; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSuperTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java index 823678b52..751bf1ae8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; -public class GetSuperTreeItem extends TreeItem { +public class GetSuperAVM2Item extends AVM2Item { public GraphTargetItem object; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; - public GetSuperTreeItem(AVM2Instruction instruction, GraphTargetItem object, FullMultinameTreeItem propertyName) { + public GetSuperAVM2Item(AVM2Instruction instruction, GraphTargetItem object, FullMultinameAVM2Item propertyName) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.propertyName = propertyName; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/HasNextTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/HasNextTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java index 5edb1d8f5..9864a01bc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/HasNextTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -27,12 +27,12 @@ import java.util.List; * * @author JPEXS */ -public class HasNextTreeItem extends TreeItem { +public class HasNextAVM2Item extends AVM2Item { public GraphTargetItem object; public GraphTargetItem collection; - public HasNextTreeItem(AVM2Instruction instruction, GraphTargetItem object, GraphTargetItem collection) { + public HasNextAVM2Item(AVM2Instruction instruction, GraphTargetItem object, GraphTargetItem collection) { super(instruction, NOPRECEDENCE); this.object = object; this.collection = collection; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java index f1d3b3793..21a434934 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class InTreeItem extends TreeItem { +public class InAVM2Item extends AVM2Item { public GraphTargetItem object; public GraphTargetItem collection; - public InTreeItem(AVM2Instruction instruction, GraphTargetItem object, GraphTargetItem collection) { + public InAVM2Item(AVM2Instruction instruction, GraphTargetItem object, GraphTargetItem collection) { super(instruction, NOPRECEDENCE); this.object = object; this.collection = collection; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java index bf7954659..12e746c21 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class IncLocalTreeItem extends TreeItem { +public class IncLocalAVM2Item extends AVM2Item { public int regIndex; - public IncLocalTreeItem(AVM2Instruction instruction, int regIndex) { + public IncLocalAVM2Item(AVM2Instruction instruction, int regIndex) { super(instruction, PRECEDENCE_POSTFIX); this.regIndex = regIndex; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java index 50a4471b3..dfc023b96 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class IncrementTreeItem extends TreeItem { +public class IncrementAVM2Item extends AVM2Item { public GraphTargetItem object; - public IncrementTreeItem(AVM2Instruction instruction, GraphTargetItem object) { + public IncrementAVM2Item(AVM2Instruction instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_ADDITIVE); this.object = object; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java index 24102075d..3e6f3abc9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class InitPropertyTreeItem extends TreeItem implements SetTypeTreeItem, AssignmentTreeItem { +public class InitPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, AssignmentAVM2Item { public GraphTargetItem object; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; //public GraphTargetItem value; - public InitPropertyTreeItem(AVM2Instruction instruction, GraphTargetItem object, FullMultinameTreeItem propertyName, GraphTargetItem value) { + public InitPropertyAVM2Item(AVM2Instruction instruction, GraphTargetItem object, FullMultinameAVM2Item propertyName, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.object = object; this.propertyName = propertyName; @@ -43,7 +43,7 @@ public class InitPropertyTreeItem extends TreeItem implements SetTypeTreeItem, A @Override public GraphTargetItem getObject() { - return new GetPropertyTreeItem(instruction, object, propertyName); + return new GetPropertyAVM2Item(instruction, object, propertyName); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IntegerValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IntegerValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java index 04443e8c6..ce87cb3a9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IntegerValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class IntegerValueTreeItem extends NumberValueTreeItem { +public class IntegerValueAVM2Item extends NumberValueAVM2Item { public Long value; - public IntegerValueTreeItem(AVM2Instruction instruction, Long value) { + public IntegerValueAVM2Item(AVM2Instruction instruction, Long value) { super(instruction); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/LocalRegTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/LocalRegTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java index 267b3e53f..39bb8c30e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/LocalRegTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java @@ -14,34 +14,34 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.FilterTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.FilterAVM2Item; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; -public class LocalRegTreeItem extends TreeItem { +public class LocalRegAVM2Item extends AVM2Item { public int regIndex; public GraphTargetItem computedValue; - public LocalRegTreeItem(AVM2Instruction instruction, int regIndex, GraphTargetItem computedValue) { + public LocalRegAVM2Item(AVM2Instruction instruction, int regIndex, GraphTargetItem computedValue) { super(instruction, PRECEDENCE_PRIMARY); this.regIndex = regIndex; if (computedValue == null) { - //computedValue = new UndefinedTreeItem(instruction); + //computedValue = new UndefinedAVM2Item(instruction); } this.computedValue = computedValue; } @Override public String toString(ConstantPool constants, HashMap localRegNames, List fullyQualifiedNames) { - if (computedValue instanceof FilterTreeItem) { + if (computedValue instanceof FilterAVM2Item) { return computedValue.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); } return hilight(localRegName(localRegNames, regIndex)); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java index 838e07956..5b016c85b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class NameSpaceTreeItem extends TreeItem { +public class NameSpaceAVM2Item extends AVM2Item { public int namespaceIndex; - public NameSpaceTreeItem(AVM2Instruction instruction, int namespaceIndex) { + public NameSpaceAVM2Item(AVM2Instruction instruction, int namespaceIndex) { super(instruction, NOPRECEDENCE); this.namespaceIndex = namespaceIndex; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameValuePair.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameValuePair.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java index 8b8e0d0ef..1d29778be 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameValuePair.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.TernarOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.TernarOpItem; import java.util.HashMap; import java.util.List; -public class NameValuePair extends TreeItem { +public class NameValuePair extends AVM2Item { public GraphTargetItem name; //public GraphTargetItem value; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NanTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NanTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java index 8a4685749..d663726df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NanTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class NanTreeItem extends TreeItem { +public class NanAVM2Item extends AVM2Item { - public NanTreeItem(AVM2Instruction instruction) { + public NanAVM2Item(AVM2Instruction instruction) { super(instruction, NOPRECEDENCE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewActivationTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewActivationTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java index f3b5b7b62..6c172f21b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewActivationTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class NewActivationTreeItem extends TreeItem { +public class NewActivationAVM2Item extends AVM2Item { public HashMap slots = new HashMap<>(); - public NewActivationTreeItem(AVM2Instruction instruction) { + public NewActivationAVM2Item(AVM2Instruction instruction) { super(instruction, NOPRECEDENCE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewArrayTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewArrayTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java index 0dcfe9167..4c0d00a45 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewArrayTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class NewArrayTreeItem extends TreeItem { +public class NewArrayAVM2Item extends AVM2Item { public List values; - public NewArrayTreeItem(AVM2Instruction instruction, List values) { + public NewArrayAVM2Item(AVM2Instruction instruction, List values) { super(instruction, PRECEDENCE_PRIMARY); this.values = values; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewFunctionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java similarity index 88% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewFunctionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java index b1bd32da6..d24113df1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewFunctionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class NewFunctionTreeItem extends TreeItem { +public class NewFunctionAVM2Item extends AVM2Item { public String paramStr; public String returnStr; public String functionBody; public String functionName; - public NewFunctionTreeItem(AVM2Instruction instruction, String functionName, String paramStr, String returnStr, String functionBody) { + public NewFunctionAVM2Item(AVM2Instruction instruction, String functionName, String paramStr, String returnStr, String functionBody) { super(instruction, PRECEDENCE_PRIMARY); this.paramStr = paramStr; this.returnStr = returnStr; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java index d892ad52e..ce4f3df32 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.Graph; +import com.jpexs.decompiler.graph.Graph; import java.util.HashMap; import java.util.List; -public class NewObjectTreeItem extends TreeItem { +public class NewObjectAVM2Item extends AVM2Item { public List pairs; - public NewObjectTreeItem(AVM2Instruction instruction, List pairs) { + public NewObjectAVM2Item(AVM2Instruction instruction, List pairs) { super(instruction, PRECEDENCE_PRIMARY); this.pairs = pairs; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextNameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextNameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java index f88a40720..9bdcc85ce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextNameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -27,12 +27,12 @@ import java.util.List; * * @author JPEXS */ -public class NextNameTreeItem extends TreeItem { +public class NextNameAVM2Item extends AVM2Item { GraphTargetItem index; GraphTargetItem obj; - public NextNameTreeItem(AVM2Instruction instruction, GraphTargetItem index, GraphTargetItem obj) { + public NextNameAVM2Item(AVM2Instruction instruction, GraphTargetItem index, GraphTargetItem obj) { super(instruction, NOPRECEDENCE); this.index = index; this.obj = obj; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java index fc9568b5d..b5a1d0bba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -27,12 +27,12 @@ import java.util.List; * * @author JPEXS */ -public class NextValueTreeItem extends TreeItem { +public class NextValueAVM2Item extends AVM2Item { GraphTargetItem index; GraphTargetItem obj; - public NextValueTreeItem(AVM2Instruction instruction, GraphTargetItem index, GraphTargetItem obj) { + public NextValueAVM2Item(AVM2Instruction instruction, GraphTargetItem index, GraphTargetItem obj) { super(instruction, NOPRECEDENCE); this.index = index; this.obj = obj; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NotCompileTimeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NotCompileTimeAVM2Item.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NotCompileTimeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NotCompileTimeAVM2Item.java index b944cd76b..f06d587a3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NotCompileTimeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NotCompileTimeAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; @@ -26,11 +26,11 @@ import java.util.List; * * @author JPEXS */ -public class NotCompileTimeTreeItem extends TreeItem { +public class NotCompileTimeAVM2Item extends AVM2Item { public GraphTargetItem object; - public NotCompileTimeTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public NotCompileTimeAVM2Item(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, NOPRECEDENCE); this.object = object; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NullTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NullTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java index d923bbc79..3b9cb3108 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NullTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.ecma.Null; import java.util.HashMap; import java.util.List; -public class NullTreeItem extends TreeItem { +public class NullAVM2Item extends AVM2Item { - public NullTreeItem(AVM2Instruction instruction) { + public NullAVM2Item(AVM2Instruction instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NumberValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NumberValueAVM2Item.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NumberValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NumberValueAVM2Item.java index f866ee848..69de89e23 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NumberValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NumberValueAVM2Item.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -public abstract class NumberValueTreeItem extends TreeItem { +public abstract class NumberValueAVM2Item extends AVM2Item { - public NumberValueTreeItem(AVM2Instruction instruction) { + public NumberValueAVM2Item(AVM2Instruction instruction) { super(instruction, PRECEDENCE_PRIMARY); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostDecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostDecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java index 9f308ddd5..b406c6aef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostDecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; -public class PostDecrementTreeItem extends TreeItem implements AssignmentTreeItem { +public class PostDecrementAVM2Item extends AVM2Item implements AssignmentAVM2Item { public GraphTargetItem object; - public PostDecrementTreeItem(AVM2Instruction instruction, GraphTargetItem object) { + public PostDecrementAVM2Item(AVM2Instruction instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_POSTFIX); this.object = object; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostIncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostIncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java index 4c7c6312d..5489d6c24 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostIncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; -public class PostIncrementTreeItem extends TreeItem implements AssignmentTreeItem { +public class PostIncrementAVM2Item extends AVM2Item implements AssignmentAVM2Item { public GraphTargetItem object; - public PostIncrementTreeItem(AVM2Instruction instruction, GraphTargetItem object) { + public PostIncrementAVM2Item(AVM2Instruction instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_POSTFIX); this.object = object; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java index d8002735d..345a48f70 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.ExitItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.ExitItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class ReturnValueTreeItem extends TreeItem implements ExitItem { +public class ReturnValueAVM2Item extends AVM2Item implements ExitItem { //public GraphTargetItem value; - public ReturnValueTreeItem(AVM2Instruction instruction, GraphTargetItem value) { + public ReturnValueAVM2Item(AVM2Instruction instruction, GraphTargetItem value) { super(instruction, NOPRECEDENCE); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnVoidTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnVoidTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java index 21ad604bc..fe075cb58 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnVoidTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.ExitItem; +import com.jpexs.decompiler.graph.model.ExitItem; import java.util.HashMap; import java.util.List; -public class ReturnVoidTreeItem extends TreeItem implements ExitItem { +public class ReturnVoidAVM2Item extends AVM2Item implements ExitItem { - public ReturnVoidTreeItem(AVM2Instruction instruction) { + public ReturnVoidAVM2Item(AVM2Instruction instruction) { super(instruction, NOPRECEDENCE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ScriptTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ScriptTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java index 295dc8566..4a76ef878 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ScriptTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import java.util.HashMap; @@ -24,11 +24,11 @@ import java.util.List; * * @author JPEXS */ -public class ScriptTreeItem extends TreeItem { +public class ScriptAVM2Item extends AVM2Item { public int scriptIndex; - public ScriptTreeItem(int scriptIndex) { + public ScriptAVM2Item(int scriptIndex) { super(null, NOPRECEDENCE); this.scriptIndex = scriptIndex; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetGlobalSlotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetGlobalSlotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java index c1398fe9e..bd08895eb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetGlobalSlotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class SetGlobalSlotTreeItem extends TreeItem { +public class SetGlobalSlotAVM2Item extends AVM2Item { public int slotId; //public GraphTargetItem value; @@ -33,7 +33,7 @@ public class SetGlobalSlotTreeItem extends TreeItem { return value.getFirstPart(); } - public SetGlobalSlotTreeItem(AVM2Instruction instruction, int slotId, GraphTargetItem value) { + public SetGlobalSlotAVM2Item(AVM2Instruction instruction, int slotId, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.slotId = slotId; this.value = value; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java index 28cff8fa8..61bcece5a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class SetLocalTreeItem extends TreeItem implements SetTypeTreeItem, AssignmentTreeItem { +public class SetLocalAVM2Item extends AVM2Item implements SetTypeAVM2Item, AssignmentAVM2Item { public int regIndex; //public GraphTargetItem value; - public SetLocalTreeItem(AVM2Instruction instruction, int regIndex, GraphTargetItem value) { + public SetLocalAVM2Item(AVM2Instruction instruction, int regIndex, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.regIndex = regIndex; this.value = value; @@ -41,7 +41,7 @@ public class SetLocalTreeItem extends TreeItem implements SetTypeTreeItem, Assig @Override public GraphTargetItem getObject() { - return new LocalRegTreeItem(instruction, regIndex, null); + return new LocalRegAVM2Item(instruction, regIndex, null); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java index ac3fbaf3b..efc8a7dae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem, AssignmentTreeItem { +public class SetPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, AssignmentAVM2Item { public GraphTargetItem object; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; public GraphTargetItem value; @Override @@ -35,7 +35,7 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem, As return value.getFirstPart(); } - public SetPropertyTreeItem(AVM2Instruction instruction, GraphTargetItem object, FullMultinameTreeItem propertyName, GraphTargetItem value) { + public SetPropertyAVM2Item(AVM2Instruction instruction, GraphTargetItem object, FullMultinameAVM2Item propertyName, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.object = object; this.propertyName = propertyName; @@ -49,7 +49,7 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem, As @Override public GraphTargetItem getObject() { - return new GetPropertyTreeItem(instruction, object, propertyName); + return new GetPropertyAVM2Item(instruction, object, propertyName); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java similarity index 74% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java index f9ceab1ed..8c0e65ffb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; import com.jpexs.decompiler.flash.abc.types.Multiname; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class SetSlotTreeItem extends TreeItem implements SetTypeTreeItem, AssignmentTreeItem { +public class SetSlotAVM2Item extends AVM2Item implements SetTypeAVM2Item, AssignmentAVM2Item { public Multiname slotName; //public GraphTargetItem value; public GraphTargetItem scope; - public SetSlotTreeItem(AVM2Instruction instruction, GraphTargetItem scope, Multiname slotName, GraphTargetItem value) { + public SetSlotAVM2Item(AVM2Instruction instruction, GraphTargetItem scope, Multiname slotName, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.slotName = slotName; this.value = value; @@ -53,12 +53,12 @@ public class SetSlotTreeItem extends TreeItem implements SetTypeTreeItem, Assign String ret = ""; /*ret = scope.toString(constants, localRegNames) + "."; - if (!(scope instanceof NewActivationTreeItem)) { + if (!(scope instanceof NewActivationAVM2Item)) { ret = scope.toString(constants, localRegNames) + "."; } - if (scope instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) scope).computedValue != null) { - if (((LocalRegTreeItem) scope).computedValue instanceof NewActivationTreeItem) { + if (scope instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) scope).computedValue != null) { + if (((LocalRegAVM2Item) scope).computedValue instanceof NewActivationAVM2Item) { ret = ""; } } @@ -71,7 +71,7 @@ public class SetSlotTreeItem extends TreeItem implements SetTypeTreeItem, Assign @Override public GraphTargetItem getObject() { - return new GetSlotTreeItem(instruction, scope, slotName); + return new GetSlotAVM2Item(instruction, scope, slotName); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSuperTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java index f65fd0533..fdb0a9119 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java @@ -14,28 +14,28 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; -public class SetSuperTreeItem extends TreeItem { +public class SetSuperAVM2Item extends AVM2Item { //public GraphTargetItem value; public GraphTargetItem object; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; @Override public GraphPart getFirstPart() { return value.getFirstPart(); } - public SetSuperTreeItem(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem object, FullMultinameTreeItem propertyName) { + public SetSuperAVM2Item(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem object, FullMultinameAVM2Item propertyName) { super(instruction, PRECEDENCE_ASSIGMENT); this.value = value; this.object = object; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetTypeAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetTypeAVM2Item.java index 9bbc7d010..46e71198d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetTypeAVM2Item.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; /** * * @author JPEXS */ -public interface SetTypeTreeItem { +public interface SetTypeAVM2Item { public GraphTargetItem getObject(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/StringTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/StringTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java index 940f9f8ad..04aab5ccb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/StringTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; @@ -22,11 +22,11 @@ import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; -public class StringTreeItem extends TreeItem { +public class StringAVM2Item extends AVM2Item { public String value; - public StringTreeItem(AVM2Instruction instruction, String value) { + public StringAVM2Item(AVM2Instruction instruction, String value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThisTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThisTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java index f3d4ce9a2..f337d634d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThisTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; -public class ThisTreeItem extends TreeItem { +public class ThisAVM2Item extends AVM2Item { public Multiname className; - public ThisTreeItem(Multiname className) { + public ThisAVM2Item(Multiname className) { super(null, PRECEDENCE_PRIMARY); this.className = className; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThrowTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java index 891b1c724..82723da56 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class ThrowTreeItem extends TreeItem { +public class ThrowAVM2Item extends AVM2Item { //public GraphTargetItem value; - public ThrowTreeItem(AVM2Instruction instruction, GraphTargetItem value) { + public ThrowAVM2Item(AVM2Instruction instruction, GraphTargetItem value) { super(instruction, NOPRECEDENCE); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UndefinedTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UndefinedTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java index a0d07c622..e3671e8d3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UndefinedTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.ecma.Undefined; import java.util.HashMap; import java.util.List; -public class UndefinedTreeItem extends TreeItem { +public class UndefinedAVM2Item extends AVM2Item { - public UndefinedTreeItem(AVM2Instruction instruction) { + public UndefinedAVM2Item(AVM2Instruction instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UnparsedTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UnparsedTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java index 9fdf71928..99882d437 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UnparsedTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; -public class UnparsedTreeItem extends TreeItem { +public class UnparsedAVM2Item extends AVM2Item { public String value; - public UnparsedTreeItem(AVM2Instruction instruction, String value) { + public UnparsedAVM2Item(AVM2Instruction instruction, String value) { super(instruction, NOPRECEDENCE); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java index a4492b1ce..a308351a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -public class WithTreeItem extends TreeItem { +public class WithAVM2Item extends AVM2Item { public GraphTargetItem scope; public List items; - public WithTreeItem(AVM2Instruction instruction, GraphTargetItem scope, List items) { + public WithAVM2Item(AVM2Instruction instruction, GraphTargetItem scope, List items) { super(instruction, NOPRECEDENCE); this.scope = scope; this.items = items; } - public WithTreeItem(AVM2Instruction instruction, GraphTargetItem scope) { + public WithAVM2Item(AVM2Instruction instruction, GraphTargetItem scope) { super(instruction, NOPRECEDENCE); this.scope = scope; this.items = new ArrayList<>(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java index 8f93a30a2..e31c27e16 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class WithEndTreeItem extends TreeItem { +public class WithEndAVM2Item extends AVM2Item { public GraphTargetItem scope; - public WithEndTreeItem(AVM2Instruction instruction, GraphTargetItem scope) { + public WithEndAVM2Item(AVM2Instruction instruction, GraphTargetItem scope) { super(instruction, PRECEDENCE_PRIMARY); this.scope = scope; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java index 634e882c2..1cb10ca11 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class WithObjectTreeItem extends TreeItem { +public class WithObjectAVM2Item extends AVM2Item { public GraphTargetItem scope; - public WithObjectTreeItem(AVM2Instruction instruction, GraphTargetItem scope) { + public WithObjectAVM2Item(AVM2Instruction instruction, GraphTargetItem scope) { super(instruction, PRECEDENCE_PRIMARY); this.scope = scope; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/XMLTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/XMLTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java index bd5a505c3..5ce709e5e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/XMLTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; @@ -26,11 +26,11 @@ import java.util.List; * * @author JPEXS */ -public class XMLTreeItem extends TreeItem { +public class XMLAVM2Item extends AVM2Item { public List parts; - public XMLTreeItem(AVM2Instruction instruction, List parts) { + public XMLAVM2Item(AVM2Instruction instruction, List parts) { super(instruction, NOPRECEDENCE); this.parts = parts; } @@ -39,8 +39,8 @@ public class XMLTreeItem extends TreeItem { public String toString(ConstantPool constants, HashMap localRegNames, List fullyQualifiedNames) { String ret = ""; for (GraphTargetItem part : parts) { - if (part instanceof StringTreeItem) { - ret += ((StringTreeItem) part).value; + if (part instanceof StringAVM2Item) { + ret += ((StringAVM2Item) part).value; } else { ret += part.toString(constants, localRegNames, fullyQualifiedNames); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/AssignmentTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/AssignmentAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/AssignmentTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/AssignmentAVM2Item.java index 876ef5644..5dbdb831f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/AssignmentTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/AssignmentAVM2Item.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.model.clauses; /** * * @author JPEXS */ -public interface AssignmentTreeItem { +public interface AssignmentAVM2Item { } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DeclarationTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java similarity index 60% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DeclarationTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java index 207dd4957..9fcbb3e06 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DeclarationTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.model.clauses; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetSlotTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.CoerceAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetLocalAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetSlotAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; @@ -31,36 +31,36 @@ import java.util.List; * * @author JPEXS */ -public class DeclarationTreeItem extends TreeItem { +public class DeclarationAVM2Item extends AVM2Item { public GraphTargetItem assignment; public String type; - public DeclarationTreeItem(GraphTargetItem assignment, String type) { + public DeclarationAVM2Item(GraphTargetItem assignment, String type) { super(assignment.src, assignment.precedence); this.type = type; this.assignment = assignment; } - public DeclarationTreeItem(GraphTargetItem assignment) { + public DeclarationAVM2Item(GraphTargetItem assignment) { this(assignment, null); } @Override public String toString(ConstantPool constants, HashMap localRegNames, List fullyQualifiedNames) { - if (assignment instanceof SetLocalTreeItem) { - SetLocalTreeItem lti = (SetLocalTreeItem) assignment; + if (assignment instanceof SetLocalAVM2Item) { + SetLocalAVM2Item lti = (SetLocalAVM2Item) assignment; String type = "*"; - if (lti.value instanceof CoerceTreeItem) { - type = ((CoerceTreeItem) lti.value).type; + if (lti.value instanceof CoerceAVM2Item) { + type = ((CoerceAVM2Item) lti.value).type; } - if (lti.value instanceof ConvertTreeItem) { - type = ((ConvertTreeItem) lti.value).type; + if (lti.value instanceof ConvertAVM2Item) { + type = ((ConvertAVM2Item) lti.value).type; } return "var " + hilight(localRegName(localRegNames, lti.regIndex) + ":" + type + " = ") + lti.value.toString(constants, localRegNames, fullyQualifiedNames); } - if (assignment instanceof SetSlotTreeItem) { - SetSlotTreeItem ssti = (SetSlotTreeItem) assignment; + if (assignment instanceof SetSlotAVM2Item) { + SetSlotAVM2Item ssti = (SetSlotAVM2Item) assignment; return "var " + ssti.getName(constants, localRegNames, fullyQualifiedNames) + ":" + type + hilight(" = ") + ssti.value.toString(constants, localRegNames, fullyQualifiedNames); } return "var " + assignment.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ExceptionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ExceptionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java index c8556cacd..288ffae70 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ExceptionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.model.clauses; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.types.ABCException; import java.util.HashMap; import java.util.List; -public class ExceptionTreeItem extends TreeItem { +public class ExceptionAVM2Item extends AVM2Item { public ABCException exception; - public ExceptionTreeItem(ABCException exception) { + public ExceptionAVM2Item(ABCException exception) { super(null, NOPRECEDENCE); this.exception = exception; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/FilterTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/FilterTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java index 45138303a..d6269edde 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/FilterTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.model.clauses; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; @@ -27,12 +27,12 @@ import java.util.List; * * @author JPEXS */ -public class FilterTreeItem extends TreeItem { +public class FilterAVM2Item extends AVM2Item { public GraphTargetItem expression; public GraphTargetItem collection; - public FilterTreeItem(AVM2Instruction instruction, GraphTargetItem collection, GraphTargetItem expression) { + public FilterAVM2Item(AVM2Instruction instruction, GraphTargetItem collection, GraphTargetItem expression) { super(instruction, NOPRECEDENCE); this.expression = expression; this.collection = collection; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java similarity index 66% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java index cdb9d4dff..7fe9aa6a4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java @@ -14,21 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.model.clauses; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.*; -import com.jpexs.decompiler.flash.graph.Block; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.Loop; -import com.jpexs.decompiler.flash.graph.LoopItem; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.InAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetTypeAVM2Item; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.LoopItem; import java.util.ArrayList; import java.util.List; -public class ForEachInTreeItem extends LoopItem implements Block { +public class ForEachInAVM2Item extends LoopItem implements Block { - public InTreeItem expression; + public InAVM2Item expression; public List commands; @Override @@ -38,16 +40,16 @@ public class ForEachInTreeItem extends LoopItem implements Block { return ret; } - public ForEachInTreeItem(GraphSourceItem instruction, Loop loop, InTreeItem expression, List commands) { + public ForEachInAVM2Item(GraphSourceItem instruction, Loop loop, InAVM2Item expression, List commands) { super(instruction, loop); if (!commands.isEmpty()) { GraphTargetItem firstAssign = commands.get(0); - if (firstAssign instanceof SetTypeTreeItem) { - if (expression.object instanceof LocalRegTreeItem) { - if (((SetTypeTreeItem) firstAssign).getValue().getNotCoerced() instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) ((SetTypeTreeItem) firstAssign).getValue().getNotCoerced()).regIndex == ((LocalRegTreeItem) expression.object).regIndex) { + if (firstAssign instanceof SetTypeAVM2Item) { + if (expression.object instanceof LocalRegAVM2Item) { + if (((SetTypeAVM2Item) firstAssign).getValue().getNotCoerced() instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) ((SetTypeAVM2Item) firstAssign).getValue().getNotCoerced()).regIndex == ((LocalRegAVM2Item) expression.object).regIndex) { commands.remove(0); - expression.object = ((SetTypeTreeItem) firstAssign).getObject(); + expression.object = ((SetTypeAVM2Item) firstAssign).getObject(); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java similarity index 66% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java index de8899d45..bf1b66a8f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java @@ -14,21 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.model.clauses; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.*; -import com.jpexs.decompiler.flash.graph.Block; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.Loop; -import com.jpexs.decompiler.flash.graph.LoopItem; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.InAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetTypeAVM2Item; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.LoopItem; import java.util.ArrayList; import java.util.List; -public class ForInTreeItem extends LoopItem implements Block { +public class ForInAVM2Item extends LoopItem implements Block { - public InTreeItem expression; + public InAVM2Item expression; public List commands; @Override @@ -38,16 +40,16 @@ public class ForInTreeItem extends LoopItem implements Block { return ret; } - public ForInTreeItem(GraphSourceItem instruction, Loop loop, InTreeItem expression, List commands) { + public ForInAVM2Item(GraphSourceItem instruction, Loop loop, InAVM2Item expression, List commands) { super(instruction, loop); if (!commands.isEmpty()) { GraphTargetItem firstAssign = commands.get(0); - if (firstAssign instanceof SetTypeTreeItem) { - if (expression.object instanceof LocalRegTreeItem) { - if (((SetTypeTreeItem) firstAssign).getValue().getNotCoerced() instanceof LocalRegTreeItem) { - if (((LocalRegTreeItem) ((SetTypeTreeItem) firstAssign).getValue().getNotCoerced()).regIndex == ((LocalRegTreeItem) expression.object).regIndex) { + if (firstAssign instanceof SetTypeAVM2Item) { + if (expression.object instanceof LocalRegAVM2Item) { + if (((SetTypeAVM2Item) firstAssign).getValue().getNotCoerced() instanceof LocalRegAVM2Item) { + if (((LocalRegAVM2Item) ((SetTypeAVM2Item) firstAssign).getValue().getNotCoerced()).regIndex == ((LocalRegAVM2Item) expression.object).regIndex) { commands.remove(0); - expression.object = ((SetTypeTreeItem) firstAssign).getObject(); + expression.object = ((SetTypeAVM2Item) firstAssign).getObject(); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java similarity index 89% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java index 92cc5028b..c51d53e0a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.model.clauses; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.types.ABCException; -import com.jpexs.decompiler.flash.graph.Block; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -public class TryTreeItem extends TreeItem implements Block { +public class TryAVM2Item extends AVM2Item implements Block { public List tryCommands; public List catchExceptions; @@ -43,7 +43,7 @@ public class TryTreeItem extends TreeItem implements Block { return ret; } - public TryTreeItem(List tryCommands, List catchExceptions, List> catchCommands, List finallyCommands) { + public TryAVM2Item(List tryCommands, List catchExceptions, List> catchCommands, List finallyCommands) { super(null, NOPRECEDENCE); this.tryCommands = tryCommands; this.catchExceptions = catchExceptions; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java index c3d1bcc03..1b32f3501 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.ecma.EcmaType; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; -public class AddTreeItem extends BinaryOpItem { +public class AddAVM2Item extends BinaryOpItem { - public AddTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public AddAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_ADDITIVE, leftSide, rightSide, "+"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AndAVM2Item.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AndAVM2Item.java index 1fcf18620..07027bfb9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AndAVM2Item.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class AndTreeItem extends BinaryOpItem { +public class AndAVM2Item extends BinaryOpItem { public GraphPart firstPart; - public AndTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public AndAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_LOGICALAND, leftSide, rightSide, "&&"); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AsTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AsTypeAVM2Item.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AsTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AsTypeAVM2Item.java index a96638823..9624304f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AsTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AsTypeAVM2Item.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class AsTypeTreeItem extends BinaryOpItem { +public class AsTypeAVM2Item extends BinaryOpItem { - public AsTypeTreeItem(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem type) { + public AsTypeAVM2Item(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem type) { super(instruction, PRECEDENCE_RELATIONAL, value, type, " as "); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitAndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitAndAVM2Item.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitAndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitAndAVM2Item.java index 3c4075f87..1873bc899 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitAndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitAndAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class BitAndTreeItem extends BinaryOpItem { +public class BitAndAVM2Item extends BinaryOpItem { - public BitAndTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public BitAndAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISEAND, leftSide, rightSide, "&"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitNotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitNotAVM2Item.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitNotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitNotAVM2Item.java index 19a6df334..798c1459d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitNotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitNotAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.UnaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.UnaryOpItem; -public class BitNotTreeItem extends UnaryOpItem { +public class BitNotAVM2Item extends UnaryOpItem { - public BitNotTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public BitNotAVM2Item(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_UNARY, value, "~"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitOrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitOrAVM2Item.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitOrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitOrAVM2Item.java index 61b94c3c6..674228182 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitOrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitOrAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class BitOrTreeItem extends BinaryOpItem { +public class BitOrAVM2Item extends BinaryOpItem { - public BitOrTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public BitOrAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISEOR, leftSide, rightSide, "|"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitXorTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitXorAVM2Item.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitXorTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitXorAVM2Item.java index f8b66473a..d887f2178 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitXorTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitXorAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class BitXorTreeItem extends BinaryOpItem { +public class BitXorAVM2Item extends BinaryOpItem { - public BitXorTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public BitXorAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISEXOR, leftSide, rightSide, "^"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java index d07c7c8c2..7b4795706 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; -public class DeletePropertyTreeItem extends TreeItem { +public class DeletePropertyAVM2Item extends AVM2Item { public GraphTargetItem object; - public FullMultinameTreeItem propertyName; + public FullMultinameAVM2Item propertyName; - public DeletePropertyTreeItem(AVM2Instruction instruction, GraphTargetItem object, FullMultinameTreeItem propertyName) { + public DeletePropertyAVM2Item(AVM2Instruction instruction, GraphTargetItem object, FullMultinameAVM2Item propertyName) { super(instruction, PRECEDENCE_UNARY); this.object = object; this.propertyName = propertyName; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DivideTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DivideTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java index ec2afa066..52871c0f8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DivideTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class DivideTreeItem extends BinaryOpItem { +public class DivideAVM2Item extends BinaryOpItem { - public DivideTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public DivideAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_MULTIPLICATIVE, leftSide, rightSide, "/"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/EqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/EqAVM2Item.java similarity index 67% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/EqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/EqAVM2Item.java index 3d3a48300..b80de4f45 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/EqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/EqAVM2Item.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class EqTreeItem extends BinaryOpItem implements LogicalOpItem { +public class EqAVM2Item extends BinaryOpItem implements LogicalOpItem { - public EqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public EqAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "=="); } @@ -35,6 +35,6 @@ public class EqTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new NeqTreeItem(src, leftSide, rightSide); + return new NeqAVM2Item(src, leftSide, rightSide); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GeAVM2Item.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GeAVM2Item.java index 40fabae8e..6eb7f1e5e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GeAVM2Item.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class GeTreeItem extends BinaryOpItem implements LogicalOpItem { +public class GeAVM2Item extends BinaryOpItem implements LogicalOpItem { - public GeTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public GeAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, ">="); } @Override public GraphTargetItem invert() { - return new LtTreeItem(src, leftSide, rightSide); + return new LtAVM2Item(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GtAVM2Item.java similarity index 67% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GtAVM2Item.java index dd1dc9eaa..18a74c900 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GtAVM2Item.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class GtTreeItem extends BinaryOpItem implements LogicalOpItem { +public class GtAVM2Item extends BinaryOpItem implements LogicalOpItem { - public GtTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public GtAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, ">"); } @Override public GraphTargetItem invert() { - return new LeTreeItem(src, leftSide, rightSide); + return new LeAVM2Item(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InAVM2Item.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InAVM2Item.java index 78c3e99f6..70a7c6f5e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InAVM2Item.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class InTreeItem extends BinaryOpItem { +public class InAVM2Item extends BinaryOpItem { - public InTreeItem(AVM2Instruction instruction, GraphTargetItem name, GraphTargetItem object) { + public InAVM2Item(AVM2Instruction instruction, GraphTargetItem name, GraphTargetItem object) { super(instruction, PRECEDENCE_RELATIONAL, name, object, " in "); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InstanceOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InstanceOfAVM2Item.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InstanceOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InstanceOfAVM2Item.java index 117d60a75..c43260141 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InstanceOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InstanceOfAVM2Item.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class InstanceOfTreeItem extends BinaryOpItem { +public class InstanceOfAVM2Item extends BinaryOpItem { - public InstanceOfTreeItem(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem type) { + public InstanceOfAVM2Item(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem type) { super(instruction, PRECEDENCE_RELATIONAL, value, type, " instanceof "); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/IsTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/IsTypeAVM2Item.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/IsTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/IsTypeAVM2Item.java index 0db298af6..d80f13d0b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/IsTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/IsTypeAVM2Item.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class IsTypeTreeItem extends BinaryOpItem { +public class IsTypeAVM2Item extends BinaryOpItem { - public IsTypeTreeItem(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem type) { + public IsTypeAVM2Item(AVM2Instruction instruction, GraphTargetItem value, GraphTargetItem type) { super(instruction, PRECEDENCE_RELATIONAL, value, type, " is "); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java index d22ad5f61..4c584e329 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class LShiftTreeItem extends BinaryOpItem { +public class LShiftAVM2Item extends BinaryOpItem { - public LShiftTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public LShiftAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISESHIFT, leftSide, rightSide, "<<"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java index 2ef5aa7a2..cee123f85 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class LeTreeItem extends BinaryOpItem implements LogicalOpItem { +public class LeAVM2Item extends BinaryOpItem implements LogicalOpItem { - public LeTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public LeAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, "<="); } @Override public GraphTargetItem invert() { - return new GtTreeItem(src, leftSide, rightSide); + return new GtAVM2Item(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LtAVM2Item.java similarity index 67% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LtAVM2Item.java index 266396b9f..3c692bab5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LtAVM2Item.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class LtTreeItem extends BinaryOpItem implements LogicalOpItem { +public class LtAVM2Item extends BinaryOpItem implements LogicalOpItem { - public LtTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public LtAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, "<"); } @Override public GraphTargetItem invert() { - return new GeTreeItem(src, leftSide, rightSide); + return new GeAVM2Item(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/ModuloTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/ModuloTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java index bcede3f9c..234929198 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/ModuloTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class ModuloTreeItem extends BinaryOpItem { +public class ModuloAVM2Item extends BinaryOpItem { - public ModuloTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public ModuloAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_MULTIPLICATIVE, leftSide, rightSide, "%"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/MultiplyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/MultiplyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java index c086b2b46..eaa52c79f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/MultiplyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class MultiplyTreeItem extends BinaryOpItem { +public class MultiplyAVM2Item extends BinaryOpItem { - public MultiplyTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public MultiplyAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_MULTIPLICATIVE, leftSide, rightSide, "*"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NegTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NegAVM2Item.java similarity index 76% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NegTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NegAVM2Item.java index 73832434a..ce89d5da5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NegTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NegAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.UnaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.UnaryOpItem; -public class NegTreeItem extends UnaryOpItem { +public class NegAVM2Item extends UnaryOpItem { - public NegTreeItem(AVM2Instruction instruction, GraphTargetItem value) { + public NegAVM2Item(AVM2Instruction instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_UNARY, value, "-"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NeqAVM2Item.java similarity index 67% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NeqAVM2Item.java index a13f6908b..8e4cd65d9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NeqAVM2Item.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class NeqTreeItem extends BinaryOpItem implements LogicalOpItem { +public class NeqAVM2Item extends BinaryOpItem implements LogicalOpItem { - public NeqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public NeqAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "!="); } @@ -35,6 +35,6 @@ public class NeqTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new EqTreeItem(src, leftSide, rightSide); + return new EqAVM2Item(src, leftSide, rightSide); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/OrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/OrAVM2Item.java similarity index 75% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/OrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/OrAVM2Item.java index 358d0769f..ba3cc06f5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/OrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/OrAVM2Item.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class OrTreeItem extends BinaryOpItem { +public class OrAVM2Item extends BinaryOpItem { public GraphPart firstPart; - public OrTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public OrAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_LOGICALOR, leftSide, rightSide, "||"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreDecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/PreDecrementAVM2Item.java similarity index 68% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreDecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/PreDecrementAVM2Item.java index 26afedb32..6d5ef5796 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreDecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/PreDecrementAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.UnaryOpItem; +import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.UnaryOpItem; -public class PreDecrementTreeItem extends UnaryOpItem implements AssignmentTreeItem { +public class PreDecrementAVM2Item extends UnaryOpItem implements AssignmentAVM2Item { - public PreDecrementTreeItem(AVM2Instruction instruction, GraphTargetItem object) { + public PreDecrementAVM2Item(AVM2Instruction instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_UNARY, object, "--"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreIncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/PreIncrementAVM2Item.java similarity index 74% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreIncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/PreIncrementAVM2Item.java index a362e2735..617ead2ab 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreIncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/PreIncrementAVM2Item.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.UnaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.UnaryOpItem; -public class PreIncrementTreeItem extends UnaryOpItem { +public class PreIncrementAVM2Item extends UnaryOpItem { - public PreIncrementTreeItem(AVM2Instruction instruction, GraphTargetItem object) { + public PreIncrementAVM2Item(AVM2Instruction instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_UNARY, object, "++"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/RShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/RShiftAVM2Item.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/RShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/RShiftAVM2Item.java index 1ec48b618..2afe946a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/RShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/RShiftAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class RShiftTreeItem extends BinaryOpItem { +public class RShiftAVM2Item extends BinaryOpItem { - public RShiftTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public RShiftAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISESHIFT, leftSide, rightSide, ">>"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictEqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictEqAVM2Item.java similarity index 69% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictEqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictEqAVM2Item.java index 91479371e..4ac5b7f01 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictEqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictEqAVM2Item.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class StrictEqTreeItem extends BinaryOpItem implements LogicalOpItem { +public class StrictEqAVM2Item extends BinaryOpItem implements LogicalOpItem { - public StrictEqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public StrictEqAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "==="); } @@ -38,6 +38,6 @@ public class StrictEqTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new StrictNeqTreeItem(src, leftSide, rightSide); + return new StrictNeqAVM2Item(src, leftSide, rightSide); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictNeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictNeqAVM2Item.java similarity index 69% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictNeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictNeqAVM2Item.java index eee9549f9..a273e56e8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictNeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictNeqAVM2Item.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; -public class StrictNeqTreeItem extends BinaryOpItem implements LogicalOpItem { +public class StrictNeqAVM2Item extends BinaryOpItem implements LogicalOpItem { - public StrictNeqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public StrictNeqAVM2Item(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "!=="); } @Override public GraphTargetItem invert() { - return new StrictEqTreeItem(src, leftSide, rightSide); + return new StrictEqAVM2Item(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/SubtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/SubtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java index c67fd8e3b..526e0b90b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/SubtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; -public class SubtractTreeItem extends BinaryOpItem { +public class SubtractAVM2Item extends BinaryOpItem { - public SubtractTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public SubtractAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_ADDITIVE, leftSide, rightSide, "-"); } @@ -35,7 +35,7 @@ public class SubtractTreeItem extends BinaryOpItem { @Override public String toString(List localData) { - if (!(getLeftMostItem(rightSide) instanceof NegTreeItem)) { // a - (-b*c*d) + if (!(getLeftMostItem(rightSide) instanceof NegAVM2Item)) { // a - (-b*c*d) return super.toString(localData); } String ret = ""; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/TypeOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/TypeOfAVM2Item.java similarity index 85% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/TypeOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/TypeOfAVM2Item.java index b7aefc1b8..07687c50b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/TypeOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/TypeOfAVM2Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; @@ -25,12 +25,12 @@ import static com.jpexs.decompiler.flash.ecma.EcmaType.NUMBER; import static com.jpexs.decompiler.flash.ecma.EcmaType.OBJECT; import static com.jpexs.decompiler.flash.ecma.EcmaType.STRING; import static com.jpexs.decompiler.flash.ecma.EcmaType.UNDEFINED; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.UnaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.UnaryOpItem; -public class TypeOfTreeItem extends UnaryOpItem { +public class TypeOfAVM2Item extends UnaryOpItem { - public TypeOfTreeItem(AVM2Instruction instruction, GraphTargetItem value) { + public TypeOfAVM2Item(AVM2Instruction instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_UNARY, value, "typeof "); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/URShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/URShiftAVM2Item.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/URShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/URShiftAVM2Item.java index a6f0bef62..faee17ec1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/URShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/URShiftAVM2Item.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphTargetItem; -public class URShiftTreeItem extends BinaryOpItem { +public class URShiftAVM2Item extends BinaryOpItem { - public URShiftTreeItem(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public URShiftAVM2Item(AVM2Instruction instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISESHIFT, leftSide, rightSide, ">>>"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java index 27b0f5c9a..1c844af34 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java @@ -22,8 +22,8 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.CodeStats; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.traits.Traits; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.Serializable; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java index 23eb444c4..bf611fd51 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java @@ -31,7 +31,7 @@ import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.NamespaceSet; import com.jpexs.decompiler.flash.abc.types.ScriptInfo; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.ABCContainerTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java index 54060b5c3..bf5ef4432 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.abc.types.traits; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.MethodBody; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.tags.ABCContainerTag; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java index f729c414c..a83a4109d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.abc.types.traits; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.MethodBody; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.tags.ABCContainerTag; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java index f2879d13a..243072d2e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.ValueKind; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.ABCContainerTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java index 5fc05b2c3..f77814aae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -16,6 +16,24 @@ */ package com.jpexs.decompiler.flash.action; +import com.jpexs.decompiler.flash.action.model.clauses.InterfaceActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.SetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.NewMethodActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; +import com.jpexs.decompiler.flash.action.model.ExtendsActionItem; +import com.jpexs.decompiler.flash.action.model.NewObjectActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.ImplementsOpActionItem; +import com.jpexs.decompiler.flash.action.model.SetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.SetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.UnsupportedActionItem; import com.jpexs.decompiler.flash.Configuration; import com.jpexs.decompiler.flash.DisassemblyListener; import com.jpexs.decompiler.flash.SWF; @@ -29,18 +47,16 @@ import com.jpexs.decompiler.flash.action.special.ActionEnd; import com.jpexs.decompiler.flash.action.swf4.*; import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; -import com.jpexs.decompiler.flash.action.treemodel.*; -import com.jpexs.decompiler.flash.action.treemodel.clauses.*; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.flash.graph.CommentItem; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.IfItem; -import com.jpexs.decompiler.flash.graph.NotItem; -import com.jpexs.decompiler.flash.graph.ScriptEndItem; +import com.jpexs.decompiler.graph.model.CommentItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.ScriptEndItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.helpers.collections.MyEntry; @@ -590,7 +606,7 @@ public class Action implements GraphSourceItem { * @param staticOperation the value of staticOperation * @param path the value of path */ - public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { + public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { } /** @@ -601,9 +617,9 @@ public class Action implements GraphSourceItem { */ protected long popLong(Stack stack) { GraphTargetItem item = stack.pop(); - if (item instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) item).value instanceof Long) { - return (long) (Long) ((DirectValueTreeItem) item).value; + if (item instanceof DirectValueActionItem) { + if (((DirectValueActionItem) item).value instanceof Long) { + return (long) (Long) ((DirectValueActionItem) item).value; } } return 0; @@ -673,7 +689,7 @@ public class Action implements GraphSourceItem { */ public static String actionsToSource(List actions, int version, String path) { try { - //List tree = actionsToTree(new HashMap(), actions, version); + //List tree = actionsToTree(new HashMap(), actions, version); int staticOperation = (Boolean) Configuration.getConfig("autoDeobfuscate", true) ? Graph.SOP_SKIP_STATIC : Graph.SOP_USE_STATIC; List tree = actionsToTree(new HashMap(), new HashMap(), new HashMap(), actions, version, staticOperation, path); @@ -702,7 +718,7 @@ public class Action implements GraphSourceItem { * @return List of treeItems */ public static List actionsToTree(HashMap regNames, HashMap variables, HashMap functions, List actions, int version, int staticOperation, String path) { - //Stack stack = new Stack(); + //Stack stack = new Stack(); return ActionGraph.translateViaGraph(regNames, variables, functions, actions, version, staticOperation, path); //return actionsToTree(regNames, stack, actions, 0, actions.size() - 1, version); } @@ -792,23 +808,23 @@ public class Action implements GraphSourceItem { unknownJumps.remove(new Long(addr)); boolean switchFound = false; for (int i = output.size() - 1; i >= 0; i--) { - if (output.get(i) instanceof SwitchTreeItem) { - if (((SwitchTreeItem) output.get(i)).defaultCommands == null) { - List continues = ((SwitchTreeItem) output.get(i)).getContinues(); + if (output.get(i) instanceof SwitchActionItem) { + if (((SwitchActionItem) output.get(i)).defaultCommands == null) { + List continues = ((SwitchActionItem) output.get(i)).getContinues(); boolean breakFound = false; - for (ContinueTreeItem cti : continues) { + for (ContinueActionItem cti : continues) { if (cti.loopPos == addr) { cti.isKnown = true; cti.isBreak = true; - ((SwitchTreeItem) output.get(i)).loopBreak = addr; + ((SwitchActionItem) output.get(i)).loopBreak = addr; breakFound = true; } } if (breakFound) { switchFound = true; - ((SwitchTreeItem) output.get(i)).defaultCommands = new ArrayList(); + ((SwitchActionItem) output.get(i)).defaultCommands = new ArrayList(); for (int k = i + 1; k < output.size(); k++) { - ((SwitchTreeItem) output.get(i)).defaultCommands.add(output.remove(i + 1)); + ((SwitchActionItem) output.get(i)).defaultCommands.add(output.remove(i + 1)); } } } @@ -884,28 +900,28 @@ public class Action implements GraphSourceItem { isForIn = true; ip += 4; action.translate(localData, stack, output); - EnumerateTreeItem en = (EnumerateTreeItem) stack.peek(); + EnumerateActionItem en = (EnumerateActionItem) stack.peek(); inItem = en.object; continue; } else*/ /*if (action instanceof ActionTry) { ActionTry atry = (ActionTry) action; List tryCommands = ActionGraph.translateViaGraph(registerNames, variables, functions, atry.tryBody, version); - TreeItem catchName; + ActionItem catchName; if (atry.catchInRegisterFlag) { - catchName = new DirectValueTreeItem(atry, -1, new RegisterNumber(atry.catchRegister), new ArrayList()); + catchName = new DirectValueActionItem(atry, -1, new RegisterNumber(atry.catchRegister), new ArrayList()); } else { - catchName = new DirectValueTreeItem(atry, -1, atry.catchName, new ArrayList()); + catchName = new DirectValueActionItem(atry, -1, atry.catchName, new ArrayList()); } List catchExceptions = new ArrayList(); catchExceptions.add(catchName); List> catchCommands = new ArrayList>(); catchCommands.add(ActionGraph.translateViaGraph(registerNames, variables, functions, atry.catchBody, version)); List finallyCommands = ActionGraph.translateViaGraph(registerNames, variables, functions, atry.finallyBody, version); - output.add(new TryTreeItem(tryCommands, catchExceptions, catchCommands, finallyCommands)); + output.add(new TryActionItem(tryCommands, catchExceptions, catchCommands, finallyCommands)); } else if (action instanceof ActionWith) { ActionWith awith = (ActionWith) action; List withCommands = ActionGraph.translateViaGraph(registerNames, variables, functions,new ArrayList() , version); //TODO:parse with actions - output.add(new WithTreeItem(action, stack.pop(), withCommands)); + output.add(new WithActionItem(action, stack.pop(), withCommands)); } else */ if (false) { } /*if (action instanceof ActionStoreRegister) { if ((ip + 1 <= end) && (actions.get(ip + 1) instanceof ActionPop)) { @@ -921,12 +937,12 @@ public class Action implements GraphSourceItem { } } */ /*else if (action instanceof ActionStrictEquals) { if ((ip + 1 < actions.size()) && (actions.get(ip + 1) instanceof ActionIf)) { - List caseValues = new ArrayList(); - List> caseCommands = new ArrayList>(); + List caseValues = new ArrayList(); + List> caseCommands = new ArrayList>(); caseValues.add(stack.pop()); - TreeItem switchedObject = stack.pop(); + ActionItem switchedObject = stack.pop(); if (output.size() > 0) { - if (output.get(output.size() - 1) instanceof StoreRegisterTreeItem) { + if (output.get(output.size() - 1) instanceof StoreRegisterActionItem) { output.remove(output.size() - 1); } } @@ -956,7 +972,7 @@ public class Action implements GraphSourceItem { } caseCommands.add(actionsToTree(registerNames, unknownJumps, loopList, jumpsOrIfs, stack, constants, actions, caseBodyIps.get(i), caseEnd, version)); } - output.add(new SwitchTreeItem(action, defaultAddr, switchedObject, caseValues, caseCommands, null)); + output.add(new SwitchActionItem(action, defaultAddr, switchedObject, caseValues, caseCommands, null)); continue; } else { action.translate(stack, constants, output, registerNames); @@ -966,7 +982,7 @@ public class Action implements GraphSourceItem { action.translate(localData, stack, output, staticOperation, path); } catch (EmptyStackException ese) { Logger.getLogger(Action.class.getName()).log(Level.SEVERE, null, ese); - output.add(new UnsupportedTreeItem(action, "Empty stack")); + output.add(new UnsupportedActionItem(action, "Empty stack")); } } @@ -980,20 +996,20 @@ public class Action implements GraphSourceItem { public static GraphTargetItem getWithoutGlobal(GraphTargetItem ti) { GraphTargetItem t = ti; - if (!(t instanceof GetMemberTreeItem)) { + if (!(t instanceof GetMemberActionItem)) { return ti; } - GetMemberTreeItem lastMember = null; - while (((GetMemberTreeItem) t).object instanceof GetMemberTreeItem) { - lastMember = (GetMemberTreeItem) t; - t = ((GetMemberTreeItem) t).object; + GetMemberActionItem lastMember = null; + while (((GetMemberActionItem) t).object instanceof GetMemberActionItem) { + lastMember = (GetMemberActionItem) t; + t = ((GetMemberActionItem) t).object; } - if (((GetMemberTreeItem) t).object instanceof GetVariableTreeItem) { - GetVariableTreeItem v = (GetVariableTreeItem) ((GetMemberTreeItem) t).object; - if (v.name instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) v.name).value instanceof String) { - if (((DirectValueTreeItem) v.name).value.equals("_global")) { - GetVariableTreeItem gvt = new GetVariableTreeItem(null, ((GetMemberTreeItem) t).memberName); + if (((GetMemberActionItem) t).object instanceof GetVariableActionItem) { + GetVariableActionItem v = (GetVariableActionItem) ((GetMemberActionItem) t).object; + if (v.name instanceof DirectValueActionItem) { + if (((DirectValueActionItem) v.name).value instanceof String) { + if (((DirectValueActionItem) v.name).value.equals("_global")) { + GetVariableActionItem gvt = new GetVariableActionItem(null, ((GetMemberActionItem) t).memberName); if (lastMember == null) { return gvt; } else { @@ -1025,9 +1041,9 @@ public class Action implements GraphSourceItem { IfItem it = (IfItem) t; if (it.expression instanceof NotItem) { NotItem nti = (NotItem) it.expression; - if ((nti.value instanceof GetMemberTreeItem) || (nti.value instanceof GetVariableTreeItem)) { - if (true) { //it.onFalse.isEmpty()){ //||(it.onFalse.get(0) instanceof UnsupportedTreeItem)) { - if ((it.onTrue.size() == 1) && (it.onTrue.get(0) instanceof SetMemberTreeItem) && (((SetMemberTreeItem) it.onTrue.get(0)).value instanceof NewObjectTreeItem)) { + if ((nti.value instanceof GetMemberActionItem) || (nti.value instanceof GetVariableActionItem)) { + if (true) { //it.onFalse.isEmpty()){ //||(it.onFalse.get(0) instanceof UnsupportedActionItem)) { + if ((it.onTrue.size() == 1) && (it.onTrue.get(0) instanceof SetMemberActionItem) && (((SetMemberActionItem) it.onTrue.get(0)).value instanceof NewObjectActionItem)) { //ignore } else { List parts = it.onTrue; @@ -1035,37 +1051,37 @@ public class Action implements GraphSourceItem { if (parts.size() >= 1) { int ipos = 0; while ((parts.get(ipos) instanceof IfItem) - && ((((IfItem) parts.get(ipos)).onTrue.size() == 1) && (((IfItem) parts.get(ipos)).onTrue.get(0) instanceof SetMemberTreeItem) && (((SetMemberTreeItem) ((IfItem) parts.get(ipos)).onTrue.get(0)).value instanceof NewObjectTreeItem))) { + && ((((IfItem) parts.get(ipos)).onTrue.size() == 1) && (((IfItem) parts.get(ipos)).onTrue.get(0) instanceof SetMemberActionItem) && (((SetMemberActionItem) ((IfItem) parts.get(ipos)).onTrue.get(0)).value instanceof NewObjectActionItem))) { ipos++; } - if (parts.get(ipos) instanceof SetMemberTreeItem) { - SetMemberTreeItem smt = (SetMemberTreeItem) parts.get(ipos); - if (smt.value instanceof StoreRegisterTreeItem) { + if (parts.get(ipos) instanceof SetMemberActionItem) { + SetMemberActionItem smt = (SetMemberActionItem) parts.get(ipos); + if (smt.value instanceof StoreRegisterActionItem) { parts.add(ipos, smt.value); - smt.value = ((StoreRegisterTreeItem) smt.value).value; + smt.value = ((StoreRegisterActionItem) smt.value).value; } } - if (parts.get(ipos) instanceof StoreRegisterTreeItem) { - StoreRegisterTreeItem str1 = (StoreRegisterTreeItem) parts.get(ipos); + if (parts.get(ipos) instanceof StoreRegisterActionItem) { + StoreRegisterActionItem str1 = (StoreRegisterActionItem) parts.get(ipos); int classReg = str1.register.number; int instanceReg = -1; - if ((parts.size() >= ipos + 2) && (parts.get(ipos + 1) instanceof SetMemberTreeItem)) { - GraphTargetItem ti1 = ((SetMemberTreeItem) parts.get(ipos + 1)).value; - GraphTargetItem ti2 = ((StoreRegisterTreeItem) parts.get(ipos + 0)).value; + if ((parts.size() >= ipos + 2) && (parts.get(ipos + 1) instanceof SetMemberActionItem)) { + GraphTargetItem ti1 = ((SetMemberActionItem) parts.get(ipos + 1)).value; + GraphTargetItem ti2 = ((StoreRegisterActionItem) parts.get(ipos + 0)).value; if (ti1 == ti2) { - if (((SetMemberTreeItem) parts.get(ipos + 1)).value instanceof FunctionTreeItem) { - ((FunctionTreeItem) ((SetMemberTreeItem) parts.get(ipos + 1)).value).calculatedFunctionName = (className instanceof GetMemberTreeItem) ? ((GetMemberTreeItem) className).memberName : className; - functions.add((FunctionTreeItem) ((SetMemberTreeItem) parts.get(ipos + 1)).value); + if (((SetMemberActionItem) parts.get(ipos + 1)).value instanceof FunctionActionItem) { + ((FunctionActionItem) ((SetMemberActionItem) parts.get(ipos + 1)).value).calculatedFunctionName = (className instanceof GetMemberActionItem) ? ((GetMemberActionItem) className).memberName : className; + functions.add((FunctionActionItem) ((SetMemberActionItem) parts.get(ipos + 1)).value); int pos = ipos + 2; if (parts.size() <= pos) { ok = false; break; } - if (parts.get(pos) instanceof ExtendsTreeItem) { - ExtendsTreeItem et = (ExtendsTreeItem) parts.get(pos); + if (parts.get(pos) instanceof ExtendsActionItem) { + ExtendsActionItem et = (ExtendsActionItem) parts.get(pos); extendsOp = getWithoutGlobal(et.superclass); pos++; } @@ -1075,35 +1091,35 @@ public class Action implements GraphSourceItem { for (int i = 0; i < prevCount; i++) { output2.add(output.get(i)); } - output2.add(new ClassTreeItem(className, extendsOp, implementsOp, null/*FIXME*/, functions, vars, staticFunctions, staticVars)); + output2.add(new ClassActionItem(className, extendsOp, implementsOp, null/*FIXME*/, functions, vars, staticFunctions, staticVars)); return output2; } - if (parts.get(pos) instanceof SetMemberTreeItem) { - SetMemberTreeItem smt = (SetMemberTreeItem) parts.get(pos); - if (smt.value instanceof StoreRegisterTreeItem) { + if (parts.get(pos) instanceof SetMemberActionItem) { + SetMemberActionItem smt = (SetMemberActionItem) parts.get(pos); + if (smt.value instanceof StoreRegisterActionItem) { parts.add(pos, smt.value); - smt.value = ((StoreRegisterTreeItem) smt.value).value; + smt.value = ((StoreRegisterActionItem) smt.value).value; } } - if (parts.get(pos) instanceof StoreRegisterTreeItem) { + if (parts.get(pos) instanceof StoreRegisterActionItem) { - if (((StoreRegisterTreeItem) parts.get(pos)).value instanceof GetMemberTreeItem) { - GraphTargetItem obj = ((GetMemberTreeItem) ((StoreRegisterTreeItem) parts.get(pos)).value).object; - if (obj instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) obj).value instanceof RegisterNumber) { - if (((RegisterNumber) ((DirectValueTreeItem) obj).value).number == classReg) { - instanceReg = ((StoreRegisterTreeItem) parts.get(pos)).register.number; + if (((StoreRegisterActionItem) parts.get(pos)).value instanceof GetMemberActionItem) { + GraphTargetItem obj = ((GetMemberActionItem) ((StoreRegisterActionItem) parts.get(pos)).value).object; + if (obj instanceof DirectValueActionItem) { + if (((DirectValueActionItem) obj).value instanceof RegisterNumber) { + if (((RegisterNumber) ((DirectValueActionItem) obj).value).number == classReg) { + instanceReg = ((StoreRegisterActionItem) parts.get(pos)).register.number; } } } - } else if (((StoreRegisterTreeItem) parts.get(pos)).value instanceof NewMethodTreeItem) { + } else if (((StoreRegisterActionItem) parts.get(pos)).value instanceof NewMethodActionItem) { - if (parts.get(pos + 1) instanceof SetMemberTreeItem) { - if (((SetMemberTreeItem) parts.get(pos + 1)).value == ((StoreRegisterTreeItem) parts.get(pos)).value) { - instanceReg = ((StoreRegisterTreeItem) parts.get(pos)).register.number; - NewMethodTreeItem nm = (NewMethodTreeItem) ((StoreRegisterTreeItem) parts.get(pos)).value; - GetMemberTreeItem gm = new GetMemberTreeItem(null, nm.scriptObject, nm.methodName); + if (parts.get(pos + 1) instanceof SetMemberActionItem) { + if (((SetMemberActionItem) parts.get(pos + 1)).value == ((StoreRegisterActionItem) parts.get(pos)).value) { + instanceReg = ((StoreRegisterActionItem) parts.get(pos)).register.number; + NewMethodActionItem nm = (NewMethodActionItem) ((StoreRegisterActionItem) parts.get(pos)).value; + GetMemberActionItem gm = new GetMemberActionItem(null, nm.scriptObject, nm.methodName); extendsOp = gm; } else { ok = false; @@ -1114,12 +1130,12 @@ public class Action implements GraphSourceItem { break; } pos++; - } else if (((StoreRegisterTreeItem) parts.get(pos)).value instanceof NewObjectTreeItem) { - if (parts.get(pos + 1) instanceof SetMemberTreeItem) { - if (((SetMemberTreeItem) parts.get(pos + 1)).value == ((StoreRegisterTreeItem) parts.get(pos)).value) { - instanceReg = ((StoreRegisterTreeItem) parts.get(pos)).register.number; - NewObjectTreeItem nm = (NewObjectTreeItem) ((StoreRegisterTreeItem) parts.get(pos)).value; - extendsOp = new GetVariableTreeItem(null, nm.objectName); + } else if (((StoreRegisterActionItem) parts.get(pos)).value instanceof NewObjectActionItem) { + if (parts.get(pos + 1) instanceof SetMemberActionItem) { + if (((SetMemberActionItem) parts.get(pos + 1)).value == ((StoreRegisterActionItem) parts.get(pos)).value) { + instanceReg = ((StoreRegisterActionItem) parts.get(pos)).register.number; + NewObjectActionItem nm = (NewObjectActionItem) ((StoreRegisterActionItem) parts.get(pos)).value; + extendsOp = new GetVariableActionItem(null, nm.objectName); } else { ok = false; break; @@ -1143,18 +1159,18 @@ public class Action implements GraphSourceItem { for (int i = 0; i < prevCount; i++) { output2.add(output.get(i)); } - output2.add(new ClassTreeItem(className, extendsOp, implementsOp, null/*FIXME*/, functions, vars, staticFunctions, staticVars)); + output2.add(new ClassActionItem(className, extendsOp, implementsOp, null/*FIXME*/, functions, vars, staticFunctions, staticVars)); return output2; } - /*if (parts.get(pos) instanceof PopTreeItem) { + /*if (parts.get(pos) instanceof PopActionItem) { pos++; }*/ if (parts.size() <= pos) { ok = false; break; } - if (parts.get(pos) instanceof ImplementsOpTreeItem) { - ImplementsOpTreeItem io = (ImplementsOpTreeItem) parts.get(pos); + if (parts.get(pos) instanceof ImplementsOpActionItem) { + ImplementsOpActionItem io = (ImplementsOpActionItem) parts.get(pos); implementsOp = io.superclasses; pos++; } @@ -1162,21 +1178,21 @@ public class Action implements GraphSourceItem { if (parts.get(pos) instanceof ScriptEndItem) { break; } - if (parts.get(pos) instanceof SetMemberTreeItem) { - SetMemberTreeItem smt = (SetMemberTreeItem) parts.get(pos); - if (smt.object instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) smt.object).value instanceof RegisterNumber) { - if (((RegisterNumber) ((DirectValueTreeItem) smt.object).value).number == instanceReg) { - if (smt.value instanceof FunctionTreeItem) { - ((FunctionTreeItem) smt.value).calculatedFunctionName = smt.objectName; - functions.add((FunctionTreeItem) smt.value); + if (parts.get(pos) instanceof SetMemberActionItem) { + SetMemberActionItem smt = (SetMemberActionItem) parts.get(pos); + if (smt.object instanceof DirectValueActionItem) { + if (((DirectValueActionItem) smt.object).value instanceof RegisterNumber) { + if (((RegisterNumber) ((DirectValueActionItem) smt.object).value).number == instanceReg) { + if (smt.value instanceof FunctionActionItem) { + ((FunctionActionItem) smt.value).calculatedFunctionName = smt.objectName; + functions.add((FunctionActionItem) smt.value); } else { vars.add(new MyEntry<>(smt.objectName, smt.value)); } - } else if (((RegisterNumber) ((DirectValueTreeItem) smt.object).value).number == classReg) { - if (smt.value instanceof FunctionTreeItem) { - ((FunctionTreeItem) smt.value).calculatedFunctionName = smt.objectName; - staticFunctions.add((FunctionTreeItem) smt.value); + } else if (((RegisterNumber) ((DirectValueActionItem) smt.object).value).number == classReg) { + if (smt.value instanceof FunctionActionItem) { + ((FunctionActionItem) smt.value).calculatedFunctionName = smt.objectName; + staticFunctions.add((FunctionActionItem) smt.value); } else { staticVars.add(new MyEntry<>(smt.objectName, smt.value)); } @@ -1187,10 +1203,10 @@ public class Action implements GraphSourceItem { } else { ok = false; } - } else if (parts.get(pos) instanceof CallFunctionTreeItem) { - //if(((CallFunctionTreeItem)parts.get(pos)).functionName){ - if (((CallFunctionTreeItem) parts.get(pos)).functionName instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) ((CallFunctionTreeItem) parts.get(pos)).functionName).value.equals("ASSetPropFlags")) { + } else if (parts.get(pos) instanceof CallFunctionActionItem) { + //if(((CallFunctionActionItem)parts.get(pos)).functionName){ + if (((CallFunctionActionItem) parts.get(pos)).functionName instanceof DirectValueActionItem) { + if (((DirectValueActionItem) ((CallFunctionActionItem) parts.get(pos)).functionName).value.equals("ASSetPropFlags")) { } else { ok = false; } @@ -1209,7 +1225,7 @@ public class Action implements GraphSourceItem { for (int i = 0; i < prevCount; i++) { output2.add(output.get(i)); } - output2.add(new ClassTreeItem(className, extendsOp, implementsOp, null/*FIXME*/, functions, vars, staticFunctions, staticVars)); + output2.add(new ClassActionItem(className, extendsOp, implementsOp, null/*FIXME*/, functions, vars, staticFunctions, staticVars)); return output2; } } else { @@ -1224,15 +1240,15 @@ public class Action implements GraphSourceItem { } else { ok = false; } - } else if (parts.get(0) instanceof SetMemberTreeItem) { - SetMemberTreeItem sm = (SetMemberTreeItem) parts.get(0); - if (sm.value instanceof FunctionTreeItem) { - FunctionTreeItem f = (FunctionTreeItem) sm.value; + } else if (parts.get(0) instanceof SetMemberActionItem) { + SetMemberActionItem sm = (SetMemberActionItem) parts.get(0); + if (sm.value instanceof FunctionActionItem) { + FunctionActionItem f = (FunctionActionItem) sm.value; if (f.actions.isEmpty()) { if (parts.size() == 2) { - if (parts.get(1) instanceof ImplementsOpTreeItem) { - ImplementsOpTreeItem iot = (ImplementsOpTreeItem) parts.get(1); + if (parts.get(1) instanceof ImplementsOpActionItem) { + ImplementsOpActionItem iot = (ImplementsOpActionItem) parts.get(1); implementsOp = iot.superclasses; } else { ok = false; @@ -1243,7 +1259,7 @@ public class Action implements GraphSourceItem { for (int i = 0; i < prevCount; i++) { output2.add(output.get(i)); } - output2.add(new InterfaceTreeItem(sm.objectName, implementsOp)); + output2.add(new InterfaceActionItem(sm.objectName, implementsOp)); return output2; } else { ok = false; @@ -1348,17 +1364,17 @@ public class Action implements GraphSourceItem { public static GraphTargetItem gettoset(GraphTargetItem get, GraphTargetItem value) { GraphTargetItem ret = get; - if (ret instanceof GetVariableTreeItem) { - GetVariableTreeItem gv = (GetVariableTreeItem) ret; - ret = new SetVariableTreeItem(null, gv.name, value); - } else if (ret instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) ret; - ret = new SetMemberTreeItem(null, mem.object, mem.memberName, value); - } else if ((ret instanceof DirectValueTreeItem) && ((DirectValueTreeItem) ret).value instanceof RegisterNumber) { - ret = new StoreRegisterTreeItem(null, (RegisterNumber) ((DirectValueTreeItem) ret).value, value, false); - } else if (ret instanceof GetPropertyTreeItem) { - GetPropertyTreeItem gp = (GetPropertyTreeItem) ret; - ret = new SetPropertyTreeItem(null, gp.target, gp.propertyIndex, value); + if (ret instanceof GetVariableActionItem) { + GetVariableActionItem gv = (GetVariableActionItem) ret; + ret = new SetVariableActionItem(null, gv.name, value); + } else if (ret instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) ret; + ret = new SetMemberActionItem(null, mem.object, mem.memberName, value); + } else if ((ret instanceof DirectValueActionItem) && ((DirectValueActionItem) ret).value instanceof RegisterNumber) { + ret = new StoreRegisterActionItem(null, (RegisterNumber) ((DirectValueActionItem) ret).value, value, false); + } else if (ret instanceof GetPropertyActionItem) { + GetPropertyActionItem gp = (GetPropertyActionItem) ret; + ret = new SetPropertyActionItem(null, gp.target, gp.propertyIndex, value); } return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java index ede6b5648..3455a8b00 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java @@ -24,28 +24,28 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.EnumerateTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetTarget2TreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetTargetTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetTypeTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.ForInTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.TellTargetTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.NeqTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.StrictEqTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.EnumerateActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.SetTarget2ActionItem; +import com.jpexs.decompiler.flash.action.model.SetTargetActionItem; +import com.jpexs.decompiler.flash.action.model.SetTypeActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.ForInActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.TellTargetActionItem; +import com.jpexs.decompiler.flash.action.model.operations.NeqActionItem; +import com.jpexs.decompiler.flash.action.model.operations.StrictEqActionItem; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.flash.graph.BreakItem; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.Loop; -import com.jpexs.decompiler.flash.graph.SwitchItem; -import com.jpexs.decompiler.flash.graph.WhileItem; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.SwitchItem; +import com.jpexs.decompiler.graph.model.WhileItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -81,8 +81,8 @@ public class ActionGraph extends Graph { if (stack.size() > 0) { for (int i = stack.size() - 1; i >= 0; i--) { //System.err.println(stack.get(i)); - if (stack.get(i) instanceof FunctionTreeItem) { - FunctionTreeItem f = (FunctionTreeItem) stack.remove(i); + if (stack.get(i) instanceof FunctionActionItem) { + FunctionActionItem f = (FunctionActionItem) stack.remove(i); if (!output.contains(f)) { output.add(0, f); } @@ -110,22 +110,22 @@ public class ActionGraph extends Graph { GraphTargetItem target = null; for (int t = 0; t < list.size(); t++) { GraphTargetItem it = list.get(t); - if (it instanceof SetTargetTreeItem) { - SetTargetTreeItem st = (SetTargetTreeItem) it; + if (it instanceof SetTargetActionItem) { + SetTargetActionItem st = (SetTargetActionItem) it; if (st.target.equals("")) { if (targetStart > -1) { targetEnd = t; break; } } else { - target = new DirectValueTreeItem(null, 0, st.target, new ArrayList()); + target = new DirectValueActionItem(null, 0, st.target, new ArrayList()); targetStart = t; targetStartItem = it; } } - if (it instanceof SetTarget2TreeItem) { - SetTarget2TreeItem st = (SetTarget2TreeItem) it; - if ((st.target instanceof DirectValueTreeItem) && st.target.getResult().equals("")) { + if (it instanceof SetTarget2ActionItem) { + SetTarget2ActionItem st = (SetTarget2ActionItem) it; + if ((st.target instanceof DirectValueActionItem) && st.target.getResult().equals("")) { if (targetStart > -1) { targetEnd = t; break; @@ -146,7 +146,7 @@ public class ActionGraph extends Graph { for (int i = targetStart + 1; i < targetEnd; i++) { tellist.add(list.get(i)); } - newlist.add(new TellTargetTreeItem(targetStartItem.src, target, tellist)); + newlist.add(new TellTargetActionItem(targetStartItem.src, target, tellist)); for (int i = targetEnd + 1; i < list.size(); i++) { newlist.add(list.get(i)); } @@ -160,22 +160,22 @@ public class ActionGraph extends Graph { if (it instanceof WhileItem) { WhileItem wi = (WhileItem) it; - if ((!wi.commands.isEmpty()) && (wi.commands.get(0) instanceof SetTypeTreeItem)) { - SetTypeTreeItem sti = (SetTypeTreeItem) wi.commands.get(0); - if (wi.expression.get(wi.expression.size() - 1) instanceof NeqTreeItem) { - NeqTreeItem ne = (NeqTreeItem) wi.expression.get(wi.expression.size() - 1); - if (ne.rightSide instanceof DirectValueTreeItem) { - DirectValueTreeItem dv = (DirectValueTreeItem) ne.rightSide; + if ((!wi.commands.isEmpty()) && (wi.commands.get(0) instanceof SetTypeActionItem)) { + SetTypeActionItem sti = (SetTypeActionItem) wi.commands.get(0); + if (wi.expression.get(wi.expression.size() - 1) instanceof NeqActionItem) { + NeqActionItem ne = (NeqActionItem) wi.expression.get(wi.expression.size() - 1); + if (ne.rightSide instanceof DirectValueActionItem) { + DirectValueActionItem dv = (DirectValueActionItem) ne.rightSide; if (dv.value instanceof Null) { GraphTargetItem en = ne.leftSide; - if (en instanceof StoreRegisterTreeItem) { - en = ((StoreRegisterTreeItem) en).value; + if (en instanceof StoreRegisterActionItem) { + en = ((StoreRegisterActionItem) en).value; } - if (en instanceof EnumerateTreeItem) { - EnumerateTreeItem eti = (EnumerateTreeItem) en; + if (en instanceof EnumerateActionItem) { + EnumerateActionItem eti = (EnumerateActionItem) en; list.remove(t); wi.commands.remove(0); - list.add(t, new ForInTreeItem(null, wi.loop, sti.getObject(), eti.object, wi.commands)); + list.add(t, new ForInActionItem(null, wi.loop, sti.getObject(), eti.object, wi.commands)); } } } @@ -246,32 +246,32 @@ public class ActionGraph extends Graph { @Override protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, List stopPart, List loops, List output, Loop currentLoop, int staticOperation, String path) { if (!output.isEmpty()) { - if (output.get(output.size() - 1) instanceof StoreRegisterTreeItem) { - StoreRegisterTreeItem str = (StoreRegisterTreeItem) output.get(output.size() - 1); - if (str.value instanceof EnumerateTreeItem) { + if (output.get(output.size() - 1) instanceof StoreRegisterActionItem) { + StoreRegisterActionItem str = (StoreRegisterActionItem) output.get(output.size() - 1); + if (str.value instanceof EnumerateActionItem) { output.remove(output.size() - 1); } } } List ret = null; - if ((part.nextParts.size() == 2) && (!stack.isEmpty()) && (stack.peek() instanceof StrictEqTreeItem)) { + if ((part.nextParts.size() == 2) && (!stack.isEmpty()) && (stack.peek() instanceof StrictEqActionItem)) { GraphTargetItem switchedObject = null; if (!output.isEmpty()) { - if (output.get(output.size() - 1) instanceof StoreRegisterTreeItem) { - switchedObject = ((StoreRegisterTreeItem) output.get(output.size() - 1)).value; + if (output.get(output.size() - 1) instanceof StoreRegisterActionItem) { + switchedObject = ((StoreRegisterActionItem) output.get(output.size() - 1)).value; } } if (switchedObject == null) { - switchedObject = new DirectValueTreeItem(null, -1, new Null(), null); + switchedObject = new DirectValueActionItem(null, -1, new Null(), null); } HashMap caseValuesMap = new HashMap<>(); int pos = 0; - StrictEqTreeItem set = (StrictEqTreeItem) stack.pop(); + StrictEqActionItem set = (StrictEqActionItem) stack.pop(); caseValuesMap.put(pos, set.rightSide); - if (set.leftSide instanceof StoreRegisterTreeItem) { - switchedObject = ((StoreRegisterTreeItem) set.leftSide).value; + if (set.leftSide instanceof StoreRegisterActionItem) { + switchedObject = ((StoreRegisterActionItem) set.leftSide).value; } //GraphPart switchLoc = part.nextParts.get(1).nextParts.get(0); List caseBodyParts = new ArrayList<>(); @@ -281,13 +281,13 @@ public class ActionGraph extends Graph { while (part.nextParts.size() > 1 && part.nextParts.get(1).getHeight() > 1 && code.get(part.nextParts.get(1).end >= code.size() ? code.size() - 1 : part.nextParts.get(1).end) instanceof ActionIf - && ((top = translatePartGetStack(localData, part.nextParts.get(1), stack, staticOperation)) instanceof StrictEqTreeItem)) { + && ((top = translatePartGetStack(localData, part.nextParts.get(1), stack, staticOperation)) instanceof StrictEqActionItem)) { cnt++; part = part.nextParts.get(1); pos++; caseBodyParts.add(part.nextParts.get(0)); - set = (StrictEqTreeItem) top; + set = (StrictEqActionItem) top; caseValuesMap.put(pos, set.rightSide); } if (cnt == 1) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java index 75d8df75f..6edd2c8a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java @@ -1,9 +1,9 @@ package com.jpexs.decompiler.flash.action; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/UnknownJumpException.java b/trunk/src/com/jpexs/decompiler/flash/action/UnknownJumpException.java index 94e32f31f..56460800a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/UnknownJumpException.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/UnknownJumpException.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.action; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.model.ActionItem; import java.util.List; import java.util.Stack; @@ -38,7 +38,7 @@ public class UnknownJumpException extends RuntimeException { /** * Output of the method before raising the exception */ - public List output; + public List output; /** * Constructor @@ -47,7 +47,7 @@ public class UnknownJumpException extends RuntimeException { * @param addr Actual address * @param output Output of the method before raising the exception */ - public UnknownJumpException(Stack stack, long addr, List output) { + public UnknownJumpException(Stack stack, long addr, List output) { this.stack = stack; this.addr = addr; this.output = output; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionFSCommand2.java b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionFSCommand2.java index 6573268b9..0f90cf64b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionFSCommand2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionFSCommand2.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.flashlite; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.FSCommand2TreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.FSCommand2ActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -43,6 +43,6 @@ public class ActionFSCommand2 extends Action { for (long l = 0; l < numArgs; l++) { args.add(stack.pop()); } - stack.push(new FSCommand2TreeItem(this, command, args)); + stack.push(new FSCommand2ActionItem(this, command, args)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java index 7518814db..7f809da0d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.StrictModeTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.StrictModeActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.HashMap; @@ -62,6 +62,6 @@ public class ActionStrictMode extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new StrictModeTreeItem(this, mode)); + output.add(new StrictModeActionItem(this, mode)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java index d31c87d13..c0d90efae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionPop; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +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; -public abstract class TreeItem extends GraphTargetItem { +public abstract class ActionItem extends GraphTargetItem { - public TreeItem(GraphSourceItem instruction, int precedence) { + public ActionItem(GraphSourceItem instruction, int precedence) { super(instruction, precedence); } @@ -39,10 +39,10 @@ public abstract class TreeItem extends GraphTargetItem { } protected boolean isEmptyString(GraphTargetItem target) { - if (target instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) target).value instanceof String) { + if (target instanceof DirectValueActionItem) { + if (((DirectValueActionItem) target).value instanceof String) { - if (((DirectValueTreeItem) target).value.equals("")) { + if (((DirectValueActionItem) target).value.equals("")) { return true; } } @@ -51,9 +51,9 @@ public abstract class TreeItem extends GraphTargetItem { } protected String stripQuotes(GraphTargetItem target, ConstantPool constants) { - if (target instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) target).value instanceof String) { - return (String) ((DirectValueTreeItem) target).hilight((String) ((DirectValueTreeItem) target).value); + if (target instanceof DirectValueActionItem) { + if (((DirectValueActionItem) target).value instanceof String) { + return (String) ((DirectValueActionItem) target).hilight((String) ((DirectValueActionItem) target).value); } } if (target == null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/AsciiToCharTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/AsciiToCharTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java index b0007d60e..c6db2f8f9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/AsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionAsciiToChar; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class AsciiToCharTreeItem extends TreeItem { +public class AsciiToCharActionItem extends ActionItem { private GraphTargetItem value; - public AsciiToCharTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public AsciiToCharActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -37,8 +37,8 @@ public class AsciiToCharTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java index 11d7a7ab6..aab1c7e1e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionCall; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class CallTreeItem extends TreeItem { +public class CallActionItem extends ActionItem { private GraphTargetItem value; - public CallTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public CallActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -37,8 +37,8 @@ public class CallTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java index 3bb9405bb..02f798660 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionCallFunction; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class CallFunctionTreeItem extends TreeItem { +public class CallFunctionActionItem extends ActionItem { public GraphTargetItem functionName; public List arguments; public GraphTargetItem calculatedFunction; - public CallFunctionTreeItem(GraphSourceItem instruction, GraphTargetItem functionName, List arguments) { + public CallFunctionActionItem(GraphSourceItem instruction, GraphTargetItem functionName, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.functionName = functionName; this.arguments = arguments; @@ -47,8 +47,8 @@ public class CallFunctionTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(functionName.getNeededSources()); for (GraphTargetItem ti : arguments) { ret.addAll(ti.getNeededSources()); @@ -88,7 +88,7 @@ public class CallFunctionTreeItem extends TreeItem { if (getClass() != obj.getClass()) { return false; } - final CallFunctionTreeItem other = (CallFunctionTreeItem) obj; + final CallFunctionActionItem other = (CallFunctionActionItem) obj; if (this.functionName != other.functionName && (this.functionName == null || !this.functionName.equals(other.functionName))) { return false; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java index 4bbf3857d..ff44bc7ab 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionCallMethod; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class CallMethodTreeItem extends TreeItem { +public class CallMethodActionItem extends ActionItem { public GraphTargetItem methodName; public GraphTargetItem scriptObject; public List arguments; - public CallMethodTreeItem(GraphSourceItem instruction, GraphTargetItem scriptObject, GraphTargetItem methodName, List arguments) { + public CallMethodActionItem(GraphSourceItem instruction, GraphTargetItem scriptObject, GraphTargetItem methodName, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.methodName = methodName; this.arguments = arguments; @@ -46,12 +46,12 @@ public class CallMethodTreeItem extends TreeItem { paramStr += arguments.get(t).toStringNL(constants); } boolean blankMethod = false; - if (methodName instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) methodName).value instanceof Undefined) { + if (methodName instanceof DirectValueActionItem) { + if (((DirectValueActionItem) methodName).value instanceof Undefined) { blankMethod = true; } - if (((DirectValueTreeItem) methodName).value instanceof String) { - if (((DirectValueTreeItem) methodName).value.equals("")) { + if (((DirectValueActionItem) methodName).value instanceof String) { + if (((DirectValueActionItem) methodName).value.equals("")) { blankMethod = true; } } @@ -67,8 +67,8 @@ public class CallMethodTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(methodName.getNeededSources()); ret.addAll(scriptObject.getNeededSources()); for (GraphTargetItem ti : arguments) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CastOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/CastOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java index 94fadeea2..724baee53 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CastOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf7.ActionCastOp; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class CastOpTreeItem extends TreeItem { +public class CastOpActionItem extends ActionItem { public GraphTargetItem constructor; public GraphTargetItem object; - public CastOpTreeItem(GraphSourceItem instruction, GraphTargetItem constructor, GraphTargetItem object) { + public CastOpActionItem(GraphSourceItem instruction, GraphTargetItem constructor, GraphTargetItem object) { super(instruction, PRECEDENCE_PRIMARY); this.constructor = constructor; this.object = object; @@ -40,8 +40,8 @@ public class CastOpTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(constructor.getNeededSources()); ret.addAll(object.getNeededSources()); return ret; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CharToAsciiTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/CharToAsciiTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java index a8bb05586..083efe1ec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionCharToAscii; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class CharToAsciiTreeItem extends TreeItem { +public class CharToAsciiActionItem extends ActionItem { private GraphTargetItem value; - public CharToAsciiTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public CharToAsciiActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -37,16 +37,16 @@ public class CharToAsciiTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } @Override public boolean isCompileTime() { - if (value instanceof DirectValueTreeItem) { - DirectValueTreeItem dv = (DirectValueTreeItem) value; + if (value instanceof DirectValueActionItem) { + DirectValueActionItem dv = (DirectValueActionItem) value; if (dv.value instanceof String) { String s = (String) dv.value; if (s.length() > 0) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CloneSpriteTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/CloneSpriteTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java index c5b68de70..68337f4dc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CloneSpriteTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionCloneSprite; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class CloneSpriteTreeItem extends TreeItem { +public class CloneSpriteActionItem extends ActionItem { public GraphTargetItem source; public GraphTargetItem target; public GraphTargetItem depth; - public CloneSpriteTreeItem(GraphSourceItem instruction, GraphTargetItem source, GraphTargetItem target, GraphTargetItem depth) { + public CloneSpriteActionItem(GraphSourceItem instruction, GraphTargetItem source, GraphTargetItem target, GraphTargetItem depth) { super(instruction, PRECEDENCE_PRIMARY); this.source = source; this.target = target; @@ -41,8 +41,8 @@ public class CloneSpriteTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(source.getNeededSources()); ret.addAll(target.getNeededSources()); ret.addAll(depth.getNeededSources()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ConstantPool.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ConstantPool.java similarity index 93% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ConstantPool.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ConstantPool.java index 9b58c04ea..5e439ef23 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ConstantPool.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ConstantPool.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/DecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java index 13e560b0d..921f204b1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionDecrement; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class DecrementTreeItem extends TreeItem { +public class DecrementActionItem extends ActionItem { public GraphTargetItem object; - public DecrementTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public DecrementActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_ADDITIVE); this.object = object; } @@ -48,8 +48,8 @@ public class DecrementTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java similarity index 76% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java index 8ddcad0de..0091cc80f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionDefineLocal; import com.jpexs.decompiler.flash.action.swf5.ActionDefineLocal2; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class DefineLocalTreeItem extends TreeItem implements SetTypeTreeItem { +public class DefineLocalActionItem extends ActionItem implements SetTypeActionItem { public GraphTargetItem name; //public GraphTargetItem value; @@ -49,7 +49,7 @@ public class DefineLocalTreeItem extends TreeItem implements SetTypeTreeItem { return value; } - public DefineLocalTreeItem(GraphSourceItem instruction, GraphTargetItem name, GraphTargetItem value) { + public DefineLocalActionItem(GraphSourceItem instruction, GraphTargetItem name, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.name = name; this.value = value; @@ -64,8 +64,8 @@ public class DefineLocalTreeItem extends TreeItem implements SetTypeTreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); ret.addAll(name.getNeededSources()); return ret; @@ -73,7 +73,7 @@ public class DefineLocalTreeItem extends TreeItem implements SetTypeTreeItem { @Override public GraphTargetItem getObject() { - return new DefineLocalTreeItem(src, name, null); + return new DefineLocalActionItem(src, name, null); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineRegisterTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineRegisterTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java index 9094a6141..3b7c5db05 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineRegisterTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; /** * * @author JPEXS */ -public class DefineRegisterTreeItem extends TreeItem { +public class DefineRegisterActionItem extends ActionItem { private String identifier; private int register; - public DefineRegisterTreeItem(String identifier, int register) { + public DefineRegisterActionItem(String identifier, int register) { super(null, PRECEDENCE_PRIMARY); this.identifier = identifier; this.register = register; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DeleteTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/DeleteTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java index 256c86253..6bde7cdff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DeleteTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionDelete; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class DeleteTreeItem extends TreeItem { +public class DeleteActionItem extends ActionItem { public GraphTargetItem object; public GraphTargetItem propertyName; - public DeleteTreeItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem propertyName) { + public DeleteActionItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem propertyName) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.propertyName = propertyName; @@ -42,8 +42,8 @@ public class DeleteTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); ret.addAll(propertyName.getNeededSources()); return ret; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java similarity index 88% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java index fc08d8807..97e92a356 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java @@ -14,32 +14,32 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.List; import java.util.Objects; -public class DirectValueTreeItem extends TreeItem { +public class DirectValueActionItem extends ActionItem { public Object value; public List constants; public GraphTargetItem computedRegValue; - public DirectValueTreeItem(Object o) { + public DirectValueActionItem(Object o) { this(null, 0, o, new ArrayList()); } - public DirectValueTreeItem(GraphSourceItem instruction, int instructionPos, Object value, List constants) { + public DirectValueActionItem(GraphSourceItem instruction, int instructionPos, Object value, List constants) { super(instruction, PRECEDENCE_PRIMARY); this.constants = constants; this.value = value; @@ -165,10 +165,10 @@ public class DirectValueTreeItem extends TreeItem { if (obj == null) { return false; } - if (!(obj instanceof DirectValueTreeItem)) { + if (!(obj instanceof DirectValueActionItem)) { return false; } - final DirectValueTreeItem other = (DirectValueTreeItem) obj; + final DirectValueActionItem other = (DirectValueActionItem) obj; if (!Objects.equals(this.value, other.value)) { return false; } @@ -186,7 +186,7 @@ public class DirectValueTreeItem extends TreeItem { if (getClass() != obj.getClass()) { return false; } - final DirectValueTreeItem other = (DirectValueTreeItem) obj; + final DirectValueActionItem other = (DirectValueActionItem) obj; if (!Objects.equals(this.value, other.value)) { return false; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EnumerateTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java similarity index 69% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/EnumerateTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java index 6d33efa69..69e7bc4ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EnumerateTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class EnumerateTreeItem extends TreeItem { +public class EnumerateActionItem extends ActionItem { public GraphTargetItem object; - public EnumerateTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public EnumerateActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; } @@ -36,8 +36,8 @@ public class EnumerateTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EvalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java similarity index 76% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/EvalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java index 97aad62cf..03d17ff03 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EvalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class EvalTreeItem extends TreeItem { +public class EvalActionItem extends ActionItem { - public EvalTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public EvalActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java index 6bd2f9bec..57f58c971 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.List; -public class ExtendsTreeItem extends TreeItem { +public class ExtendsActionItem extends ActionItem { public GraphTargetItem subclass; public GraphTargetItem superclass; - public ExtendsTreeItem(GraphSourceItem instruction, GraphTargetItem subclass, GraphTargetItem superclass) { + public ExtendsActionItem(GraphSourceItem instruction, GraphTargetItem subclass, GraphTargetItem superclass) { super(instruction, PRECEDENCE_PRIMARY); this.subclass = subclass; this.superclass = superclass; @@ -42,7 +42,7 @@ public class ExtendsTreeItem extends TreeItem { @Override public List getNeededSources() { - List ret = super.getNeededSources(); + List ret = super.getNeededSources(); ret.addAll(subclass.getNeededSources()); ret.addAll(superclass.getNeededSources()); return ret; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommand2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommand2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java index 09e82ab1d..29e03997c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommand2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.flashlite.ActionFSCommand2; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +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; -public class FSCommand2TreeItem extends TreeItem { +public class FSCommand2ActionItem extends ActionItem { public String target; public List arguments; public GraphTargetItem command; - public FSCommand2TreeItem(GraphSourceItem instruction, GraphTargetItem command, List arguments) { + public FSCommand2ActionItem(GraphSourceItem instruction, GraphTargetItem command, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.command = command; this.arguments = arguments; @@ -47,8 +47,8 @@ public class FSCommand2TreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(command.getNeededSources()); for (GraphTargetItem ti : arguments) { ret.addAll(ti.getNeededSources()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommandTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommandTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java index 70321e9ce..3e175ed26 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommandTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; @@ -26,11 +26,11 @@ import java.util.List; * * @author JPEXS */ -public class FSCommandTreeItem extends TreeItem { +public class FSCommandActionItem extends ActionItem { private String command; - public FSCommandTreeItem(GraphSourceItem instruction, String command) { + public FSCommandActionItem(GraphSourceItem instruction, String command) { super(instruction, PRECEDENCE_PRIMARY); this.command = command; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java similarity index 89% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java index 68a2393c8..67c3c5ba0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionDefineFunction; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.TreeSet; -public class FunctionTreeItem extends TreeItem { +public class FunctionActionItem extends ActionItem { public List actions; public List constants; @@ -49,7 +49,7 @@ public class FunctionTreeItem extends TreeItem { public static final int REGISTER_PARENT = 5; public static final int REGISTER_GLOBAL = 6; - public FunctionTreeItem(GraphSourceItem instruction, String functionName, List paramNames, List actions, List constants, int regStart) { + public FunctionActionItem(GraphSourceItem instruction, String functionName, List paramNames, List actions, List constants, int regStart) { super(instruction, PRECEDENCE_PRIMARY); this.actions = actions; this.constants = constants; @@ -85,8 +85,8 @@ public class FunctionTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); for (GraphTargetItem ti : actions) { ret.addAll(ti.getNeededSources()); } @@ -111,8 +111,8 @@ public class FunctionTreeItem extends TreeItem { @Override public Object getResult() { if (!actions.isEmpty()) { - if (actions.get(actions.size() - 1) instanceof ReturnTreeItem) { - ReturnTreeItem r = (ReturnTreeItem) actions.get(actions.size() - 1); + if (actions.get(actions.size() - 1) instanceof ReturnActionItem) { + ReturnActionItem r = (ReturnActionItem) actions.get(actions.size() - 1); return r.value.getResult(); } } @@ -127,7 +127,7 @@ public class FunctionTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { List ret = new ArrayList<>(); - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; List paramRegs = new ArrayList<>(); @SuppressWarnings("unchecked") List localDataCopy = (List) Helper.deepCopy(localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetMemberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetMemberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java index 6c171ab58..42eb9a9a0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetMemberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionGetMember; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GetMemberTreeItem extends TreeItem { +public class GetMemberActionItem extends ActionItem { public GraphTargetItem object; public GraphTargetItem memberName; - public GetMemberTreeItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem memberName) { + public GetMemberActionItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem memberName) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; this.memberName = memberName; @@ -35,16 +35,16 @@ public class GetMemberTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - if (!((memberName instanceof DirectValueTreeItem) && (((DirectValueTreeItem) memberName).value instanceof String))) { - //if(!(functionName instanceof GetVariableTreeItem)) + if (!((memberName instanceof DirectValueActionItem) && (((DirectValueActionItem) memberName).value instanceof String))) { + //if(!(functionName instanceof GetVariableActionItem)) return object.toString(constants) + "[" + stripQuotes(memberName, constants) + "]"; } return object.toString(constants) + "." + stripQuotes(memberName, constants); } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); ret.addAll(memberName.getNeededSources()); return ret; @@ -66,7 +66,7 @@ public class GetMemberTreeItem extends TreeItem { if (getClass() != obj.getClass()) { return false; } - final GetMemberTreeItem other = (GetMemberTreeItem) obj; + final GetMemberActionItem other = (GetMemberActionItem) obj; if (this.object != other.object && (this.object == null || !this.object.equals(other.object))) { return false; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java index 74510774c..83f50cb0b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf4.ActionGetProperty; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GetPropertyTreeItem extends TreeItem { +public class GetPropertyActionItem extends ActionItem { public GraphTargetItem target; public int propertyIndex; - public GetPropertyTreeItem(GraphSourceItem instruction, GraphTargetItem target, int propertyIndex) { + public GetPropertyActionItem(GraphSourceItem instruction, GraphTargetItem target, int propertyIndex) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; this.propertyIndex = propertyIndex; @@ -44,8 +44,8 @@ public class GetPropertyTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(target.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetTimeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetTimeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java index c95309a61..4bb9a61f5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetTimeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetTime; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; import java.util.Random; -public class GetTimeTreeItem extends TreeItem { +public class GetTimeActionItem extends ActionItem { - public GetTimeTreeItem(GraphSourceItem instruction) { + public GetTimeActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java similarity index 74% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java index 2a71fa02f..45b6a1ff4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GetURL2TreeItem extends TreeItem { +public class GetURL2ActionItem extends ActionItem { public GraphTargetItem urlString; public GraphTargetItem targetString; @@ -41,7 +41,7 @@ public class GetURL2TreeItem extends TreeItem { return hilight("getURL(") + urlString.toString(constants) + hilight(",") + targetString.toString(constants) + hilight(methodStr + ")"); } - public GetURL2TreeItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem targetString, int method) { + public GetURL2ActionItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem targetString, int method) { super(instruction, PRECEDENCE_PRIMARY); this.urlString = urlString; this.targetString = targetString; @@ -49,8 +49,8 @@ public class GetURL2TreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(urlString.getNeededSources()); ret.addAll(targetString.getNeededSources()); return ret; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java similarity index 81% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java index 0aeda1c96..175060540 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class GetURLTreeItem extends TreeItem { +public class GetURLActionItem extends ActionItem { public String urlString; public String targetString; @@ -32,7 +32,7 @@ public class GetURLTreeItem extends TreeItem { return hilight("getUrl(\"") + Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString) + hilight("\")"); } - public GetURLTreeItem(GraphSourceItem instruction, String urlString, String targetString) { + public GetURLActionItem(GraphSourceItem instruction, String urlString, String targetString) { super(instruction, PRECEDENCE_PRIMARY); this.urlString = urlString; this.targetString = targetString; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVariableTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVariableTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java index 01447c3c7..d38df4f26 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVariableTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GetVariableTreeItem extends TreeItem { +public class GetVariableActionItem extends ActionItem { public GraphTargetItem name; private GraphTargetItem computedValue; @@ -31,7 +31,7 @@ public class GetVariableTreeItem extends TreeItem { private boolean computedCompiletime = false; private boolean computedVariableComputed = false; - public GetVariableTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public GetVariableActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.name = value; } @@ -42,8 +42,8 @@ public class GetVariableTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(name.getNeededSources()); return ret; } @@ -95,7 +95,7 @@ public class GetVariableTreeItem extends TreeItem { if (getClass() != obj.getClass()) { return false; } - final GetVariableTreeItem other = (GetVariableTreeItem) obj; + final GetVariableActionItem other = (GetVariableActionItem) obj; if (this.name != other.name && (this.name == null || !this.name.equals(other.name))) { return false; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVersionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVersionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java index 76048ad3d..7e006793c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVersionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class GetVersionTreeItem extends TreeItem { +public class GetVersionActionItem extends ActionItem { - public GetVersionTreeItem(GraphSourceItem instruction) { + public GetVersionActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrame2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrame2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java index 64f560de7..f915b7139 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrame2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGotoFrame2; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GotoFrame2TreeItem extends TreeItem { +public class GotoFrame2ActionItem extends ActionItem { public GraphTargetItem frame; public boolean sceneBiasFlag; public boolean playFlag; public int sceneBias; - public GotoFrame2TreeItem(GraphSourceItem instruction, GraphTargetItem frame, boolean sceneBiasFlag, boolean playFlag, int sceneBias) { + public GotoFrame2ActionItem(GraphSourceItem instruction, GraphTargetItem frame, boolean sceneBiasFlag, boolean playFlag, int sceneBias) { super(instruction, PRECEDENCE_PRIMARY); this.frame = frame; this.sceneBiasFlag = sceneBiasFlag; @@ -47,8 +47,8 @@ public class GotoFrame2TreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(frame.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java index 9b4f8a47b..8c7a48263 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionGotoFrame; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GotoFrameTreeItem extends TreeItem { +public class GotoFrameActionItem extends ActionItem { public int frame; - public GotoFrameTreeItem(GraphSourceItem instruction, int frame) { + public GotoFrameActionItem(GraphSourceItem instruction, int frame) { super(instruction, PRECEDENCE_PRIMARY); this.frame = frame; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoLabelTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoLabelTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java index 59e3da066..480a0132c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoLabelTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionGoToLabel; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class GotoLabelTreeItem extends TreeItem { +public class GotoLabelActionItem extends ActionItem { public String label; - public GotoLabelTreeItem(GraphSourceItem instruction, String label) { + public GotoLabelActionItem(GraphSourceItem instruction, String label) { super(instruction, PRECEDENCE_PRIMARY); this.label = label; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ImplementsOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ImplementsOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java index 74379d9a9..63064077a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ImplementsOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class ImplementsOpTreeItem extends TreeItem { +public class ImplementsOpActionItem extends ActionItem { public GraphTargetItem subclass; public List superclasses; - public ImplementsOpTreeItem(GraphSourceItem instruction, GraphTargetItem subclass, List superclasses) { + public ImplementsOpActionItem(GraphSourceItem instruction, GraphTargetItem subclass, List superclasses) { super(instruction, PRECEDENCE_PRIMARY); this.subclass = subclass; this.superclasses = superclasses; @@ -45,8 +45,8 @@ public class ImplementsOpTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(subclass.getNeededSources()); for (GraphTargetItem ti : superclasses) { ret.addAll(ti.getNeededSources()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/IncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java index 0db9c45a9..4a983604a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionIncrement; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class IncrementTreeItem extends TreeItem { +public class IncrementActionItem extends ActionItem { public GraphTargetItem object; - public IncrementTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public IncrementActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_ADDITIVE); this.object = object; } @@ -48,8 +48,8 @@ public class IncrementTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitArrayTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java similarity index 75% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitArrayTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java index f7a9a457e..d6e7953cb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitArrayTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionInitArray; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class InitArrayTreeItem extends TreeItem { +public class InitArrayActionItem extends ActionItem { public List values; - public InitArrayTreeItem(GraphSourceItem instruction, List values) { + public InitArrayActionItem(GraphSourceItem instruction, List values) { super(instruction, PRECEDENCE_PRIMARY); this.values = values; } @@ -45,7 +45,7 @@ public class InitArrayTreeItem extends TreeItem { } @Override - public List getNeededSources() { + public List getNeededSources() { List ret = super.getNeededSources(); for (GraphTargetItem value : values) { ret.addAll(value.getNeededSources()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java similarity index 76% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java index 3e847cec8..4f983f3d8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; -import com.jpexs.decompiler.flash.graph.TernarOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.TernarOpItem; import java.util.ArrayList; import java.util.List; -public class InitObjectTreeItem extends TreeItem { +public class InitObjectActionItem extends ActionItem { public List names; public List values; - public InitObjectTreeItem(GraphSourceItem instruction, List names, List values) { + public InitObjectActionItem(GraphSourceItem instruction, List names, List values) { super(instruction, PRECEDENCE_PRIMARY); this.values = values; this.names = names; @@ -52,8 +52,8 @@ public class InitObjectTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); for (GraphTargetItem name : names) { ret.addAll(name.getNeededSources()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadMovieTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadMovieTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java index c73427836..94e501321 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadMovieTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class LoadMovieTreeItem extends TreeItem { +public class LoadMovieActionItem extends ActionItem { private GraphTargetItem urlString; private GraphTargetItem targetString; private int method; - public LoadMovieTreeItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem targetString, int method) { + public LoadMovieActionItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem targetString, int method) { super(instruction, PRECEDENCE_PRIMARY); this.urlString = urlString; this.targetString = targetString; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadMovieNumTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java similarity index 66% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadMovieNumTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java index ad30a5a56..c5e080ba5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadMovieNumTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class LoadMovieNumTreeItem extends TreeItem { +public class LoadMovieNumActionItem extends ActionItem { private GraphTargetItem urlString; private GraphTargetItem num; private int method; - public LoadMovieNumTreeItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem num, int method) { + public LoadMovieNumActionItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem num, int method) { super(instruction, PRECEDENCE_PRIMARY); this.urlString = urlString; this.num = num; @@ -55,8 +55,8 @@ public class LoadMovieNumTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; - return toSourceMerge(localData, generator, urlString, new AddTreeItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(method, false, false)); + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; + return toSourceMerge(localData, generator, urlString, new AddActionItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(method, false, false)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadVariablesTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadVariablesTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java index 31e6cbbb4..735894d78 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadVariablesTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class LoadVariablesTreeItem extends TreeItem { +public class LoadVariablesActionItem extends ActionItem { private GraphTargetItem urlString; private GraphTargetItem targetString; private int method; - public LoadVariablesTreeItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem targetString, int method) { + public LoadVariablesActionItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem targetString, int method) { super(instruction, PRECEDENCE_PRIMARY); this.urlString = urlString; this.targetString = targetString; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadVariablesNumTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java similarity index 66% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadVariablesNumTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java index 7a7eee5c8..fad0b0379 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/LoadVariablesNumTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class LoadVariablesNumTreeItem extends TreeItem { +public class LoadVariablesNumActionItem extends ActionItem { private GraphTargetItem urlString; private GraphTargetItem num; private int method; - public LoadVariablesNumTreeItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem num, int method) { + public LoadVariablesNumActionItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem num, int method) { super(instruction, PRECEDENCE_PRIMARY); this.urlString = urlString; this.num = num; @@ -55,8 +55,8 @@ public class LoadVariablesNumTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; - return toSourceMerge(localData, generator, urlString, new AddTreeItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(method, false, true)); + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; + return toSourceMerge(localData, generator, urlString, new AddActionItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(method, false, true)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBAsciiToCharTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBAsciiToCharTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java index c08cfa809..b14d04f13 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBAsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionMBAsciiToChar; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class MBAsciiToCharTreeItem extends TreeItem { +public class MBAsciiToCharActionItem extends ActionItem { private GraphTargetItem value; - public MBAsciiToCharTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public MBAsciiToCharActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -37,8 +37,8 @@ public class MBAsciiToCharTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBCharToAsciiTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBCharToAsciiTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java index 937e0faea..205e0cb05 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBCharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionMBCharToAscii; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class MBCharToAsciiTreeItem extends TreeItem { +public class MBCharToAsciiActionItem extends ActionItem { private GraphTargetItem value; - public MBCharToAsciiTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public MBCharToAsciiActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -37,8 +37,8 @@ public class MBCharToAsciiTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringExtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringExtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java index af9c87d06..295b9ccd7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringExtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionMBStringExtract; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class MBStringExtractTreeItem extends TreeItem { +public class MBStringExtractActionItem extends ActionItem { //public GraphTargetItem value; public GraphTargetItem index; public GraphTargetItem count; - public MBStringExtractTreeItem(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem index, GraphTargetItem count) { + public MBStringExtractActionItem(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem index, GraphTargetItem count) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; this.index = index; @@ -41,8 +41,8 @@ public class MBStringExtractTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); ret.addAll(index.getNeededSources()); ret.addAll(count.getNeededSources()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringLengthTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringLengthTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java index 8f7050ff5..0d6cf0975 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringLengthTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionMBStringLength; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class MBStringLengthTreeItem extends TreeItem { +public class MBStringLengthActionItem extends ActionItem { //public GraphTargetItem value; - public MBStringLengthTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public MBStringLengthActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -40,8 +40,8 @@ public class MBStringLengthTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewMethodTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewMethodTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java index ff5b2e13c..943290fc6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewMethodTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionNewMethod; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class NewMethodTreeItem extends TreeItem { +public class NewMethodActionItem extends ActionItem { public GraphTargetItem methodName; public GraphTargetItem scriptObject; public List arguments; - public NewMethodTreeItem(GraphSourceItem instruction, GraphTargetItem scriptObject, GraphTargetItem methodName, List arguments) { + public NewMethodActionItem(GraphSourceItem instruction, GraphTargetItem scriptObject, GraphTargetItem methodName, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.methodName = methodName; this.arguments = arguments; @@ -47,14 +47,14 @@ public class NewMethodTreeItem extends TreeItem { } boolean blankMethod = false; String methodNameStr = ""; - if (methodName instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) methodName).value instanceof Undefined) { + if (methodName instanceof DirectValueActionItem) { + if (((DirectValueActionItem) methodName).value instanceof Undefined) { blankMethod = true; - } else if (((DirectValueTreeItem) methodName).value instanceof String) { - if (((DirectValueTreeItem) methodName).value.equals("")) { + } else if (((DirectValueActionItem) methodName).value instanceof String) { + if (((DirectValueActionItem) methodName).value.equals("")) { blankMethod = true; } - methodNameStr = ((DirectValueTreeItem) methodName).toStringNoQuotes(constants); + methodNameStr = ((DirectValueActionItem) methodName).toStringNoQuotes(constants); } else { methodNameStr = methodName.toString(constants); } @@ -68,8 +68,8 @@ public class NewMethodTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(methodName.getNeededSources()); ret.addAll(scriptObject.getNeededSources()); for (GraphTargetItem ti : arguments) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java similarity index 74% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java index b224433aa..3b3f7942e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionNewObject; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class NewObjectTreeItem extends TreeItem { +public class NewObjectActionItem extends ActionItem { public GraphTargetItem objectName; public List arguments; - public NewObjectTreeItem(GraphSourceItem instruction, GraphTargetItem objectName, List arguments) { + public NewObjectActionItem(GraphSourceItem instruction, GraphTargetItem objectName, List arguments) { super(instruction, PRECEDENCE_PRIMARY); this.objectName = objectName; this.arguments = arguments; @@ -46,8 +46,8 @@ public class NewObjectTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(objectName.getNeededSources()); for (GraphTargetItem ti : arguments) { ret.addAll(ti.getNeededSources()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NextFrameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/NextFrameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java index 8aa701757..537c8d5ed 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NextFrameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionNextFrame; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class NextFrameTreeItem extends TreeItem { +public class NextFrameActionItem extends ActionItem { @Override public String toString(ConstantPool constants) { return hilight("nextFrame()"); } - public NextFrameTreeItem(GraphSourceItem instruction) { + public NextFrameActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PlayTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PlayTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java index 59faa0fe7..934e53ffc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PlayTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionPlay; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class PlayTreeItem extends TreeItem { +public class PlayActionItem extends ActionItem { @Override public String toString(ConstantPool constants) { return hilight("play()"); } - public PlayTreeItem(GraphSourceItem instruction) { + public PlayActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PopTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PopTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java index e526f94dc..193081f3a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PopTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionPop; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class PopTreeItem extends TreeItem { +public class PopActionItem extends ActionItem { - public PopTreeItem(GraphSourceItem instruction) { + public PopActionItem(GraphSourceItem instruction) { super(instruction, NOPRECEDENCE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PostDecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PostDecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java index 2cf88ea53..2fd6ea9e2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PostDecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionPop; import com.jpexs.decompiler.flash.action.swf4.ActionPush; @@ -24,19 +24,19 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionDecrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.treemodel.operations.SubtractTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.SubtractActionItem; +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; -public class PostDecrementTreeItem extends TreeItem implements SetTypeTreeItem { +public class PostDecrementActionItem extends ActionItem implements SetTypeActionItem { public GraphTargetItem object; private int tempRegister = -1; - public PostDecrementTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public PostDecrementActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_POSTFIX); this.object = object; } @@ -58,7 +58,7 @@ public class PostDecrementTreeItem extends TreeItem implements SetTypeTreeItem { @Override public GraphTargetItem getValue() { - return new SubtractTreeItem(null, object, new DirectValueTreeItem(null, 0, new Long(1), null)); + return new SubtractActionItem(null, object, new DirectValueActionItem(null, 0, new Long(1), null)); } @Override @@ -80,28 +80,28 @@ public class PostDecrementTreeItem extends TreeItem implements SetTypeTreeItem { public List toSourceIgnoreReturnValue(List localData, SourceGenerator generator) { List ret = new ArrayList<>(); - if (object instanceof GetVariableTreeItem) { - GetVariableTreeItem gv = (GetVariableTreeItem) object; + if (object instanceof GetVariableActionItem) { + GetVariableActionItem gv = (GetVariableActionItem) object; ret.addAll(gv.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetVariable ret.addAll(gv.toSource(localData, generator)); ret.add(new ActionDecrement()); ret.add(new ActionSetVariable()); - } else if (object instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) object; + } else if (object instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) object; ret.addAll(mem.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetMember ret.addAll(mem.toSource(localData, generator)); ret.add(new ActionDecrement()); ret.add(new ActionSetMember()); - } else if ((object instanceof DirectValueTreeItem) && ((DirectValueTreeItem) object).value instanceof RegisterNumber) { - RegisterNumber rn = (RegisterNumber) ((DirectValueTreeItem) object).value; + } else if ((object instanceof DirectValueActionItem) && ((DirectValueActionItem) object).value instanceof RegisterNumber) { + RegisterNumber rn = (RegisterNumber) ((DirectValueActionItem) object).value; ret.add(new ActionPush(new RegisterNumber(rn.number))); ret.add(new ActionDecrement()); ret.add(new ActionStoreRegister(rn.number)); ret.add(new ActionPop()); - } else if (object instanceof GetPropertyTreeItem) { - GetPropertyTreeItem gp = (GetPropertyTreeItem) object; + } else if (object instanceof GetPropertyActionItem) { + GetPropertyActionItem gp = (GetPropertyActionItem) object; ret.addAll(gp.toSource(localData, generator)); ret.remove(ret.size() - 1); ret.addAll(gp.toSource(localData, generator)); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PostIncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java similarity index 74% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PostIncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java index 7b5f14210..7f825a9a2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PostIncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionPop; import com.jpexs.decompiler.flash.action.swf4.ActionPush; @@ -24,19 +24,19 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionIncrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +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; -public class PostIncrementTreeItem extends TreeItem implements SetTypeTreeItem { +public class PostIncrementActionItem extends ActionItem implements SetTypeActionItem { public GraphTargetItem object; private int tempRegister = -1; - public PostIncrementTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public PostIncrementActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_POSTFIX); this.object = object; } @@ -58,7 +58,7 @@ public class PostIncrementTreeItem extends TreeItem implements SetTypeTreeItem { @Override public GraphTargetItem getValue() { - return new AddTreeItem(null, object, new DirectValueTreeItem(null, 0, new Long(1), null), true); + return new AddActionItem(null, object, new DirectValueActionItem(null, 0, new Long(1), null), true); } @Override @@ -80,28 +80,28 @@ public class PostIncrementTreeItem extends TreeItem implements SetTypeTreeItem { public List toSourceIgnoreReturnValue(List localData, SourceGenerator generator) { List ret = new ArrayList<>(); - if (object instanceof GetVariableTreeItem) { - GetVariableTreeItem gv = (GetVariableTreeItem) object; + if (object instanceof GetVariableActionItem) { + GetVariableActionItem gv = (GetVariableActionItem) object; ret.addAll(gv.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetVariable ret.addAll(gv.toSource(localData, generator)); ret.add(new ActionIncrement()); ret.add(new ActionSetVariable()); - } else if (object instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) object; + } else if (object instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) object; ret.addAll(mem.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetMember ret.addAll(mem.toSource(localData, generator)); ret.add(new ActionIncrement()); ret.add(new ActionSetMember()); - } else if ((object instanceof DirectValueTreeItem) && ((DirectValueTreeItem) object).value instanceof RegisterNumber) { - RegisterNumber rn = (RegisterNumber) ((DirectValueTreeItem) object).value; + } else if ((object instanceof DirectValueActionItem) && ((DirectValueActionItem) object).value instanceof RegisterNumber) { + RegisterNumber rn = (RegisterNumber) ((DirectValueActionItem) object).value; ret.add(new ActionPush(new RegisterNumber(rn.number))); ret.add(new ActionIncrement()); ret.add(new ActionStoreRegister(rn.number)); ret.add(new ActionPop()); - } else if (object instanceof GetPropertyTreeItem) { - GetPropertyTreeItem gp = (GetPropertyTreeItem) object; + } else if (object instanceof GetPropertyActionItem) { + GetPropertyActionItem gp = (GetPropertyActionItem) object; ret.addAll(gp.toSource(localData, generator)); ret.remove(ret.size() - 1); ret.addAll(gp.toSource(localData, generator)); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrevFrameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrevFrameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java index 9025b3011..a085d2487 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrevFrameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionPrevFrame; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class PrevFrameTreeItem extends TreeItem { +public class PrevFrameActionItem extends ActionItem { @Override public String toString(ConstantPool constants) { return hilight("prevFrame()"); } - public PrevFrameTreeItem(GraphSourceItem instruction) { + public PrevFrameActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java similarity index 61% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java index b8452ce43..1b63cbb5f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class PrintTreeItem extends TreeItem { +public class PrintActionItem extends ActionItem { private GraphTargetItem target; private GraphTargetItem boundingBox; - public PrintTreeItem(GraphSourceItem instruction, GraphTargetItem target, GraphTargetItem boundingBox) { + public PrintActionItem(GraphSourceItem instruction, GraphTargetItem target, GraphTargetItem boundingBox) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; this.boundingBox = boundingBox; @@ -46,8 +46,8 @@ public class PrintTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; - return toSourceMerge(localData, generator, new AddTreeItem(src, asGenerator.pushConstTargetItem("print:#"), boundingBox, true), target, new ActionGetURL2(0, false, false)); + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; + return toSourceMerge(localData, generator, new AddActionItem(src, asGenerator.pushConstTargetItem("print:#"), boundingBox, true), target, new ActionGetURL2(0, false, false)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintAsBitmapTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java similarity index 59% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintAsBitmapTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java index 939d8839c..37268a6e7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintAsBitmapTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import static com.jpexs.decompiler.flash.graph.GraphTargetItem.PRECEDENCE_PRIMARY; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import static com.jpexs.decompiler.graph.GraphTargetItem.PRECEDENCE_PRIMARY; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class PrintAsBitmapTreeItem extends TreeItem { +public class PrintAsBitmapActionItem extends ActionItem { private GraphTargetItem target; private GraphTargetItem boundingBox; - public PrintAsBitmapTreeItem(GraphSourceItem instruction, GraphTargetItem target, GraphTargetItem boundingBox) { + public PrintAsBitmapActionItem(GraphSourceItem instruction, GraphTargetItem target, GraphTargetItem boundingBox) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; this.boundingBox = boundingBox; @@ -47,8 +47,8 @@ public class PrintAsBitmapTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; - return toSourceMerge(localData, generator, new AddTreeItem(src, asGenerator.pushConstTargetItem("printasbitmap:#"), boundingBox, true), target, new ActionGetURL2(0, false, false)); + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; + return toSourceMerge(localData, generator, new AddActionItem(src, asGenerator.pushConstTargetItem("printasbitmap:#"), boundingBox, true), target, new ActionGetURL2(0, false, false)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintAsBitmapNumTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java similarity index 59% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintAsBitmapNumTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java index 68d5dbcba..6964b719c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintAsBitmapNumTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class PrintAsBitmapNumTreeItem extends TreeItem { +public class PrintAsBitmapNumActionItem extends ActionItem { private GraphTargetItem num; private GraphTargetItem boundingBox; - public PrintAsBitmapNumTreeItem(GraphSourceItem instruction, GraphTargetItem num, GraphTargetItem boundingBox) { + public PrintAsBitmapNumActionItem(GraphSourceItem instruction, GraphTargetItem num, GraphTargetItem boundingBox) { super(instruction, PRECEDENCE_PRIMARY); this.num = num; this.boundingBox = boundingBox; @@ -46,9 +46,9 @@ public class PrintAsBitmapNumTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; - return toSourceMerge(localData, generator, new AddTreeItem(src, asGenerator.pushConstTargetItem("printasbitmap:#"), boundingBox, true), new AddTreeItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(0, false, false)); + return toSourceMerge(localData, generator, new AddActionItem(src, asGenerator.pushConstTargetItem("printasbitmap:#"), boundingBox, true), new AddActionItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(0, false, false)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintNumTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java similarity index 59% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintNumTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java index 456eb7d38..062424cd2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/PrintNumTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class PrintNumTreeItem extends TreeItem { +public class PrintNumActionItem extends ActionItem { private GraphTargetItem num; private GraphTargetItem boundingBox; - public PrintNumTreeItem(GraphSourceItem instruction, GraphTargetItem num, GraphTargetItem boundingBox) { + public PrintNumActionItem(GraphSourceItem instruction, GraphTargetItem num, GraphTargetItem boundingBox) { super(instruction, PRECEDENCE_PRIMARY); this.num = num; this.boundingBox = boundingBox; @@ -46,8 +46,8 @@ public class PrintNumTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; - return toSourceMerge(localData, generator, new AddTreeItem(src, asGenerator.pushConstTargetItem("print:#"), boundingBox, true), new AddTreeItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(0, false, false)); + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; + return toSourceMerge(localData, generator, new AddActionItem(src, asGenerator.pushConstTargetItem("print:#"), boundingBox, true), new AddActionItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(0, false, false)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RandomNumberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/RandomNumberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java index 3e9768919..46339f599 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RandomNumberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionRandomNumber; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class RandomNumberTreeItem extends TreeItem { +public class RandomNumberActionItem extends ActionItem { private GraphTargetItem maximum; - public RandomNumberTreeItem(GraphSourceItem instruction, GraphTargetItem maximum) { + public RandomNumberActionItem(GraphSourceItem instruction, GraphTargetItem maximum) { super(instruction, PRECEDENCE_PRIMARY); this.maximum = maximum; } @@ -37,8 +37,8 @@ public class RandomNumberTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(maximum.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RemoveSpriteTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/RemoveSpriteTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java index 150a26fe7..3c8c85be9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RemoveSpriteTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionRemoveSprite; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class RemoveSpriteTreeItem extends TreeItem { +public class RemoveSpriteActionItem extends ActionItem { private GraphTargetItem target; - public RemoveSpriteTreeItem(GraphSourceItem instruction, GraphTargetItem target) { + public RemoveSpriteActionItem(GraphSourceItem instruction, GraphTargetItem target) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; } @@ -37,8 +37,8 @@ public class RemoveSpriteTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(target.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ReturnTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java similarity index 75% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ReturnTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java index cfe8b561d..6509f4524 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ReturnTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionIf; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf4.ActionPush; @@ -26,17 +26,17 @@ import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.action.swf5.ActionReturn; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.ExitItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.ExitItem; +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; -public class ReturnTreeItem extends TreeItem implements ExitItem { +public class ReturnActionItem extends ActionItem implements ExitItem { //public GraphTargetItem value; - public ReturnTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public ReturnActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -47,8 +47,8 @@ public class ReturnTreeItem extends TreeItem implements ExitItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } @@ -60,7 +60,7 @@ public class ReturnTreeItem extends TreeItem implements ExitItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; List ret = new ArrayList<>(); int forinlevel = asGenerator.getForInLevel(localData); for (int i = 0; i < forinlevel; i++) { //Must POP all remaining values from enumerations (for..in) diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java index d6124d9c0..1f0b155ca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { +public class SetMemberActionItem extends ActionItem implements SetTypeActionItem { public GraphTargetItem object; public GraphTargetItem objectName; @@ -59,7 +59,7 @@ public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { return value; } - public SetMemberTreeItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem objectName, GraphTargetItem value) { + public SetMemberActionItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem objectName, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.object = object; this.objectName = objectName; @@ -68,8 +68,8 @@ public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { @Override public String toString(ConstantPool constants) { - if (!((objectName instanceof DirectValueTreeItem) && (((DirectValueTreeItem) objectName).value instanceof String))) { - //if(!(functionName instanceof GetVariableTreeItem)) + if (!((objectName instanceof DirectValueActionItem) && (((DirectValueActionItem) objectName).value instanceof String))) { + //if(!(functionName instanceof GetVariableActionItem)) return object.toString(constants) + "[" + stripQuotes(objectName, constants) + "]" + "=" + value.toString(constants); } return object.toString(constants) + "." + stripQuotes(objectName, constants) + "=" + value.toString(constants); @@ -77,12 +77,12 @@ public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { @Override public GraphTargetItem getObject() { - return new GetMemberTreeItem(src, object, objectName); + return new GetMemberActionItem(src, object, objectName); } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); ret.addAll(objectName.getNeededSources()); ret.addAll(value.getNeededSources()); @@ -96,7 +96,7 @@ public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; int tmpReg = asGenerator.getTempRegister(localData); return toSourceMerge(localData, generator, object, objectName, value, new ActionStoreRegister(tmpReg), new ActionSetMember(), new ActionPush(new RegisterNumber(tmpReg))); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java similarity index 75% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java index 8c78e5847..19fec3ba9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetProperty; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { +public class SetPropertyActionItem extends ActionItem implements SetTypeActionItem { public GraphTargetItem target; public int propertyIndex; @@ -60,7 +60,7 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { return value; } - public SetPropertyTreeItem(GraphSourceItem instruction, GraphTargetItem target, int propertyIndex, GraphTargetItem value) { + public SetPropertyActionItem(GraphSourceItem instruction, GraphTargetItem target, int propertyIndex, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.target = target; this.propertyIndex = propertyIndex; @@ -77,12 +77,12 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { @Override public GraphTargetItem getObject() { - return new GetPropertyTreeItem(src, target, propertyIndex); + return new GetPropertyActionItem(src, target, propertyIndex); } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(target.getNeededSources()); ret.addAll(value.getNeededSources()); return ret; @@ -95,7 +95,7 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; int tmpReg = asGenerator.getTempRegister(localData); return toSourceMerge(localData, generator, target, new ActionPush((Long) (long) propertyIndex), value, new ActionStoreRegister(tmpReg), new ActionSetProperty(), new ActionPush(new RegisterNumber(tmpReg))); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTarget2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java similarity index 69% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTarget2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java index 9e4da8275..b3c360467 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTarget2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class SetTarget2TreeItem extends TreeItem { +public class SetTarget2ActionItem extends ActionItem { public GraphTargetItem target; - public SetTarget2TreeItem(GraphSourceItem instruction, GraphTargetItem target) { + public SetTarget2ActionItem(GraphSourceItem instruction, GraphTargetItem target) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; } @@ -36,8 +36,8 @@ public class SetTarget2TreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(target.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTargetTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTargetTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java index b67b806e1..2ea37f308 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTargetTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class SetTargetTreeItem extends TreeItem { +public class SetTargetActionItem extends ActionItem { public String target; - public SetTargetTreeItem(GraphSourceItem instruction, String target) { + public SetTargetActionItem(GraphSourceItem instruction, String target) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTypeActionItem.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/SetTypeActionItem.java index ac7cbcff3..18a6afa40 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTypeActionItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; /** * * @author JPEXS */ -public interface SetTypeTreeItem { +public interface SetTypeActionItem { public GraphTargetItem getObject(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java index f01fee433..198bcf87b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetVariable; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { +public class SetVariableActionItem extends ActionItem implements SetTypeActionItem { public GraphTargetItem name; //public GraphTargetItem value; @@ -58,7 +58,7 @@ public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { return value; } - public SetVariableTreeItem(GraphSourceItem instruction, GraphTargetItem name, GraphTargetItem value) { + public SetVariableActionItem(GraphSourceItem instruction, GraphTargetItem name, GraphTargetItem value) { super(instruction, PRECEDENCE_ASSIGMENT); this.name = name; this.value = value; @@ -66,7 +66,7 @@ public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { @Override public String toString(ConstantPool constants) { - if (name instanceof DirectValueTreeItem || name instanceof GetVariableTreeItem) { + if (name instanceof DirectValueActionItem || name instanceof GetVariableActionItem) { return stripQuotes(name, constants) + hilight("=") + value.toString(constants); } else { return hilight("set(") + name.toString(constants) + hilight(",") + value.toString(constants) + hilight(")"); @@ -75,12 +75,12 @@ public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { @Override public GraphTargetItem getObject() { - return new GetVariableTreeItem(src, name); + return new GetVariableActionItem(src, name); } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(name.getNeededSources()); ret.addAll(value.getNeededSources()); return ret; @@ -98,7 +98,7 @@ public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; int tmpReg = asGenerator.getTempRegister(localData); return toSourceMerge(localData, generator, name, value, new ActionStoreRegister(tmpReg), new ActionSetVariable(), new ActionPush(new RegisterNumber(tmpReg))); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StartDragTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java similarity index 76% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StartDragTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java index 338f4f64e..cdff653e2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StartDragTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionStartDrag; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StartDragTreeItem extends TreeItem { +public class StartDragActionItem extends ActionItem { public GraphTargetItem target; public GraphTargetItem lockCenter; @@ -33,7 +33,7 @@ public class StartDragTreeItem extends TreeItem { public GraphTargetItem y1; public GraphTargetItem x1; - public StartDragTreeItem(GraphSourceItem instruction, GraphTargetItem target, GraphTargetItem lockCenter, GraphTargetItem constrain, GraphTargetItem x1, GraphTargetItem y1, GraphTargetItem x2, GraphTargetItem y2) { + public StartDragActionItem(GraphSourceItem instruction, GraphTargetItem target, GraphTargetItem lockCenter, GraphTargetItem constrain, GraphTargetItem x1, GraphTargetItem y1, GraphTargetItem x2, GraphTargetItem y2) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; this.lockCenter = lockCenter; @@ -47,7 +47,7 @@ public class StartDragTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { boolean hasConstrains = true; - if (constrain instanceof DirectValueTreeItem) { + if (constrain instanceof DirectValueActionItem) { if (Double.compare(EcmaScript.toNumber(constrain.getResult()), 0) == 0) { hasConstrains = false; } @@ -56,8 +56,8 @@ public class StartDragTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(target.getNeededSources()); ret.addAll(constrain.getNeededSources()); ret.addAll(x1.getNeededSources()); @@ -70,7 +70,7 @@ public class StartDragTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { boolean hasConstrains = true; - if (constrain instanceof DirectValueTreeItem) { + if (constrain instanceof DirectValueActionItem) { if (Double.compare(EcmaScript.toNumber(constrain.getResult()), 0) == 0) { hasConstrains = false; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java index 78b611c41..36c16bcb0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionStop; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StopTreeItem extends TreeItem { +public class StopActionItem extends ActionItem { @Override public String toString(ConstantPool constants) { return hilight("stop()"); } - public StopTreeItem(GraphSourceItem instruction) { + public StopActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopAllSoundsTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopAllSoundsTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java index 00f853059..20b029dc2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopAllSoundsTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionStopSounds; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StopAllSoundsTreeItem extends TreeItem { +public class StopAllSoundsActionItem extends ActionItem { @Override public String toString(ConstantPool constants) { return hilight("stopAllSounds()"); } - public StopAllSoundsTreeItem(GraphSourceItem instruction) { + public StopAllSoundsActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopDragTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopDragTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java index c9f3dee29..005c6e6b2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StopDragTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionEndDrag; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StopDragTreeItem extends TreeItem { +public class StopDragActionItem extends ActionItem { @Override public String toString(ConstantPool constants) { return hilight("stopDrag()"); } - public StopDragTreeItem(GraphSourceItem instruction) { + public StopDragActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StoreRegisterTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StoreRegisterTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java index 2cb69c178..f6320cb78 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StoreRegisterTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.graph.GraphPart; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StoreRegisterTreeItem extends TreeItem implements SetTypeTreeItem { +public class StoreRegisterActionItem extends ActionItem implements SetTypeActionItem { public RegisterNumber register; //public GraphTargetItem value; @@ -56,7 +56,7 @@ public class StoreRegisterTreeItem extends TreeItem implements SetTypeTreeItem { return value; } - public StoreRegisterTreeItem(GraphSourceItem instruction, RegisterNumber register, GraphTargetItem value, boolean define) { + public StoreRegisterActionItem(GraphSourceItem instruction, RegisterNumber register, GraphTargetItem value, boolean define) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; this.register = register; @@ -70,12 +70,12 @@ public class StoreRegisterTreeItem extends TreeItem implements SetTypeTreeItem { @Override public GraphTargetItem getObject() { - return new DirectValueTreeItem(src, -1, register, null); + return new DirectValueActionItem(src, -1, register, null); } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StrictModeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StrictModeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java index 79ad834e1..f54d137f0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StrictModeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItem; -public class StrictModeTreeItem extends TreeItem { +public class StrictModeActionItem extends ActionItem { public int mode; - public StrictModeTreeItem(GraphSourceItem instruction, int mode) { + public StrictModeActionItem(GraphSourceItem instruction, int mode) { super(instruction, PRECEDENCE_PRIMARY); this.mode = mode; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringExtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringExtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java index 84b4406be..1d828b717 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringExtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionStringExtract; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StringExtractTreeItem extends TreeItem { +public class StringExtractActionItem extends ActionItem { //public GraphTargetItem value; public GraphTargetItem index; public GraphTargetItem count; - public StringExtractTreeItem(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem index, GraphTargetItem count) { + public StringExtractActionItem(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem index, GraphTargetItem count) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; this.index = index; @@ -41,8 +41,8 @@ public class StringExtractTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); ret.addAll(index.getNeededSources()); ret.addAll(count.getNeededSources()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringLengthTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringLengthTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java index 14c4a772f..c3c08ce73 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringLengthTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionStringLength; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StringLengthTreeItem extends TreeItem { +public class StringLengthActionItem extends ActionItem { //public GraphTargetItem value; - public StringLengthTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public StringLengthActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TargetPathTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/TargetPathTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java index ff5b964bc..fe27ea924 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TargetPathTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionTargetPath; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class TargetPathTreeItem extends TreeItem { +public class TargetPathActionItem extends ActionItem { public GraphTargetItem object; - public TargetPathTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public TargetPathActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; } @@ -37,8 +37,8 @@ public class TargetPathTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ThrowTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java index 14de134b0..150987b61 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf7.ActionThrow; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class ThrowTreeItem extends TreeItem { +public class ThrowActionItem extends ActionItem { public GraphTargetItem object; - public ThrowTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public ThrowActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_PRIMARY); this.object = object; } @@ -40,7 +40,7 @@ public class ThrowTreeItem extends TreeItem { @Override public List getNeededSources() { - List ret = super.getNeededSources(); + List ret = super.getNeededSources(); ret.addAll(object.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToIntegerTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToIntegerTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java index 40c615c2c..f06576e29 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToIntegerTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionToInteger; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class ToIntegerTreeItem extends TreeItem { +public class ToIntegerActionItem extends ActionItem { private GraphTargetItem value; - public ToIntegerTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public ToIntegerActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -37,8 +37,8 @@ public class ToIntegerTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToNumberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToNumberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java index 46f83fa30..3dfea925e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToNumberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionToNumber; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class ToNumberTreeItem extends TreeItem { +public class ToNumberActionItem extends ActionItem { private GraphTargetItem value; - public ToNumberTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public ToNumberActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -38,8 +38,8 @@ public class ToNumberTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToStringTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToStringTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java index 5bb4ee4a2..af0e7006c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToStringTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionToString; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class ToStringTreeItem extends TreeItem { +public class ToStringActionItem extends ActionItem { private GraphTargetItem value; - public ToStringTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public ToStringActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -38,8 +38,8 @@ public class ToStringTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToggleHighQualityTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToggleHighQualityTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java index 54b828f3f..86bdf036a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToggleHighQualityTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionToggleQuality; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class ToggleHighQualityTreeItem extends TreeItem { +public class ToggleHighQualityActionItem extends ActionItem { @Override public String toString(ConstantPool constants) { return hilight("toggleHighQuality()"); } - public ToggleHighQualityTreeItem(GraphSourceItem instruction) { + public ToggleHighQualityActionItem(GraphSourceItem instruction) { super(instruction, PRECEDENCE_PRIMARY); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TraceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/TraceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java index ecff3e7f7..aec0fe2e1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TraceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionTrace; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class TraceTreeItem extends TreeItem { +public class TraceActionItem extends ActionItem { private GraphTargetItem value; - public TraceTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public TraceActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -37,8 +37,8 @@ public class TraceTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TypeOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/TypeOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java index 5a17847f7..2d312b5b0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TypeOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionTypeOf; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.ecma.EcmaType; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; -public class TypeOfTreeItem extends TreeItem { +public class TypeOfActionItem extends ActionItem { private GraphTargetItem value; - public TypeOfTreeItem(GraphSourceItem instruction, GraphTargetItem value) { + public TypeOfActionItem(GraphSourceItem instruction, GraphTargetItem value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } @@ -40,8 +40,8 @@ public class TypeOfTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnLoadMovieTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnLoadMovieTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java index fc0ea8ecd..4caf1f4b2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnLoadMovieTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class UnLoadMovieTreeItem extends TreeItem { +public class UnLoadMovieActionItem extends ActionItem { private GraphTargetItem targetString; - public UnLoadMovieTreeItem(GraphSourceItem instruction, GraphTargetItem targetString) { + public UnLoadMovieActionItem(GraphSourceItem instruction, GraphTargetItem targetString) { super(instruction, PRECEDENCE_PRIMARY); this.targetString = targetString; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnLoadMovieNumTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java similarity index 63% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnLoadMovieNumTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java index e11c293b9..ad57533e3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnLoadMovieNumTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** * * @author JPEXS */ -public class UnLoadMovieNumTreeItem extends TreeItem { +public class UnLoadMovieNumActionItem extends ActionItem { private GraphTargetItem num; - public UnLoadMovieNumTreeItem(GraphSourceItem instruction, GraphTargetItem num) { + public UnLoadMovieNumActionItem(GraphSourceItem instruction, GraphTargetItem num) { super(instruction, PRECEDENCE_PRIMARY); this.num = num; } @@ -45,8 +45,8 @@ public class UnLoadMovieNumTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; - return toSourceMerge(localData, generator, new ActionPush(""), new AddTreeItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(0, true, false)); + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; + return toSourceMerge(localData, generator, new ActionPush(""), new AddActionItem(src, asGenerator.pushConstTargetItem("_level"), num, true), new ActionGetURL2(0, true, false)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnsupportedTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnsupportedTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java index 69d005f6f..e8329731c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnsupportedTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel; +package com.jpexs.decompiler.flash.action.model; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItem; -public class UnsupportedTreeItem extends TreeItem { +public class UnsupportedActionItem extends ActionItem { public String value; - public UnsupportedTreeItem(GraphSourceItem instruction, String value) { + public UnsupportedActionItem(GraphSourceItem instruction, String value) { super(instruction, PRECEDENCE_PRIMARY); this.value = value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java similarity index 78% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java index 63927a2d3..4c72ab147 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.Block; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import java.util.ArrayList; import java.util.List; -public class ClassTreeItem extends TreeItem implements Block { +public class ClassActionItem extends ActionItem implements Block { public List functions; public List staticFunctions; @@ -49,7 +49,7 @@ public class ClassTreeItem extends TreeItem implements Block { return ret; } - public ClassTreeItem(GraphTargetItem className, GraphTargetItem extendsOp, List implementsOp, GraphTargetItem constructor, List functions, List> vars, List staticFunctions, List> staticVars) { + public ClassActionItem(GraphTargetItem className, GraphTargetItem extendsOp, List implementsOp, GraphTargetItem constructor, List functions, List> vars, List staticFunctions, List> staticVars) { super(null, NOPRECEDENCE); this.className = className; this.functions = functions; @@ -110,7 +110,7 @@ public class ClassTreeItem extends TreeItem implements Block { @Override public List toSource(List localData, SourceGenerator generator) { List ret = new ArrayList<>(); - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; @SuppressWarnings("unchecked") List localData2 = (List) Helper.deepCopy(localData); asGenerator.setInMethod(localData2, true); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java similarity index 79% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForInTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java index 2574eecd2..c0ff95409 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionIf; import com.jpexs.decompiler.flash.action.swf4.ActionJump; import com.jpexs.decompiler.flash.action.swf4.ActionPop; @@ -28,20 +28,20 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; import com.jpexs.decompiler.flash.action.swf6.ActionEnumerate2; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.flash.graph.Block; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.Loop; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -public class ForInTreeItem extends LoopTreeItem implements Block { +public class ForInActionItem extends LoopActionItem implements Block { public GraphTargetItem variableName; public GraphTargetItem enumVariable; @@ -54,7 +54,7 @@ public class ForInTreeItem extends LoopTreeItem implements Block { return ret; } - public ForInTreeItem(Action instruction, Loop loop, GraphTargetItem variableName, GraphTargetItem enumVariable, List commands) { + public ForInActionItem(Action instruction, Loop loop, GraphTargetItem variableName, GraphTargetItem enumVariable, List commands) { super(instruction, loop); this.variableName = variableName; this.enumVariable = enumVariable; @@ -65,7 +65,7 @@ public class ForInTreeItem extends LoopTreeItem implements Block { public String toString(ConstantPool constants) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; - ret += hilight("for(") + ((variableName instanceof DirectValueTreeItem) && (((DirectValueTreeItem) variableName).value instanceof RegisterNumber) ? "var " : "") + stripQuotes(variableName, constants) + " in " + enumVariable.toString(constants) + ")\r\n{\r\n"; + ret += hilight("for(") + ((variableName instanceof DirectValueActionItem) && (((DirectValueActionItem) variableName).value instanceof RegisterNumber) ? "var " : "") + stripQuotes(variableName, constants) + " in " + enumVariable.toString(constants) + ")\r\n{\r\n"; for (GraphTargetItem ti : commands) { ret += ti.toStringSemicoloned(constants) + "\r\n"; } @@ -91,7 +91,7 @@ public class ForInTreeItem extends LoopTreeItem implements Block { @Override public List toSource(List localData, SourceGenerator generator) { List ret = new ArrayList<>(); - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; HashMap registerVars = asGenerator.getRegisterVars(localData); ret.addAll(enumVariable.toSource(localData, generator)); ret.add(new ActionEnumerate2()); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/IfFrameLoadedTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/IfFrameLoadedTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java index 1f9df7f1c..28f70ba73 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/IfFrameLoadedTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.action.swf4.ActionWaitForFrame2; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.Block; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.Graph; +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; @@ -32,12 +32,12 @@ import java.util.List; * * @author JPEXS */ -public class IfFrameLoadedTreeItem extends TreeItem implements Block { +public class IfFrameLoadedActionItem extends ActionItem implements Block { private List actions; private GraphTargetItem frame; - public IfFrameLoadedTreeItem(GraphTargetItem frame, List actions, GraphSourceItem instruction) { + public IfFrameLoadedActionItem(GraphTargetItem frame, List actions, GraphSourceItem instruction) { super(instruction, NOPRECEDENCE); this.actions = actions; this.frame = frame; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/InterfaceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/InterfaceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java index 3eed70f39..85c7a1856 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/InterfaceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.ActionItem; +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; @@ -30,12 +30,12 @@ import java.util.List; * * @author JPEXS */ -public class InterfaceTreeItem extends TreeItem { +public class InterfaceActionItem extends ActionItem { public GraphTargetItem name; public List superInterfaces; - public InterfaceTreeItem(GraphTargetItem name, List superInterfaces) { + public InterfaceActionItem(GraphTargetItem name, List superInterfaces) { super(null, NOPRECEDENCE); this.name = name; this.superInterfaces = superInterfaces; @@ -68,7 +68,7 @@ public class InterfaceTreeItem extends TreeItem { @Override public List toSource(List localData, SourceGenerator generator) { List ret = new ArrayList<>(); - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; ret.addAll(asGenerator.generateTraits(localData, true, name, null, superInterfaces, null, null, null, null, null)); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/LoopTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/LoopActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/LoopTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/LoopActionItem.java index b959b9edd..bba2d5b0a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/LoopTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/LoopActionItem.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.Loop; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.graph.Loop; -public abstract class LoopTreeItem extends TreeItem { +public abstract class LoopActionItem extends ActionItem { public Loop loop; - public LoopTreeItem(Action instruction, Loop loop) { + public LoopActionItem(Action instruction, Loop loop) { super(instruction, NOPRECEDENCE); this.loop = loop; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TellTargetTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TellTargetTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java index e78c6046b..282a5a2a9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TellTargetTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java @@ -14,23 +14,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.ActionItem; import com.jpexs.decompiler.flash.action.swf3.ActionSetTarget; import com.jpexs.decompiler.flash.action.swf4.ActionSetTarget2; -import com.jpexs.decompiler.flash.action.treemodel.*; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +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; -public class TellTargetTreeItem extends TreeItem { +public class TellTargetActionItem extends ActionItem { public List commands; public GraphTargetItem target; - public TellTargetTreeItem(GraphSourceItem instruction, GraphTargetItem target, List commands) { + public TellTargetActionItem(GraphSourceItem instruction, GraphTargetItem target, List commands) { super(instruction, PRECEDENCE_PRIMARY); this.target = target; this.commands = commands; @@ -47,8 +48,8 @@ public class TellTargetTreeItem extends TreeItem { } @Override - public List getNeededSources() { - List ret = super.getNeededSources(); + public List getNeededSources() { + List ret = super.getNeededSources(); ret.addAll(target.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java index 72809c045..f4e098689 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionJump; import com.jpexs.decompiler.flash.action.swf7.ActionTry; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.Block; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.model.ContinueItem; +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; -public class TryTreeItem extends TreeItem implements Block { +public class TryActionItem extends ActionItem implements Block { public List tryCommands; public List catchExceptions; @@ -47,7 +47,7 @@ public class TryTreeItem extends TreeItem implements Block { return ret; } - public TryTreeItem(List tryCommands, List catchExceptions, List> catchCommands, List finallyCommands) { + public TryActionItem(List tryCommands, List catchExceptions, List> catchCommands, List finallyCommands) { super(null, NOPRECEDENCE); this.tryCommands = tryCommands; this.catchExceptions = catchExceptions; @@ -131,7 +131,7 @@ public class TryTreeItem extends TreeItem implements Block { @Override public List toSource(List localData, SourceGenerator generator) { List ret = new ArrayList<>(); - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; List tryCommandsA = asGenerator.toActionList(asGenerator.generate(localData, tryCommands)); List finallyCommandsA = finallyCommands == null ? null : asGenerator.toActionList(asGenerator.generate(localData, finallyCommands)); List catchCommandsA = null; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java index 433f373bd..f0695a26d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java @@ -14,31 +14,31 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf5.ActionWith; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.ActionItem; +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; -public class WithTreeItem extends TreeItem { +public class WithActionItem extends ActionItem { public GraphTargetItem scope; public List items; - public WithTreeItem(Action instruction, GraphTargetItem scope, List items) { + public WithActionItem(Action instruction, GraphTargetItem scope, List items) { super(instruction, NOPRECEDENCE); this.scope = scope; this.items = items; } - public WithTreeItem(Action instruction, TreeItem scope) { + public WithActionItem(Action instruction, ActionItem scope) { super(instruction, NOPRECEDENCE); this.scope = scope; this.items = new ArrayList<>(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AddTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java index 0be94c5d1..cf7243be5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf5.ActionAdd2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class AddTreeItem extends BinaryOpItem { +public class AddActionItem extends BinaryOpItem { boolean version2; - public AddTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { + public AddActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { super(instruction, PRECEDENCE_ADDITIVE, leftSide, rightSide, "+"); this.version2 = version2; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AndActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/AndActionItem.java index 86219d34d..3ad5f8e9a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AndActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionAnd; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class AndTreeItem extends BinaryOpItem { +public class AndActionItem extends BinaryOpItem { - public AndTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public AndActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_LOGICALAND, leftSide, rightSide, "&&"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitAndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitAndActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitAndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitAndActionItem.java index c8dad68f7..6468aea38 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitAndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitAndActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitAnd; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class BitAndTreeItem extends BinaryOpItem { +public class BitAndActionItem extends BinaryOpItem { - public BitAndTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public BitAndActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISEAND, leftSide, rightSide, "&"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitOrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitOrActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitOrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitOrActionItem.java index 4c4b1ac67..dbf92e34c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitOrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitOrActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitOr; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class BitOrTreeItem extends BinaryOpItem { +public class BitOrActionItem extends BinaryOpItem { - public BitOrTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public BitOrActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISEOR, leftSide, rightSide, "|"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitXorTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitXorActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitXorTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitXorActionItem.java index 99ab35cf1..f8bbfc33e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitXorTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitXorActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitXor; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class BitXorTreeItem extends BinaryOpItem { +public class BitXorActionItem extends BinaryOpItem { - public BitXorTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public BitXorActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISEXOR, leftSide, rightSide, "^"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/DivideTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/DivideActionItem.java similarity index 74% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/DivideTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/DivideActionItem.java index 04a2e52f8..6624202af 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/DivideTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/DivideActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionDivide; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class DivideTreeItem extends BinaryOpItem { +public class DivideActionItem extends BinaryOpItem { - public DivideTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public DivideActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_MULTIPLICATIVE, leftSide, rightSide, "/"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/EqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/EqActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/EqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/EqActionItem.java index 300b94627..66c2707df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/EqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/EqActionItem.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class EqTreeItem extends BinaryOpItem implements LogicalOpItem { +public class EqActionItem extends BinaryOpItem implements LogicalOpItem { boolean version2; - public EqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { + public EqActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "=="); this.version2 = version2; } @@ -47,7 +47,7 @@ public class EqTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new NeqTreeItem(src, leftSide, rightSide, version2); + return new NeqActionItem(src, leftSide, rightSide, version2); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GeActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/GeActionItem.java index d634476cf..9917c05f9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GeActionItem.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf5.ActionLess2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GeTreeItem extends BinaryOpItem implements LogicalOpItem, Inverted { +public class GeActionItem extends BinaryOpItem implements LogicalOpItem, Inverted { boolean version2; - public GeTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { + public GeActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, ">="); this.version2 = version2; } @@ -55,7 +55,7 @@ public class GeTreeItem extends BinaryOpItem implements LogicalOpItem, Inverted @Override public GraphTargetItem invert() { - return new LtTreeItem(src, leftSide, rightSide, version2); + return new LtActionItem(src, leftSide, rightSide, version2); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GtActionItem.java similarity index 67% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/GtActionItem.java index fbb2554ce..50e29b59e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GtActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf6.ActionGreater; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class GtTreeItem extends BinaryOpItem implements LogicalOpItem { +public class GtActionItem extends BinaryOpItem implements LogicalOpItem { - public GtTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public GtActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, ">"); } @@ -38,7 +38,7 @@ public class GtTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new LeTreeItem(src, leftSide, rightSide); + return new LeActionItem(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InActionItem.java similarity index 68% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/InActionItem.java index 3999b95d2..3a430acb0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InActionItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; -public class InTreeItem extends BinaryOpItem { +public class InActionItem extends BinaryOpItem { - public InTreeItem(GraphSourceItem instruction, TreeItem name, TreeItem object) { + public InActionItem(GraphSourceItem instruction, ActionItem name, ActionItem object) { super(instruction, PRECEDENCE_RELATIONAL, name, object, " in "); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InstanceOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InstanceOfActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InstanceOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/InstanceOfActionItem.java index 1513a8eaf..f9c268912 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InstanceOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InstanceOfActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf6.ActionInstanceOf; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class InstanceOfTreeItem extends BinaryOpItem { +public class InstanceOfActionItem extends BinaryOpItem { - public InstanceOfTreeItem(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem type) { + public InstanceOfActionItem(GraphSourceItem instruction, GraphTargetItem value, GraphTargetItem type) { super(instruction, PRECEDENCE_RELATIONAL, value, type, " instanceof "); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/Inverted.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/Inverted.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/Inverted.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/Inverted.java index 573b7e1dd..8f88563c2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/Inverted.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/Inverted.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; /** * diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LShiftActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/LShiftActionItem.java index 33f31c499..4e51fd897 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LShiftActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitLShift; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class LShiftTreeItem extends BinaryOpItem { +public class LShiftActionItem extends BinaryOpItem { - public LShiftTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public LShiftActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISESHIFT, leftSide, rightSide, "<<"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LeActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/LeActionItem.java index d399cf861..f1ec618ef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LeActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf6.ActionGreater; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class LeTreeItem extends BinaryOpItem implements LogicalOpItem, Inverted { +public class LeActionItem extends BinaryOpItem implements LogicalOpItem, Inverted { - public LeTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public LeActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, "<="); } @@ -46,7 +46,7 @@ public class LeTreeItem extends BinaryOpItem implements LogicalOpItem, Inverted @Override public GraphTargetItem invert() { - return new GtTreeItem(src, leftSide, rightSide); + return new GtActionItem(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LtActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/LtActionItem.java index 557865960..6cf72a0dd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LtActionItem.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf5.ActionLess2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class LtTreeItem extends BinaryOpItem implements LogicalOpItem { +public class LtActionItem extends BinaryOpItem implements LogicalOpItem { boolean version2; - public LtTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { + public LtActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, "<"); this.version2 = version2; } @@ -47,7 +47,7 @@ public class LtTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new GeTreeItem(src, leftSide, rightSide, version2); + return new GeActionItem(src, leftSide, rightSide, version2); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/ModuloTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/ModuloActionItem.java similarity index 74% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/ModuloTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/ModuloActionItem.java index 8e991e032..5bc637fd3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/ModuloTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/ModuloActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionModulo; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class ModuloTreeItem extends BinaryOpItem { +public class ModuloActionItem extends BinaryOpItem { - public ModuloTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public ModuloActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_MULTIPLICATIVE, leftSide, rightSide, "%"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/MultiplyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/MultiplyActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/MultiplyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/MultiplyActionItem.java index 52dc422dd..98c0c00df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/MultiplyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/MultiplyActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionMultiply; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class MultiplyTreeItem extends BinaryOpItem { +public class MultiplyActionItem extends BinaryOpItem { - public MultiplyTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public MultiplyActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_MULTIPLICATIVE, leftSide, rightSide, "*"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/NeqActionItem.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/NeqActionItem.java index 50cd959c1..814c8bfe1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/NeqActionItem.java @@ -14,24 +14,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class NeqTreeItem extends BinaryOpItem implements LogicalOpItem, Inverted { +public class NeqActionItem extends BinaryOpItem implements LogicalOpItem, Inverted { boolean version2; - public NeqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { + public NeqActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide, boolean version2) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "!="); this.version2 = version2; } @@ -48,7 +48,7 @@ public class NeqTreeItem extends BinaryOpItem implements LogicalOpItem, Inverted @Override public GraphTargetItem invert() { - return new EqTreeItem(src, leftSide, rightSide, version2); + return new EqActionItem(src, leftSide, rightSide, version2); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/OrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/OrActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/OrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/OrActionItem.java index 149356522..ca1406b30 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/OrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/OrActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionOr; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class OrTreeItem extends BinaryOpItem { +public class OrActionItem extends BinaryOpItem { - public OrTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public OrActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_LOGICALOR, leftSide, rightSide, "||"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreDecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreDecrementActionItem.java similarity index 66% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreDecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreDecrementActionItem.java index 278c80cb8..8da277b14 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreDecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreDecrementActionItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetProperty; import com.jpexs.decompiler.flash.action.swf4.ActionSetVariable; @@ -24,21 +24,21 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionDecrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetPropertyTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; -import com.jpexs.decompiler.flash.graph.UnaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.UnaryOpItem; import java.util.ArrayList; import java.util.List; -public class PreDecrementTreeItem extends UnaryOpItem { +public class PreDecrementActionItem extends UnaryOpItem { - public PreDecrementTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public PreDecrementActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_UNARY, object, "--"); } @@ -49,11 +49,11 @@ public class PreDecrementTreeItem extends UnaryOpItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; List ret = new ArrayList<>(); - if (value instanceof GetVariableTreeItem) { - GetVariableTreeItem gv = (GetVariableTreeItem) value; + if (value instanceof GetVariableActionItem) { + GetVariableActionItem gv = (GetVariableActionItem) value; ret.addAll(gv.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetVariable ret.addAll(gv.toSource(localData, generator)); @@ -62,8 +62,8 @@ public class PreDecrementTreeItem extends UnaryOpItem { ret.add(new ActionStoreRegister(tmpReg)); ret.add(new ActionSetVariable()); ret.add(new ActionPush(new RegisterNumber(tmpReg))); - } else if (value instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) value; + } else if (value instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) value; ret.addAll(mem.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetMember ret.addAll(mem.toSource(localData, generator)); @@ -72,13 +72,13 @@ public class PreDecrementTreeItem extends UnaryOpItem { ret.add(new ActionStoreRegister(tmpReg)); ret.add(new ActionSetMember()); ret.add(new ActionPush(new RegisterNumber(tmpReg))); - } else if ((value instanceof DirectValueTreeItem) && ((DirectValueTreeItem) value).value instanceof RegisterNumber) { - RegisterNumber rn = (RegisterNumber) ((DirectValueTreeItem) value).value; + } else if ((value instanceof DirectValueActionItem) && ((DirectValueActionItem) value).value instanceof RegisterNumber) { + RegisterNumber rn = (RegisterNumber) ((DirectValueActionItem) value).value; ret.add(new ActionPush(new RegisterNumber(rn.number))); ret.add(new ActionDecrement()); ret.add(new ActionStoreRegister(rn.number)); - } else if (value instanceof GetPropertyTreeItem) { - GetPropertyTreeItem gp = (GetPropertyTreeItem) value; + } else if (value instanceof GetPropertyActionItem) { + GetPropertyActionItem gp = (GetPropertyActionItem) value; ret.addAll(gp.toSource(localData, generator)); // old value ret.addAll(gp.toSource(localData, generator)); ret.remove(ret.size() - 1); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreIncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreIncrementActionItem.java similarity index 66% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreIncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreIncrementActionItem.java index 3c13cb4a0..1a7133c9b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreIncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreIncrementActionItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; -import com.jpexs.decompiler.flash.action.parser.script.ActionScriptSourceGenerator; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetProperty; import com.jpexs.decompiler.flash.action.swf4.ActionSetVariable; @@ -24,21 +24,21 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionIncrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetPropertyTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; -import com.jpexs.decompiler.flash.graph.UnaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.UnaryOpItem; import java.util.ArrayList; import java.util.List; -public class PreIncrementTreeItem extends UnaryOpItem { +public class PreIncrementActionItem extends UnaryOpItem { - public PreIncrementTreeItem(GraphSourceItem instruction, GraphTargetItem object) { + public PreIncrementActionItem(GraphSourceItem instruction, GraphTargetItem object) { super(instruction, PRECEDENCE_UNARY, object, "++"); } @@ -49,11 +49,11 @@ public class PreIncrementTreeItem extends UnaryOpItem { @Override public List toSource(List localData, SourceGenerator generator) { - ActionScriptSourceGenerator asGenerator = (ActionScriptSourceGenerator) generator; + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; List ret = new ArrayList<>(); - if (value instanceof GetVariableTreeItem) { - GetVariableTreeItem gv = (GetVariableTreeItem) value; + if (value instanceof GetVariableActionItem) { + GetVariableActionItem gv = (GetVariableActionItem) value; ret.addAll(gv.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetVariable ret.addAll(gv.toSource(localData, generator)); @@ -62,8 +62,8 @@ public class PreIncrementTreeItem extends UnaryOpItem { ret.add(new ActionStoreRegister(tmpReg)); ret.add(new ActionSetVariable()); ret.add(new ActionPush(new RegisterNumber(tmpReg))); - } else if (value instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) value; + } else if (value instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) value; ret.addAll(mem.toSource(localData, generator)); ret.remove(ret.size() - 1); //ActionGetMember ret.addAll(mem.toSource(localData, generator)); @@ -72,13 +72,13 @@ public class PreIncrementTreeItem extends UnaryOpItem { ret.add(new ActionStoreRegister(tmpReg)); ret.add(new ActionSetMember()); ret.add(new ActionPush(new RegisterNumber(tmpReg))); - } else if ((value instanceof DirectValueTreeItem) && ((DirectValueTreeItem) value).value instanceof RegisterNumber) { - RegisterNumber rn = (RegisterNumber) ((DirectValueTreeItem) value).value; + } else if ((value instanceof DirectValueActionItem) && ((DirectValueActionItem) value).value instanceof RegisterNumber) { + RegisterNumber rn = (RegisterNumber) ((DirectValueActionItem) value).value; ret.add(new ActionPush(new RegisterNumber(rn.number))); ret.add(new ActionIncrement()); ret.add(new ActionStoreRegister(rn.number)); - } else if (value instanceof GetPropertyTreeItem) { - GetPropertyTreeItem gp = (GetPropertyTreeItem) value; + } else if (value instanceof GetPropertyActionItem) { + GetPropertyActionItem gp = (GetPropertyActionItem) value; ret.addAll(gp.toSource(localData, generator)); // old value ret.addAll(gp.toSource(localData, generator)); ret.remove(ret.size() - 1); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/RShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/RShiftActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/RShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/RShiftActionItem.java index 80d787273..5c7ccc05b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/RShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/RShiftActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitRShift; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class RShiftTreeItem extends BinaryOpItem { +public class RShiftActionItem extends BinaryOpItem { - public RShiftTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public RShiftActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISESHIFT, leftSide, rightSide, ">>"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictEqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictEqActionItem.java similarity index 68% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictEqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictEqActionItem.java index ce40b6a11..828cce803 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictEqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictEqActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StrictEqTreeItem extends BinaryOpItem implements LogicalOpItem { +public class StrictEqActionItem extends BinaryOpItem implements LogicalOpItem { - public StrictEqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public StrictEqActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "==="); } @@ -41,7 +41,7 @@ public class StrictEqTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new StrictNeqTreeItem(src, leftSide, rightSide); + return new StrictNeqActionItem(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictNeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictNeqActionItem.java similarity index 69% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictNeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictNeqActionItem.java index ac313c90d..a834cb170 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictNeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictNeqActionItem.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.LogicalOpItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StrictNeqTreeItem extends BinaryOpItem implements LogicalOpItem { +public class StrictNeqActionItem extends BinaryOpItem implements LogicalOpItem { - public StrictNeqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public StrictNeqActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "!=="); } @@ -42,7 +42,7 @@ public class StrictNeqTreeItem extends BinaryOpItem implements LogicalOpItem { @Override public GraphTargetItem invert() { - return new StrictEqTreeItem(src, leftSide, rightSide); + return new StrictEqActionItem(src, leftSide, rightSide); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringAddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringAddTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java index fe3c9ffbc..2ce5e865f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringAddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionStringAdd; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StringAddTreeItem extends BinaryOpItem { +public class StringAddActionItem extends BinaryOpItem { - public StringAddTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public StringAddActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_ADDITIVE, leftSide, rightSide, "+"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringEqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringEqActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringEqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringEqActionItem.java index aaeddd2c0..8c5dbd3aa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringEqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringEqActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionStringEquals; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StringEqTreeItem extends BinaryOpItem { +public class StringEqActionItem extends BinaryOpItem { - public StringEqTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public StringEqActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_EQUALITY, leftSide, rightSide, "=="); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringLtActionItem.java similarity index 70% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringLtActionItem.java index a3ca56799..d02a44e13 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringLtActionItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionStringLess; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class StringLtTreeItem extends BinaryOpItem { +public class StringLtActionItem extends BinaryOpItem { - public StringLtTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public StringLtActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_RELATIONAL, leftSide, rightSide, "<"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/SubtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/SubtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java index b423abb06..bd4b6333b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/SubtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionSubtract; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class SubtractTreeItem extends BinaryOpItem { +public class SubtractActionItem extends BinaryOpItem { - public SubtractTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public SubtractActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_ADDITIVE, leftSide, rightSide, "-"); } @@ -38,7 +38,7 @@ public class SubtractTreeItem extends BinaryOpItem { @Override public String toString(List localData) { - if (rightSide instanceof DirectValueTreeItem) { + if (rightSide instanceof DirectValueActionItem) { return super.toString(localData); } String ret = ""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/URShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/URShiftActionItem.java similarity index 72% rename from trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/URShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/model/operations/URShiftActionItem.java index dd98ef3a1..d49842944 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/URShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/URShiftActionItem.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitURShift; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.BinaryOpItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; -public class URShiftTreeItem extends BinaryOpItem { +public class URShiftActionItem extends BinaryOpItem { - public URShiftTreeItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { + public URShiftActionItem(GraphSourceItem instruction, GraphTargetItem leftSide, GraphTargetItem rightSide) { super(instruction, PRECEDENCE_BITWISESHIFT, leftSide, rightSide, ">>>"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java index 2c58924dc..12d53ad61 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java @@ -27,7 +27,7 @@ import com.jpexs.decompiler.flash.action.swf4.*; import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.action.swf6.*; import com.jpexs.decompiler.flash.action.swf7.*; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.IOException; import java.io.Reader; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java index 9e378d240..18fec4a62 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java @@ -20,112 +20,112 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.swf4.*; import com.jpexs.decompiler.flash.action.swf5.*; -import com.jpexs.decompiler.flash.action.treemodel.AsciiToCharTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.CallFunctionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.CallMethodTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.CallTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.CharToAsciiTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.CloneSpriteTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.DefineLocalTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.DefineRegisterTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.DeleteTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.EvalTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetTimeTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetURL2TreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVersionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GotoFrame2TreeItem; -import com.jpexs.decompiler.flash.action.treemodel.InitArrayTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.InitObjectTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadMovieNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadMovieTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadVariablesNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadVariablesTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.MBAsciiToCharTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.MBCharToAsciiTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.MBStringExtractTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.MBStringLengthTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.NewMethodTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.NewObjectTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.NextFrameTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PlayTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrevFrameTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintAsBitmapNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintAsBitmapTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.RandomNumberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.RemoveSpriteTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ReturnTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetVariableTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StartDragTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StopAllSoundsTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StopDragTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StopTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StringExtractTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StringLengthTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ThrowTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ToIntegerTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ToNumberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ToStringTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ToggleHighQualityTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.TraceTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.TypeOfTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.UnLoadMovieNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.UnLoadMovieTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.ClassTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.ForInTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.IfFrameLoadedTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.InterfaceTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.TellTargetTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.TryTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.WithTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.BitAndTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.BitOrTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.BitXorTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.DivideTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.EqTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.GeTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.GtTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.InstanceOfTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.LeTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.LtTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.ModuloTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.MultiplyTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.NeqTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.PreDecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.PreIncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.StrictEqTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.StrictNeqTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.action.model.AsciiToCharActionItem; +import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; +import com.jpexs.decompiler.flash.action.model.CallMethodActionItem; +import com.jpexs.decompiler.flash.action.model.CallActionItem; +import com.jpexs.decompiler.flash.action.model.CharToAsciiActionItem; +import com.jpexs.decompiler.flash.action.model.CloneSpriteActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DefineLocalActionItem; +import com.jpexs.decompiler.flash.action.model.DefineRegisterActionItem; +import com.jpexs.decompiler.flash.action.model.DeleteActionItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.EvalActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetTimeActionItem; +import com.jpexs.decompiler.flash.action.model.GetURL2ActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.GetVersionActionItem; +import com.jpexs.decompiler.flash.action.model.GotoFrame2ActionItem; +import com.jpexs.decompiler.flash.action.model.InitArrayActionItem; +import com.jpexs.decompiler.flash.action.model.InitObjectActionItem; +import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.model.LoadMovieActionItem; +import com.jpexs.decompiler.flash.action.model.LoadVariablesNumActionItem; +import com.jpexs.decompiler.flash.action.model.LoadVariablesActionItem; +import com.jpexs.decompiler.flash.action.model.MBAsciiToCharActionItem; +import com.jpexs.decompiler.flash.action.model.MBCharToAsciiActionItem; +import com.jpexs.decompiler.flash.action.model.MBStringExtractActionItem; +import com.jpexs.decompiler.flash.action.model.MBStringLengthActionItem; +import com.jpexs.decompiler.flash.action.model.NewMethodActionItem; +import com.jpexs.decompiler.flash.action.model.NewObjectActionItem; +import com.jpexs.decompiler.flash.action.model.NextFrameActionItem; +import com.jpexs.decompiler.flash.action.model.PlayActionItem; +import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; +import com.jpexs.decompiler.flash.action.model.PrevFrameActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapNumActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapActionItem; +import com.jpexs.decompiler.flash.action.model.PrintNumActionItem; +import com.jpexs.decompiler.flash.action.model.PrintActionItem; +import com.jpexs.decompiler.flash.action.model.RandomNumberActionItem; +import com.jpexs.decompiler.flash.action.model.RemoveSpriteActionItem; +import com.jpexs.decompiler.flash.action.model.ReturnActionItem; +import com.jpexs.decompiler.flash.action.model.SetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.SetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.StartDragActionItem; +import com.jpexs.decompiler.flash.action.model.StopAllSoundsActionItem; +import com.jpexs.decompiler.flash.action.model.StopDragActionItem; +import com.jpexs.decompiler.flash.action.model.StopActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.flash.action.model.StringExtractActionItem; +import com.jpexs.decompiler.flash.action.model.StringLengthActionItem; +import com.jpexs.decompiler.flash.action.model.ThrowActionItem; +import com.jpexs.decompiler.flash.action.model.ToIntegerActionItem; +import com.jpexs.decompiler.flash.action.model.ToNumberActionItem; +import com.jpexs.decompiler.flash.action.model.ToStringActionItem; +import com.jpexs.decompiler.flash.action.model.ToggleHighQualityActionItem; +import com.jpexs.decompiler.flash.action.model.TraceActionItem; +import com.jpexs.decompiler.flash.action.model.TypeOfActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.ForInActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.InterfaceActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.TellTargetActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.TryActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.WithActionItem; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.flash.action.model.operations.BitAndActionItem; +import com.jpexs.decompiler.flash.action.model.operations.BitOrActionItem; +import com.jpexs.decompiler.flash.action.model.operations.BitXorActionItem; +import com.jpexs.decompiler.flash.action.model.operations.DivideActionItem; +import com.jpexs.decompiler.flash.action.model.operations.EqActionItem; +import com.jpexs.decompiler.flash.action.model.operations.GeActionItem; +import com.jpexs.decompiler.flash.action.model.operations.GtActionItem; +import com.jpexs.decompiler.flash.action.model.operations.InstanceOfActionItem; +import com.jpexs.decompiler.flash.action.model.operations.LeActionItem; +import com.jpexs.decompiler.flash.action.model.operations.LtActionItem; +import com.jpexs.decompiler.flash.action.model.operations.ModuloActionItem; +import com.jpexs.decompiler.flash.action.model.operations.MultiplyActionItem; +import com.jpexs.decompiler.flash.action.model.operations.NeqActionItem; +import com.jpexs.decompiler.flash.action.model.operations.PreDecrementActionItem; +import com.jpexs.decompiler.flash.action.model.operations.PreIncrementActionItem; +import com.jpexs.decompiler.flash.action.model.operations.StrictEqActionItem; +import com.jpexs.decompiler.flash.action.model.operations.StrictNeqActionItem; +import com.jpexs.decompiler.flash.action.model.operations.SubtractActionItem; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.AndItem; -import com.jpexs.decompiler.flash.graph.BinaryOp; -import com.jpexs.decompiler.flash.graph.BlockItem; -import com.jpexs.decompiler.flash.graph.BreakItem; -import com.jpexs.decompiler.flash.graph.CommaExpressionItem; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.DoWhileItem; -import com.jpexs.decompiler.flash.graph.ForItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.IfItem; -import com.jpexs.decompiler.flash.graph.NotItem; -import com.jpexs.decompiler.flash.graph.OrItem; -import com.jpexs.decompiler.flash.graph.ParenthesisItem; -import com.jpexs.decompiler.flash.graph.SwitchItem; -import com.jpexs.decompiler.flash.graph.TernarOpItem; -import com.jpexs.decompiler.flash.graph.WhileItem; +import com.jpexs.decompiler.graph.model.AndItem; +import com.jpexs.decompiler.graph.model.BinaryOp; +import com.jpexs.decompiler.graph.model.BlockItem; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.CommaExpressionItem; +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.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.OrItem; +import com.jpexs.decompiler.graph.model.ParenthesisItem; +import com.jpexs.decompiler.graph.model.SwitchItem; +import com.jpexs.decompiler.graph.model.TernarOpItem; +import com.jpexs.decompiler.graph.model.WhileItem; import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -184,12 +184,12 @@ public class ActionScriptParser { ParsedSymbol s = lex(); expected(s, lexer.yyline(), SymbolType.IDENTIFIER); - ret = new GetVariableTreeItem(null, pushConst(s.value.toString())); + ret = new GetVariableActionItem(null, pushConst(s.value.toString())); s = lex(); while (s.type == SymbolType.DOT) { s = lex(); expected(s, lexer.yyline(), SymbolType.IDENTIFIER); - ret = new GetMemberTreeItem(null, ret, pushConst(s.value.toString())); + ret = new GetMemberActionItem(null, ret, pushConst(s.value.toString())); s = lex(); } lexer.pushback(s); @@ -207,14 +207,14 @@ public class ActionScriptParser { ret = member(ret, registerVars, inFunction, inMethod); break; case PARENT_OPEN: - if (ret instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) ret; - ret = new CallMethodTreeItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod)); - } else if (ret instanceof GetVariableTreeItem) { - GetVariableTreeItem var = (GetVariableTreeItem) ret; - ret = new CallFunctionTreeItem(null, var.name, call(registerVars, inFunction, inMethod)); + if (ret instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) ret; + ret = new CallMethodActionItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod)); + } else if (ret instanceof GetVariableActionItem) { + GetVariableActionItem var = (GetVariableActionItem) ret; + ret = new CallFunctionActionItem(null, var.name, call(registerVars, inFunction, inMethod)); } else { - ret = new CallFunctionTreeItem(null, ret, call(registerVars, inFunction, inMethod)); + ret = new CallFunctionActionItem(null, ret, call(registerVars, inFunction, inMethod)); } break; } @@ -229,7 +229,7 @@ public class ActionScriptParser { ParsedSymbol s = lex(); while (s.isType(SymbolType.DOT, SymbolType.BRACKET_OPEN)) { if (s.type == SymbolType.BRACKET_OPEN) { - ret = new GetMemberTreeItem(null, ret, expression(registerVars, inFunction, inMethod, true)); + ret = new GetMemberActionItem(null, ret, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.BRACKET_CLOSE); s = lex(); continue; @@ -241,7 +241,7 @@ public class ActionScriptParser { //ret.add(new ActionPush((Long) (long) (int) GraphTargetItem.propertyNamesList.indexOf(s.value.toString()))); //ret.add(new ActionGetProperty()); } else { - ret = new GetMemberTreeItem(null, ret, pushConst(s.value.toString())); + ret = new GetMemberActionItem(null, ret, pushConst(s.value.toString())); } s = lex(); } @@ -254,19 +254,19 @@ public class ActionScriptParser { ParsedSymbol s = lex(); expected(s, lexer.yyline(), SymbolType.IDENTIFIER, SymbolType.THIS, SymbolType.SUPER); if (registerVars.containsKey(s.value.toString())) { - ret = new DirectValueTreeItem(null, 0, new RegisterNumber(registerVars.get(s.value.toString())), new ArrayList()); + ret = new DirectValueActionItem(null, 0, new RegisterNumber(registerVars.get(s.value.toString())), new ArrayList()); } else { if (inMethod) { - ret = new DirectValueTreeItem(null, 0, new RegisterNumber(REGISTER_THIS), new ArrayList()); + ret = new DirectValueActionItem(null, 0, new RegisterNumber(REGISTER_THIS), new ArrayList()); //TODO: Handle properties (?) if (false) { //GraphTargetItem.propertyNamesList.contains(s.value.toString())) { //ret.add(new ActionPush((Long) (long) (int) GraphTargetItem.propertyNamesList.indexOf(s.value.toString()))); //ret.add(new ActionGetProperty()); } else { - ret = new GetMemberTreeItem(null, ret, pushConst(s.value.toString())); + ret = new GetMemberActionItem(null, ret, pushConst(s.value.toString())); } } else { - ret = new GetVariableTreeItem(null, pushConst(s.value.toString())); + ret = new GetVariableActionItem(null, pushConst(s.value.toString())); } } ret = (member(ret, registerVars, inFunction, inMethod)); @@ -326,7 +326,7 @@ public class ActionScriptParser { return ret; } - private FunctionTreeItem function(boolean withBody, String functionName, boolean isMethod) throws IOException, ParseException { + private FunctionActionItem function(boolean withBody, String functionName, boolean isMethod) throws IOException, ParseException { GraphTargetItem ret = null; ParsedSymbol s = null; expectedType(SymbolType.PARENT_OPEN); @@ -367,7 +367,7 @@ public class ActionScriptParser { expectedType(SymbolType.CURLY_CLOSE); } - return new FunctionTreeItem(null, functionName, paramNames, body, constantPool, -1); + return new FunctionActionItem(null, functionName, paramNames, body, constantPool, -1); } private GraphTargetItem traits(boolean isInterface, GraphTargetItem nameStr, GraphTargetItem extendsStr, List implementsStr) throws IOException, ParseException { @@ -399,22 +399,22 @@ public class ActionScriptParser { ParsedSymbol s = null; - FunctionTreeItem constr = null; + FunctionActionItem constr = null; List staticFunctions = new ArrayList<>(); List> staticVars = new ArrayList<>(); List functions = new ArrayList<>(); List> vars = new ArrayList<>(); String classNameStr = ""; - if (nameStr instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) nameStr; - if (mem.memberName instanceof DirectValueTreeItem) { - classNameStr = ((DirectValueTreeItem) mem.memberName).toStringNoQuotes(new ConstantPool(constantPool)); + if (nameStr instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) nameStr; + if (mem.memberName instanceof DirectValueActionItem) { + classNameStr = ((DirectValueActionItem) mem.memberName).toStringNoQuotes(new ConstantPool(constantPool)); } - } else if (nameStr instanceof GetVariableTreeItem) { - GetVariableTreeItem var = (GetVariableTreeItem) nameStr; - if (var.name instanceof DirectValueTreeItem) { - classNameStr = ((DirectValueTreeItem) var.name).toStringNoQuotes(new ConstantPool(constantPool)); + } else if (nameStr instanceof GetVariableActionItem) { + GetVariableActionItem var = (GetVariableActionItem) nameStr; + if (var.name instanceof DirectValueActionItem) { + classNameStr = ((DirectValueActionItem) var.name).toStringNoQuotes(new ConstantPool(constantPool)); } } @@ -438,11 +438,11 @@ public class ActionScriptParser { } else { if (!isInterface) { if (isStatic) { - FunctionTreeItem ft = function(!isInterface, "", true); + FunctionActionItem ft = function(!isInterface, "", true); ft.calculatedFunctionName = pushConst(fname); staticFunctions.add(ft); } else { - FunctionTreeItem ft = function(!isInterface, "", true); + FunctionActionItem ft = function(!isInterface, "", true); ft.calculatedFunctionName = pushConst(fname); functions.add(ft); } @@ -478,9 +478,9 @@ public class ActionScriptParser { } if (isInterface) { - return new InterfaceTreeItem(nameStr, implementsStr); + return new InterfaceActionItem(nameStr, implementsStr); } else { - return new ClassTreeItem(nameStr, extendsStr, implementsStr, constr, functions, vars, staticFunctions, staticVars); + return new ClassActionItem(nameStr, extendsStr, implementsStr, constr, functions, vars, staticFunctions, staticVars); } } @@ -489,22 +489,22 @@ public class ActionScriptParser { switch (s.type) { case GETVERSION: expectedType(SymbolType.PARENT_OPEN); - ret = new GetVersionTreeItem(null); + ret = new GetVersionActionItem(null); expectedType(SymbolType.PARENT_CLOSE); break; case MBORD: expectedType(SymbolType.PARENT_OPEN); - ret = new MBCharToAsciiTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new MBCharToAsciiActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; case MBCHR: expectedType(SymbolType.PARENT_OPEN); - ret = new MBAsciiToCharTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new MBAsciiToCharActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; case MBLENGTH: expectedType(SymbolType.PARENT_OPEN); - ret = new MBStringLengthTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new MBStringLengthActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; case MBSUBSTRING: @@ -515,7 +515,7 @@ public class ActionScriptParser { expectedType(SymbolType.COMMA); GraphTargetItem len1 = (expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); - ret = new MBStringExtractTreeItem(null, val1, index1, len1); + ret = new MBStringExtractActionItem(null, val1, index1, len1); break; case SUBSTR: expectedType(SymbolType.PARENT_OPEN); @@ -525,21 +525,21 @@ public class ActionScriptParser { expectedType(SymbolType.COMMA); GraphTargetItem len2 = (expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); - ret = new StringExtractTreeItem(null, val2, index2, len2); + ret = new StringExtractActionItem(null, val2, index2, len2); break; case LENGTH: expectedType(SymbolType.PARENT_OPEN); - ret = new StringLengthTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new StringLengthActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; case RANDOM: expectedType(SymbolType.PARENT_OPEN); - ret = new RandomNumberTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new RandomNumberActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; case INT: expectedType(SymbolType.PARENT_OPEN); - ret = new ToIntegerTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new ToIntegerActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; @@ -552,32 +552,32 @@ public class ActionScriptParser { case NUMBER_OP: s = lex(); if (s.type == SymbolType.DOT) { - ret = memberOrCall(new GetVariableTreeItem(null, new DirectValueTreeItem(null, 0, s.value, new ArrayList())), registerVars, inFunction, inMethod); + ret = memberOrCall(new GetVariableActionItem(null, new DirectValueActionItem(null, 0, s.value, new ArrayList())), registerVars, inFunction, inMethod); } else { expected(s, lexer.yyline(), SymbolType.PARENT_OPEN); - ret = new ToNumberTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new ToNumberActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); } break; case STRING_OP: s = lex(); if (s.type == SymbolType.DOT) { - ret = memberOrCall(new GetVariableTreeItem(null, new DirectValueTreeItem(null, 0, s.value, new ArrayList())), registerVars, inFunction, inMethod); + ret = memberOrCall(new GetVariableActionItem(null, new DirectValueActionItem(null, 0, s.value, new ArrayList())), registerVars, inFunction, inMethod); } else { expected(s, lexer.yyline(), SymbolType.PARENT_OPEN); - ret = new ToStringTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new ToStringActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); ret = memberOrCall(ret, registerVars, inFunction, inMethod); } break; case ORD: expectedType(SymbolType.PARENT_OPEN); - ret = new CharToAsciiTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new CharToAsciiActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; case CHR: expectedType(SymbolType.PARENT_OPEN); - ret = new AsciiToCharTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new AsciiToCharActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); break; case DUPLICATEMOVIECLIP: @@ -588,12 +588,12 @@ public class ActionScriptParser { expectedType(SymbolType.COMMA); GraphTargetItem dep3 = (expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); - ret = new CloneSpriteTreeItem(null, src3, tar3, dep3); + ret = new CloneSpriteActionItem(null, src3, tar3, dep3); break; case GETTIMER: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new GetTimeTreeItem(null); + ret = new GetTimeActionItem(null); break; default: return null; @@ -615,17 +615,17 @@ public class ActionScriptParser { switch (s.type) { case CALL: expectedType(SymbolType.PARENT_OPEN); - ret = new CallTreeItem(null, (expression(registerVars, inFunction, inMethod, true))); + ret = new CallActionItem(null, (expression(registerVars, inFunction, inMethod, true))); expectedType(SymbolType.PARENT_CLOSE); break; case LENGTH: expectedType(SymbolType.PARENT_OPEN); - ret = new StringLengthTreeItem(null, (expression(registerVars, inFunction, inMethod, true))); + ret = new StringLengthActionItem(null, (expression(registerVars, inFunction, inMethod, true))); expectedType(SymbolType.PARENT_CLOSE); break; case MBLENGTH: expectedType(SymbolType.PARENT_OPEN); - ret = new MBStringLengthTreeItem(null, (expression(registerVars, inFunction, inMethod, true))); + ret = new MBStringLengthActionItem(null, (expression(registerVars, inFunction, inMethod, true))); expectedType(SymbolType.PARENT_CLOSE); break; case SET: @@ -634,7 +634,7 @@ public class ActionScriptParser { expectedType(SymbolType.COMMA); GraphTargetItem value1 = (expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); - ret = new SetVariableTreeItem(null, name1, value1); + ret = new SetVariableActionItem(null, name1, value1); break; case WITH: expectedType(SymbolType.PARENT_OPEN); @@ -643,20 +643,20 @@ public class ActionScriptParser { expectedType(SymbolType.CURLY_OPEN); List wcmd = commands(registerVars, inFunction, inMethod, forinlevel); expectedType(SymbolType.CURLY_CLOSE); - ret = new WithTreeItem(null, wvar, wcmd); + ret = new WithActionItem(null, wvar, wcmd); break; case DELETE: GraphTargetItem varDel = variable(registerVars, inFunction, inMethod); - if (varDel instanceof GetMemberTreeItem) { - GetMemberTreeItem gm = (GetMemberTreeItem) varDel; - ret = new DeleteTreeItem(null, gm.object, gm.memberName); + if (varDel instanceof GetMemberActionItem) { + GetMemberActionItem gm = (GetMemberActionItem) varDel; + ret = new DeleteActionItem(null, gm.object, gm.memberName); } else { throw new ParseException("Not a property", lexer.yyline()); } break; case TRACE: expectedType(SymbolType.PARENT_OPEN); - ret = new TraceTreeItem(null, (expression(registerVars, inFunction, inMethod, true))); + ret = new TraceActionItem(null, (expression(registerVars, inFunction, inMethod, true))); expectedType(SymbolType.PARENT_CLOSE); break; @@ -685,10 +685,10 @@ public class ActionScriptParser { } } else { lexer.pushback(s); - target = new DirectValueTreeItem(null, 0, "", new ArrayList()); + target = new DirectValueActionItem(null, 0, "", new ArrayList()); } expectedType(SymbolType.PARENT_CLOSE); - ret = new GetURL2TreeItem(null, url, target, getuMethod); + ret = new GetURL2ActionItem(null, url, target, getuMethod); break; case GOTOANDSTOP: expectedType(SymbolType.PARENT_OPEN); @@ -700,23 +700,23 @@ public class ActionScriptParser { } else { lexer.pushback(s); } - ret = new GotoFrame2TreeItem(null, gtsFrame, false, false, 0); + ret = new GotoFrame2ActionItem(null, gtsFrame, false, false, 0); expectedType(SymbolType.PARENT_CLOSE); break; case NEXTFRAME: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new NextFrameTreeItem(null); + ret = new NextFrameActionItem(null); break; case PLAY: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new PlayTreeItem(null); + ret = new PlayActionItem(null); break; case PREVFRAME: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new PrevFrameTreeItem(null); + ret = new PrevFrameActionItem(null); break; case TELLTARGET: expectedType(SymbolType.PARENT_OPEN); @@ -725,28 +725,28 @@ public class ActionScriptParser { expectedType(SymbolType.CURLY_OPEN); List tellcmds = commands(registerVars, inFunction, inMethod, forinlevel); expectedType(SymbolType.CURLY_CLOSE); - ret = new TellTargetTreeItem(null, tellTarget, tellcmds); + ret = new TellTargetActionItem(null, tellTarget, tellcmds); break; case STOP: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new StopTreeItem(null); + ret = new StopActionItem(null); break; case STOPALLSOUNDS: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new StopAllSoundsTreeItem(null); + ret = new StopAllSoundsActionItem(null); break; case TOGGLEHIGHQUALITY: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new ToggleHighQualityTreeItem(null); + ret = new ToggleHighQualityActionItem(null); break; case STOPDRAG: expectedType(SymbolType.PARENT_OPEN); expectedType(SymbolType.PARENT_CLOSE); - ret = new StopDragTreeItem(null); + ret = new StopDragActionItem(null); break; case UNLOADMOVIE: @@ -756,10 +756,10 @@ public class ActionScriptParser { GraphTargetItem unTargetOrNum = expression(registerVars, inFunction, inMethod, true); expectedType(SymbolType.PARENT_CLOSE); if (unloadType == SymbolType.UNLOADMOVIE) { - ret = new UnLoadMovieTreeItem(null, unTargetOrNum); + ret = new UnLoadMovieActionItem(null, unTargetOrNum); } if (unloadType == SymbolType.UNLOADMOVIENUM) { - ret = new UnLoadMovieNumTreeItem(null, unTargetOrNum); + ret = new UnLoadMovieNumActionItem(null, unTargetOrNum); } break; case PRINT: @@ -775,16 +775,16 @@ public class ActionScriptParser { switch (printType) { case PRINT: - ret = new PrintTreeItem(null, printTarget, printBBox); + ret = new PrintActionItem(null, printTarget, printBBox); break; case PRINTNUM: - ret = new PrintNumTreeItem(null, printTarget, printBBox); + ret = new PrintNumActionItem(null, printTarget, printBBox); break; case PRINTASBITMAP: - ret = new PrintAsBitmapTreeItem(null, printTarget, printBBox); + ret = new PrintAsBitmapActionItem(null, printTarget, printBBox); break; case PRINTASBITMAPNUM: - ret = new PrintAsBitmapNumTreeItem(null, printTarget, printBBox); + ret = new PrintAsBitmapNumActionItem(null, printTarget, printBBox); break; } break; @@ -819,16 +819,16 @@ public class ActionScriptParser { expectedType(SymbolType.PARENT_CLOSE); switch (loadType) { case LOADVARIABLES: - ret = new LoadVariablesTreeItem(null, url2, targetOrNum, lvmethod); + ret = new LoadVariablesActionItem(null, url2, targetOrNum, lvmethod); break; case LOADMOVIE: - ret = new LoadMovieTreeItem(null, url2, targetOrNum, lvmethod); + ret = new LoadMovieActionItem(null, url2, targetOrNum, lvmethod); break; case LOADVARIABLESNUM: - ret = new LoadVariablesNumTreeItem(null, url2, targetOrNum, lvmethod); + ret = new LoadVariablesNumActionItem(null, url2, targetOrNum, lvmethod); break; case LOADMOVIENUM: - ret = new LoadMovieNumTreeItem(null, url2, targetOrNum, lvmethod); + ret = new LoadMovieNumActionItem(null, url2, targetOrNum, lvmethod); break; } break; @@ -842,13 +842,13 @@ public class ActionScriptParser { } else { lexer.pushback(s); } - ret = new GotoFrame2TreeItem(null, gtpFrame, true, false, 0); + ret = new GotoFrame2ActionItem(null, gtpFrame, true, false, 0); expectedType(SymbolType.PARENT_CLOSE); break; case REMOVEMOVIECLIP: expectedType(SymbolType.PARENT_OPEN); - ret = new RemoveSpriteTreeItem(null, (expression(registerVars, inFunction, inMethod, true))); + ret = new RemoveSpriteActionItem(null, (expression(registerVars, inFunction, inMethod, true))); expectedType(SymbolType.PARENT_CLOSE); break; case STARTDRAG: @@ -865,7 +865,7 @@ public class ActionScriptParser { lockCenter = (expression(registerVars, inFunction, inMethod, true)); s = lex(); if (s.type == SymbolType.COMMA) { - constrain = new DirectValueTreeItem(null, 0, Boolean.TRUE, new ArrayList()); + constrain = new DirectValueActionItem(null, 0, Boolean.TRUE, new ArrayList()); x1 = (expression(registerVars, inFunction, inMethod, true)); s = lex(); if (s.type == SymbolType.COMMA) { @@ -878,32 +878,32 @@ public class ActionScriptParser { y2 = (expression(registerVars, inFunction, inMethod, true)); } else { lexer.pushback(s); - y2 = new DirectValueTreeItem(null, 0, (Long) 0L, new ArrayList()); + y2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList()); } } else { lexer.pushback(s); - x2 = new DirectValueTreeItem(null, 0, (Long) 0L, new ArrayList()); - y2 = new DirectValueTreeItem(null, 0, (Long) 0L, new ArrayList()); + x2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList()); + y2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList()); } } else { lexer.pushback(s); - x2 = new DirectValueTreeItem(null, 0, (Long) 0L, new ArrayList()); - y2 = new DirectValueTreeItem(null, 0, (Long) 0L, new ArrayList()); - y1 = new DirectValueTreeItem(null, 0, (Long) 0L, new ArrayList()); + x2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList()); + y2 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList()); + y1 = new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList()); } } else { lexer.pushback(s); - constrain = new DirectValueTreeItem(null, 0, Boolean.FALSE, new ArrayList()); + constrain = new DirectValueActionItem(null, 0, Boolean.FALSE, new ArrayList()); //ret.add(new ActionPush(Boolean.FALSE)); } } else { - lockCenter = new DirectValueTreeItem(null, 0, Boolean.FALSE, new ArrayList()); - constrain = new DirectValueTreeItem(null, 0, Boolean.FALSE, new ArrayList()); + lockCenter = new DirectValueActionItem(null, 0, Boolean.FALSE, new ArrayList()); + constrain = new DirectValueActionItem(null, 0, Boolean.FALSE, new ArrayList()); lexer.pushback(s); } expectedType(SymbolType.PARENT_CLOSE); - ret = new StartDragTreeItem(null, dragTarget, lockCenter, constrain, x1, y1, x2, y2); + ret = new StartDragActionItem(null, dragTarget, lockCenter, constrain, x1, y1, x2, y2); break; case IFFRAMELOADED: @@ -913,7 +913,7 @@ public class ActionScriptParser { expectedType(SymbolType.CURLY_OPEN); List iflComs = commands(registerVars, inFunction, inMethod, forinlevel); expectedType(SymbolType.CURLY_CLOSE); - ret = new IfFrameLoadedTreeItem(iflExpr, iflComs, null); + ret = new IfFrameLoadedActionItem(iflExpr, iflComs, null); break; case CLASS: GraphTargetItem classTypeStr = type(); @@ -959,14 +959,14 @@ public class ActionScriptParser { case NEW: GraphTargetItem type = type(); expectedType(SymbolType.PARENT_OPEN); - if (type instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) type; - ret = new NewMethodTreeItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod)); - } else if (type instanceof GetVariableTreeItem) { - GetVariableTreeItem var = (GetVariableTreeItem) type; - ret = new NewObjectTreeItem(null, var.name, call(registerVars, inFunction, inMethod)); + if (type instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) type; + ret = new NewMethodActionItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod)); + } else if (type instanceof GetVariableActionItem) { + GetVariableActionItem var = (GetVariableActionItem) type; + ret = new NewObjectActionItem(null, var.name, call(registerVars, inFunction, inMethod)); } else { - ret = new NewObjectTreeItem(null, ret, call(registerVars, inFunction, inMethod)); + ret = new NewObjectActionItem(null, ret, call(registerVars, inFunction, inMethod)); } break; case VAR: @@ -990,24 +990,24 @@ public class ActionScriptParser { for (int i = 1; i < 256; i++) { if (!registerVars.containsValue(i)) { registerVars.put(varIdentifier, i); - ret = new StoreRegisterTreeItem(null, new RegisterNumber(i), varval, true); + ret = new StoreRegisterActionItem(null, new RegisterNumber(i), varval, true); break; } } } else { - ret = new DefineLocalTreeItem(null, pushConst(varIdentifier), varval); + ret = new DefineLocalActionItem(null, pushConst(varIdentifier), varval); } } else { if (inFunction) { for (int i = 1; i < 256; i++) { if (!registerVars.containsValue(i)) { registerVars.put(varIdentifier, i); - ret = new DefineRegisterTreeItem(varIdentifier, i); + ret = new DefineRegisterActionItem(varIdentifier, i); break; } } } else { - ret = new DefineLocalTreeItem(null, pushConst(varIdentifier), null); + ret = new DefineLocalActionItem(null, pushConst(varIdentifier), null); } lexer.pushback(s); } @@ -1020,9 +1020,9 @@ public class ActionScriptParser { case DECREMENT: //predecrement GraphTargetItem varincdec = variable(registerVars, inFunction, inMethod); if (s.type == SymbolType.INCREMENT) { - ret = new PreIncrementTreeItem(null, varincdec); + ret = new PreIncrementActionItem(null, varincdec); } else if (s.type == SymbolType.DECREMENT) { - ret = new PreDecrementTreeItem(null, varincdec); + ret = new PreDecrementActionItem(null, varincdec); } break; case IDENTIFIER: @@ -1040,7 +1040,7 @@ public class ActionScriptParser { } else if (s.type == SymbolType.EVAL) { expectedType(SymbolType.PARENT_OPEN); var = expression(registerVars, inFunction, inMethod, true); - var = new EvalTreeItem(null, var); + var = new EvalActionItem(null, var); expectedType(SymbolType.PARENT_CLOSE); var = memberOrCall(var, registerVars, inFunction, inMethod); isEval = true; @@ -1069,39 +1069,39 @@ public class ActionScriptParser { switch (s.type) { case ASSIGN_BITAND: - ret = Action.gettoset(var, new BitAndTreeItem(null, var, valtoappend)); + ret = Action.gettoset(var, new BitAndActionItem(null, var, valtoappend)); break; case ASSIGN_BITOR: - ret = Action.gettoset(var, new BitOrTreeItem(null, var, valtoappend)); + ret = Action.gettoset(var, new BitOrActionItem(null, var, valtoappend)); break; case ASSIGN_DIVIDE: - ret = Action.gettoset(var, new DivideTreeItem(null, var, valtoappend)); + ret = Action.gettoset(var, new DivideActionItem(null, var, valtoappend)); break; case ASSIGN_MINUS: - ret = Action.gettoset(var, new SubtractTreeItem(null, var, valtoappend)); + ret = Action.gettoset(var, new SubtractActionItem(null, var, valtoappend)); break; case ASSIGN_MODULO: - ret = Action.gettoset(var, new ModuloTreeItem(null, var, valtoappend)); + ret = Action.gettoset(var, new ModuloActionItem(null, var, valtoappend)); break; case ASSIGN_MULTIPLY: - ret = Action.gettoset(var, new MultiplyTreeItem(null, var, valtoappend)); + ret = Action.gettoset(var, new MultiplyActionItem(null, var, valtoappend)); break; case ASSIGN_PLUS: - ret = Action.gettoset(var, new AddTreeItem(null, var, valtoappend, true)); + ret = Action.gettoset(var, new AddActionItem(null, var, valtoappend, true)); break; } break; case INCREMENT: //postincrement - ret = new PostIncrementTreeItem(null, var); + ret = new PostIncrementActionItem(null, var); break; case DECREMENT: //postdecrement - ret = new PostDecrementTreeItem(null, var); + ret = new PostDecrementActionItem(null, var); break; case PARENT_OPEN: //function call ret = var; if (varS.type == SymbolType.SUPER || varS.type == SymbolType.THIS) { List args = call(registerVars, inFunction, inMethod); - ret = new CallMethodTreeItem(null, ret, new DirectValueTreeItem(null, 0, new Undefined(), constantPool), args); + ret = new CallMethodActionItem(null, ret, new DirectValueActionItem(null, 0, new Undefined(), constantPool), args); } else { lexer.pushback(s); ret = memberOrCall(ret, registerVars, inFunction, inMethod); @@ -1213,7 +1213,7 @@ public class ActionScriptParser { List forBody = new ArrayList<>(); forBody.add(command(registerVars, inFunction, inMethod, forin ? forinlevel + 1 : forinlevel, true)); if (forin) { - ret = new ForInTreeItem(null, null, pushConst(objIdent), collection, forBody); + ret = new ForInActionItem(null, null, pushConst(objIdent), collection, forBody); } else { ret = new ForItem(null, null, forFirstCommands, forExpr, forFinalCommands, forBody); } @@ -1272,9 +1272,9 @@ public class ActionScriptParser { case RETURN: GraphTargetItem retexpr = expression(true, registerVars, inFunction, inMethod, true); if (retexpr == null) { - retexpr = new DirectValueTreeItem(null, 0, new Undefined(), new ArrayList()); + retexpr = new DirectValueActionItem(null, 0, new Undefined(), new ArrayList()); } - ret = new ReturnTreeItem(null, retexpr); + ret = new ReturnActionItem(null, retexpr); break; case TRY: List tryCommands = new ArrayList<>(); @@ -1307,10 +1307,10 @@ public class ActionScriptParser { expected(s, lexer.yyline(), SymbolType.CATCH, SymbolType.FINALLY); } lexer.pushback(s); - ret = new TryTreeItem(tryCommands, catchExceptions, catchCommands, finallyCommands); + ret = new TryActionItem(tryCommands, catchExceptions, catchCommands, finallyCommands); break; case THROW: - ret = new ThrowTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new ThrowActionItem(null, expression(registerVars, inFunction, inMethod, true)); break; default: GraphTargetItem valcmd = expressionCommands(s, registerVars, inFunction, inMethod, forinlevel); @@ -1377,40 +1377,40 @@ public class ActionScriptParser { ret = new TernarOpItem(null, expr, terOnTrue, terOnFalse); break; case BITAND: - ret = new BitAndTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new BitAndActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case BITOR: - ret = new BitOrTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new BitOrActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case DIVIDE: - ret = new DivideTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new DivideActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case MODULO: - ret = new ModuloTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new ModuloActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case EQUALS: - ret = new EqTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); + ret = new EqActionItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); break; case STRICT_EQUALS: - ret = new StrictEqTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new StrictEqActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case NOT_EQUAL: - ret = new NeqTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); + ret = new NeqActionItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); break; case STRICT_NOT_EQUAL: - ret = new StrictNeqTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new StrictNeqActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case LOWER_THAN: - ret = new LtTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); + ret = new LtActionItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); break; case LOWER_EQUAL: - ret = new LeTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new LeActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case GREATER_THAN: - ret = new GtTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new GtActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case GREATER_EQUAL: - ret = new GeTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); + ret = new GeActionItem(null, expr, expression(registerVars, inFunction, inMethod, false), true/*FIXME SWF version?*/); break; case AND: ret = new AndItem(null, expr, expression(registerVars, inFunction, inMethod, false)); @@ -1419,22 +1419,22 @@ public class ActionScriptParser { ret = new OrItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case MINUS: - ret = new SubtractTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new SubtractActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case MULTIPLY: - ret = new MultiplyTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new MultiplyActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case PLUS: - ret = new AddTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false), true); + ret = new AddActionItem(null, expr, expression(registerVars, inFunction, inMethod, false), true); break; case XOR: - ret = new BitXorTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new BitXorActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case AS: break; case INSTANCEOF: - ret = new InstanceOfTreeItem(null, expr, expression(registerVars, inFunction, inMethod, false)); + ret = new InstanceOfActionItem(null, expr, expression(registerVars, inFunction, inMethod, false)); break; case IS: @@ -1503,46 +1503,46 @@ public class ActionScriptParser { switch (s.type) { case MINUS: GraphTargetItem num = expression(registerVars, inFunction, inMethod, true); - if ((num instanceof DirectValueTreeItem) - && (((DirectValueTreeItem) num).value instanceof Long)) { - ((DirectValueTreeItem) num).value = -(Long) ((DirectValueTreeItem) num).value; + if ((num instanceof DirectValueActionItem) + && (((DirectValueActionItem) num).value instanceof Long)) { + ((DirectValueActionItem) num).value = -(Long) ((DirectValueActionItem) num).value; ret = num; - } else if ((num instanceof DirectValueTreeItem) - && (((DirectValueTreeItem) num).value instanceof Double)) { - Double d = (Double) ((DirectValueTreeItem) num).value; + } else if ((num instanceof DirectValueActionItem) + && (((DirectValueActionItem) num).value instanceof Double)) { + Double d = (Double) ((DirectValueActionItem) num).value; if (d.isInfinite()) { - ((DirectValueTreeItem) num).value = Double.NEGATIVE_INFINITY; + ((DirectValueActionItem) num).value = Double.NEGATIVE_INFINITY; } else { - ((DirectValueTreeItem) num).value = -d; + ((DirectValueActionItem) num).value = -d; } ret = (num); - } else if ((num instanceof DirectValueTreeItem) - && (((DirectValueTreeItem) num).value instanceof Float)) { - ((DirectValueTreeItem) num).value = -(Float) ((DirectValueTreeItem) num).value; + } else if ((num instanceof DirectValueActionItem) + && (((DirectValueActionItem) num).value instanceof Float)) { + ((DirectValueActionItem) num).value = -(Float) ((DirectValueActionItem) num).value; ret = (num); } else {; - ret = (new SubtractTreeItem(null, new DirectValueTreeItem(null, 0, (Long) 0L, new ArrayList()), num)); + ret = (new SubtractActionItem(null, new DirectValueActionItem(null, 0, (Long) 0L, new ArrayList()), num)); } break; case TYPEOF: expectedType(SymbolType.PARENT_OPEN); - ret = new TypeOfTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + ret = new TypeOfActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); existsRemainder = true; break; case TRUE: - ret = new DirectValueTreeItem(null, 0, Boolean.TRUE, new ArrayList()); + ret = new DirectValueActionItem(null, 0, Boolean.TRUE, new ArrayList()); existsRemainder = true; break; case NULL: - ret = new DirectValueTreeItem(null, 0, new Null(), new ArrayList()); + ret = new DirectValueActionItem(null, 0, new Null(), new ArrayList()); existsRemainder = true; break; case UNDEFINED: - ret = new DirectValueTreeItem(null, 0, new Undefined(), new ArrayList()); + ret = new DirectValueActionItem(null, 0, new Undefined(), new ArrayList()); break; case FALSE: - ret = new DirectValueTreeItem(null, 0, Boolean.FALSE, new ArrayList()); + ret = new DirectValueActionItem(null, 0, Boolean.FALSE, new ArrayList()); existsRemainder = true; break; case CURLY_OPEN: //Object literal @@ -1561,13 +1561,13 @@ public class ActionScriptParser { expected(s, lexer.yyline(), SymbolType.COMMA, SymbolType.CURLY_CLOSE); } } - ret = new InitObjectTreeItem(null, objectNames, objectValues); + ret = new InitObjectActionItem(null, objectNames, objectValues); break; case BRACKET_OPEN: //Array literal or just brackets lexer.pushback(s); List inBrackets = new ArrayList<>(); int arrCnt = brackets(inBrackets, registerVars, inFunction, inMethod); - ret = new InitArrayTreeItem(null, inBrackets); + ret = new InitArrayActionItem(null, inBrackets); break; case FUNCTION: s = lexer.lex(); @@ -1585,27 +1585,27 @@ public class ActionScriptParser { existsRemainder = true; break; case NEWLINE: - ret = new DirectValueTreeItem(null, 0, "\r", new ArrayList()); + ret = new DirectValueActionItem(null, 0, "\r", new ArrayList()); existsRemainder = true; break; case NAN: - ret = new DirectValueTreeItem(null, 0, Double.NaN, new ArrayList()); + ret = new DirectValueActionItem(null, 0, Double.NaN, new ArrayList()); existsRemainder = true; break; case INFINITY: - ret = new DirectValueTreeItem(null, 0, Double.POSITIVE_INFINITY, new ArrayList()); + ret = new DirectValueActionItem(null, 0, Double.POSITIVE_INFINITY, new ArrayList()); existsRemainder = true; break; case INTEGER: case DOUBLE: - ret = new DirectValueTreeItem(null, 0, s.value, new ArrayList()); + ret = new DirectValueActionItem(null, 0, s.value, new ArrayList()); existsRemainder = true; break; case DELETE: GraphTargetItem varDel = variable(registerVars, inFunction, inMethod); - if (varDel instanceof GetMemberTreeItem) { - GetMemberTreeItem gm = (GetMemberTreeItem) varDel; - ret = new DeleteTreeItem(null, gm.object, gm.memberName); + if (varDel instanceof GetMemberActionItem) { + GetMemberActionItem gm = (GetMemberActionItem) varDel; + ret = new DeleteActionItem(null, gm.object, gm.memberName); } else { throw new ParseException("Not a property", lexer.yyline()); } @@ -1614,10 +1614,10 @@ public class ActionScriptParser { case DECREMENT: //preincrement GraphTargetItem prevar = variable(registerVars, inFunction, inMethod); if (s.type == SymbolType.INCREMENT) { - ret = new PreIncrementTreeItem(null, prevar); + ret = new PreIncrementActionItem(null, prevar); } if (s.type == SymbolType.DECREMENT) { - ret = new PreDecrementTreeItem(null, prevar); + ret = new PreDecrementActionItem(null, prevar); } existsRemainder = true; break; @@ -1634,12 +1634,12 @@ public class ActionScriptParser { case NEW: GraphTargetItem newvar = variable(registerVars, inFunction, inMethod); expectedType(SymbolType.PARENT_OPEN); - if (newvar instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) newvar; - ret = new NewMethodTreeItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod)); - } else if (newvar instanceof GetVariableTreeItem) { - GetVariableTreeItem gv = (GetVariableTreeItem) newvar; - ret = new NewObjectTreeItem(null, gv.name, call(registerVars, inFunction, inMethod)); + if (newvar instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) newvar; + ret = new NewMethodActionItem(null, mem.object, mem.memberName, call(registerVars, inFunction, inMethod)); + } else if (newvar instanceof GetVariableActionItem) { + GetVariableActionItem gv = (GetVariableActionItem) newvar; + ret = new NewObjectActionItem(null, gv.name, call(registerVars, inFunction, inMethod)); } else { throw new ParseException("Invalid new item", lexer.yyline()); } @@ -1650,7 +1650,7 @@ public class ActionScriptParser { GraphTargetItem var; if (s.type == SymbolType.EVAL) { expectedType(SymbolType.PARENT_OPEN); - var = new EvalTreeItem(null, expression(registerVars, inFunction, inMethod, true)); + var = new EvalActionItem(null, expression(registerVars, inFunction, inMethod, true)); expectedType(SymbolType.PARENT_CLOSE); var = memberOrCall(var, registerVars, inFunction, inMethod); @@ -1659,16 +1659,16 @@ public class ActionScriptParser { var = variable(registerVars, inFunction, inMethod); } - GetVariableTreeItem gva = null; - GetMemberTreeItem gmb = null; + GetVariableActionItem gva = null; + GetMemberActionItem gmb = null; RegisterNumber reg = null; - if (var instanceof GetVariableTreeItem) { - gva = (GetVariableTreeItem) var; - } else if (var instanceof GetMemberTreeItem) { - gmb = (GetMemberTreeItem) var; - } else if (var instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) var).value instanceof RegisterNumber) { - reg = (RegisterNumber) ((DirectValueTreeItem) var).value; + if (var instanceof GetVariableActionItem) { + gva = (GetVariableActionItem) var; + } else if (var instanceof GetMemberActionItem) { + gmb = (GetMemberActionItem) var; + } else if (var instanceof DirectValueActionItem) { + if (((DirectValueActionItem) var).value instanceof RegisterNumber) { + reg = (RegisterNumber) ((DirectValueActionItem) var).value; } } @@ -1677,11 +1677,11 @@ public class ActionScriptParser { case ASSIGN: GraphTargetItem varval = expression(registerVars, inFunction, inMethod, true); if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, varval); + ret = new SetVariableActionItem(null, gva.name, varval); } else if (gmb != null) { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, varval); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, varval); } else if (reg != null) { - ret = new StoreRegisterTreeItem(null, reg, varval, false); + ret = new StoreRegisterActionItem(null, reg, varval, false); } else { throw new ParseException("Invalid assignment", lexer.yyline()); } @@ -1706,51 +1706,51 @@ public class ActionScriptParser { switch (s.type) { case ASSIGN_BITAND: if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, new BitAndTreeItem(null, gva, varval2)); + ret = new SetVariableActionItem(null, gva.name, new BitAndActionItem(null, gva, varval2)); } else { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, new BitAndTreeItem(null, gmb, varval2)); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, new BitAndActionItem(null, gmb, varval2)); } break; case ASSIGN_BITOR: if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, new BitOrTreeItem(null, gva, varval2)); + ret = new SetVariableActionItem(null, gva.name, new BitOrActionItem(null, gva, varval2)); } else { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, new BitOrTreeItem(null, gmb, varval2)); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, new BitOrActionItem(null, gmb, varval2)); } break; case ASSIGN_DIVIDE: if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, new DivideTreeItem(null, gva, varval2)); + ret = new SetVariableActionItem(null, gva.name, new DivideActionItem(null, gva, varval2)); } else { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, new DivideTreeItem(null, gmb, varval2)); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, new DivideActionItem(null, gmb, varval2)); } break; case ASSIGN_MINUS: if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, new SubtractTreeItem(null, gva, varval2)); + ret = new SetVariableActionItem(null, gva.name, new SubtractActionItem(null, gva, varval2)); } else { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, new SubtractTreeItem(null, gmb, varval2)); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, new SubtractActionItem(null, gmb, varval2)); } break; case ASSIGN_MODULO: if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, new ModuloTreeItem(null, gva, varval2)); + ret = new SetVariableActionItem(null, gva.name, new ModuloActionItem(null, gva, varval2)); } else { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, new ModuloTreeItem(null, gmb, varval2)); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, new ModuloActionItem(null, gmb, varval2)); } break; case ASSIGN_MULTIPLY: if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, new MultiplyTreeItem(null, gva, varval2)); + ret = new SetVariableActionItem(null, gva.name, new MultiplyActionItem(null, gva, varval2)); } else { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, new MultiplyTreeItem(null, gmb, varval2)); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, new MultiplyActionItem(null, gmb, varval2)); } break; case ASSIGN_PLUS: if (gva != null) { - ret = new SetVariableTreeItem(null, gva.name, new AddTreeItem(null, gva, varval2, true/*TODO:SWF version?*/)); + ret = new SetVariableActionItem(null, gva.name, new AddActionItem(null, gva, varval2, true/*TODO:SWF version?*/)); } else { - ret = new SetMemberTreeItem(null, gmb.object, gmb.memberName, new AddTreeItem(null, gmb, varval2, true/*TODO:SWF version?*/)); + ret = new SetMemberActionItem(null, gmb.object, gmb.memberName, new AddActionItem(null, gmb, varval2, true/*TODO:SWF version?*/)); } break; } @@ -1761,13 +1761,13 @@ public class ActionScriptParser { if (gva == null && gmb == null) { throw new ParseException("Invalid assignment", lexer.yyline()); } - ret = new PostIncrementTreeItem(null, var); + ret = new PostIncrementActionItem(null, var); break; case DECREMENT: //postdecrement if (gva == null && gmb == null) { throw new ParseException("Invalid assignment", lexer.yyline()); } - ret = new PostDecrementTreeItem(null, var); + ret = new PostDecrementActionItem(null, var); break; case PARENT_OPEN: //function call lexer.pushback(s); @@ -1805,13 +1805,13 @@ public class ActionScriptParser { return ret; } - private DirectValueTreeItem pushConst(String s) throws IOException, ParseException { + private DirectValueActionItem pushConst(String s) throws IOException, ParseException { int index = constantPool.indexOf(s); if (index == -1) { constantPool.add(s); index = constantPool.indexOf(s); } - return new DirectValueTreeItem(null, 0, new ConstantIndex(index), constantPool); + return new DirectValueActionItem(null, 0, new ConstantIndex(index), constantPool); } private ActionScriptLexer lexer = null; private List constantPool; @@ -1833,7 +1833,7 @@ public class ActionScriptParser { } public List actionsFromTree(List tree, List constantPool) { - ActionScriptSourceGenerator gen = new ActionScriptSourceGenerator(constantPool); + ActionSourceGenerator gen = new ActionSourceGenerator(constantPool); List ret = new ArrayList<>(); List localDate = new ArrayList<>(); localDate.add(new HashMap()); //registerVars diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptSourceGenerator.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java similarity index 88% rename from trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptSourceGenerator.java rename to trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java index aee4a5e5c..bb0a25e76 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptSourceGenerator.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java @@ -37,28 +37,28 @@ import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.action.swf7.ActionExtends; import com.jpexs.decompiler.flash.action.swf7.ActionImplementsOp; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.operations.Inverted; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.operations.Inverted; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.flash.graph.AndItem; -import com.jpexs.decompiler.flash.graph.BreakItem; -import com.jpexs.decompiler.flash.graph.CommaExpressionItem; -import com.jpexs.decompiler.flash.graph.ContinueItem; -import com.jpexs.decompiler.flash.graph.DoWhileItem; -import com.jpexs.decompiler.flash.graph.DuplicateItem; -import com.jpexs.decompiler.flash.graph.ForItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.IfItem; -import com.jpexs.decompiler.flash.graph.NotItem; -import com.jpexs.decompiler.flash.graph.OrItem; -import com.jpexs.decompiler.flash.graph.SourceGenerator; -import com.jpexs.decompiler.flash.graph.SwitchItem; -import com.jpexs.decompiler.flash.graph.TernarOpItem; -import com.jpexs.decompiler.flash.graph.WhileItem; +import com.jpexs.decompiler.graph.model.AndItem; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.CommaExpressionItem; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.model.DoWhileItem; +import com.jpexs.decompiler.graph.model.DuplicateItem; +import com.jpexs.decompiler.graph.model.ForItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.OrItem; +import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.SwitchItem; +import com.jpexs.decompiler.graph.model.TernarOpItem; +import com.jpexs.decompiler.graph.model.WhileItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import java.util.ArrayList; @@ -69,7 +69,7 @@ import java.util.List; * * @author JPEXS */ -public class ActionScriptSourceGenerator implements SourceGenerator { +public class ActionSourceGenerator implements SourceGenerator { @Override public List generate(List localData, AndItem item) { @@ -493,16 +493,16 @@ public class ActionScriptSourceGenerator implements SourceGenerator { } private String getName(GraphTargetItem item) { - if (item instanceof DirectValueTreeItem) { - DirectValueTreeItem dv = (DirectValueTreeItem) item; + if (item instanceof DirectValueActionItem) { + DirectValueActionItem dv = (DirectValueActionItem) item; return (String) dv.getResult(); } - if (item instanceof GetVariableTreeItem) { - GetVariableTreeItem gv = (GetVariableTreeItem) item; + if (item instanceof GetVariableActionItem) { + GetVariableActionItem gv = (GetVariableActionItem) item; return getName(gv.name); } - if (item instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) item; + if (item instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) item; return getName(mem.memberName); } return null; @@ -511,12 +511,12 @@ public class ActionScriptSourceGenerator implements SourceGenerator { private List getVarParts(GraphTargetItem item) { List ret = new ArrayList<>(); do { - if (item instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) item; + if (item instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) item; ret.add(0, getName(mem)); item = mem.object; } - } while (item instanceof GetMemberTreeItem); + } while (item instanceof GetMemberActionItem); String f = getName(item); if (f != null) { ret.add(0, f); @@ -527,12 +527,12 @@ public class ActionScriptSourceGenerator implements SourceGenerator { private int getVarLength(GraphTargetItem item) { int len = 1; do { - if (item instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) item; + if (item instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) item; item = mem.object; len++; } - } while (item instanceof GetMemberTreeItem); + } while (item instanceof GetMemberActionItem); return len; } @@ -540,8 +540,8 @@ public class ActionScriptSourceGenerator implements SourceGenerator { item = (GraphTargetItem) Helper.deepCopy(item); for (int i = 0; i < cnt; i++) { - if (item instanceof GetMemberTreeItem) { - GetMemberTreeItem mem = (GetMemberTreeItem) item; + if (item instanceof GetMemberActionItem) { + GetMemberActionItem mem = (GetMemberActionItem) item; item = mem.object; } } @@ -551,16 +551,16 @@ public class ActionScriptSourceGenerator implements SourceGenerator { private GraphTargetItem addGlobalPrefix(GraphTargetItem item) { item = (GraphTargetItem) Helper.deepCopy(item); GraphTargetItem first = item; - GetMemberTreeItem mem = null; + GetMemberActionItem mem = null; do { - if (item instanceof GetMemberTreeItem) { - mem = (GetMemberTreeItem) item; + if (item instanceof GetMemberActionItem) { + mem = (GetMemberActionItem) item; item = mem.object; } - } while (item instanceof GetMemberTreeItem); - if (item instanceof GetVariableTreeItem) { - GetVariableTreeItem v = (GetVariableTreeItem) item; - item = new GetMemberTreeItem(null, new GetVariableTreeItem(null, new DirectValueTreeItem(null, 0, "_global", new ArrayList())), v.name); + } while (item instanceof GetMemberActionItem); + if (item instanceof GetVariableActionItem) { + GetVariableActionItem v = (GetVariableActionItem) item; + item = new GetMemberActionItem(null, new GetVariableActionItem(null, new DirectValueActionItem(null, 0, "_global", new ArrayList())), v.name); if (mem != null) { mem.object = item; } @@ -593,7 +593,7 @@ public class ActionScriptSourceGenerator implements SourceGenerator { } private List constantPool; - public ActionScriptSourceGenerator(List constantPool) { + public ActionSourceGenerator(List constantPool) { this.constantPool = constantPool; } @@ -601,13 +601,13 @@ public class ActionScriptSourceGenerator implements SourceGenerator { return constantPool; } - public DirectValueTreeItem pushConstTargetItem(String s) { + public DirectValueActionItem pushConstTargetItem(String s) { int index = constantPool.indexOf(s); if (index == -1) { constantPool.add(s); index = constantPool.indexOf(s); } - return new DirectValueTreeItem(null, 0, new ConstantIndex(index), constantPool); + return new DirectValueActionItem(null, 0, new ConstantIndex(index), constantPool); } public ActionPush pushConst(String s) { @@ -661,20 +661,20 @@ public class ActionScriptSourceGenerator implements SourceGenerator { } constr.addAll(typeToActions(globalClassTypeStr, val)); } else { - constr.addAll(toActionList(((FunctionTreeItem) constructor).toSource(localData, this))); + constr.addAll(toActionList(((FunctionActionItem) constructor).toSource(localData, this))); constr.add(new ActionStoreRegister(1)); constr = (typeToActions(globalClassTypeStr, constr)); } if (!isInterface) { for (GraphTargetItem f : staticFunctions) { - FunctionTreeItem fi = (FunctionTreeItem) f; + FunctionActionItem fi = (FunctionActionItem) f; ifbody.add(new ActionPush(new RegisterNumber(1/*static*/))); ifbody.add(new ActionPush(getName(fi.calculatedFunctionName))); ifbody.addAll(toActionList(fi.toSource(localData, this))); ifbody.add(new ActionSetMember()); } for (GraphTargetItem f : functions) { - FunctionTreeItem fi = (FunctionTreeItem) f; + FunctionActionItem fi = (FunctionActionItem) f; ifbody.add(new ActionPush(new RegisterNumber(2/*instance*/))); ifbody.add(new ActionPush(getName(fi.calculatedFunctionName))); ifbody.addAll(toActionList(fi.toSource(localData, this))); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java index be4b8ad7a..f446580a6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionEnd.java @@ -17,7 +17,7 @@ package com.jpexs.decompiler.flash.action.special; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class ActionEnd extends Action { } @Override - public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { + public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { //output.add(new SimpleActionTreeItem(this, "end()")); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionNop.java b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionNop.java index 8c55fb1b5..17880cc47 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionNop.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionNop.java @@ -17,7 +17,7 @@ package com.jpexs.decompiler.flash.action.special; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class ActionNop extends Action { } @Override - public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { + public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { //output.add(new SimpleActionTreeItem(this, "nop();")); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java index cc0877f1a..c08659d2a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java @@ -21,13 +21,13 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.FSCommandTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetURLTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadMovieNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.UnLoadMovieNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.UnLoadMovieTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.FSCommandActionItem; +import com.jpexs.decompiler.flash.action.model.GetURLActionItem; +import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -84,7 +84,7 @@ public class ActionGetURL extends Action { String fsCommandPrefix = "FSCommand:"; if (urlString.startsWith(fsCommandPrefix) && targetString.equals("")) { String command = urlString.substring(fsCommandPrefix.length()); - output.add(new FSCommandTreeItem(this, command)); + output.add(new FSCommandActionItem(this, command)); return; } String levelPrefix = "_level"; @@ -92,10 +92,10 @@ public class ActionGetURL extends Action { try { int num = Integer.valueOf(targetString.substring(levelPrefix.length())); if (urlString.equals("")) { - output.add(new UnLoadMovieNumTreeItem(this, new DirectValueTreeItem((Long) (long) (int) num))); + output.add(new UnLoadMovieNumActionItem(this, new DirectValueActionItem((Long) (long) (int) num))); } else { - DirectValueTreeItem urlStringDi = new DirectValueTreeItem(null, 0, urlString, new ArrayList()); - output.add(new LoadMovieNumTreeItem(this, urlStringDi, new DirectValueTreeItem((Long) (long) (int) num), 1/*GET*/)); + DirectValueActionItem urlStringDi = new DirectValueActionItem(null, 0, urlString, new ArrayList()); + output.add(new LoadMovieNumActionItem(this, urlStringDi, new DirectValueActionItem((Long) (long) (int) num), 1/*GET*/)); } return; } catch (NumberFormatException nfe) { @@ -104,10 +104,10 @@ public class ActionGetURL extends Action { } if (urlString.equals("")) { - DirectValueTreeItem targetStringDi = new DirectValueTreeItem(null, 0, targetString, new ArrayList()); - output.add(new UnLoadMovieTreeItem(this, targetStringDi)); + DirectValueActionItem targetStringDi = new DirectValueActionItem(null, 0, targetString, new ArrayList()); + output.add(new UnLoadMovieActionItem(this, targetStringDi)); } else { - output.add(new GetURLTreeItem(this, urlString, targetString)); + output.add(new GetURLActionItem(this, urlString, targetString)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java index 02fb49089..1ba9431c4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.GotoLabelTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.GotoLabelActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -70,6 +70,6 @@ public class ActionGoToLabel extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new GotoLabelTreeItem(this, label)); + output.add(new GotoLabelActionItem(this, label)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java index fa3b5c26b..b7664433f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.GotoFrameTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.GotoFrameActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.HashMap; @@ -67,6 +67,6 @@ public class ActionGotoFrame extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new GotoFrameTreeItem(this, frame)); + output.add(new GotoFrameActionItem(this, frame)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java index 66c3ee265..0bb8b6592 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.NextFrameTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.NextFrameActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionNextFrame extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new NextFrameTreeItem(this)); + output.add(new NextFrameActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java index d214cb29b..6c0667300 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.PlayTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.PlayActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionPlay extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new PlayTreeItem(this)); + output.add(new PlayActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java index b64121570..8de690699 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.PrevFrameTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.PrevFrameActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionPrevFrame extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new PrevFrameTreeItem(this)); + output.add(new PrevFrameActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java index d43373f98..f48b817bd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.SetTargetTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.SetTargetActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -70,6 +70,6 @@ public class ActionSetTarget extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new SetTargetTreeItem(this, targetName)); + output.add(new SetTargetActionItem(this, targetName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java index b7ba44e65..b75814f01 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.StopTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.StopActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionStop extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new StopTreeItem(this)); + output.add(new StopActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java index 00a472f0f..986b46c4e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.StopAllSoundsTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.StopAllSoundsActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionStopSounds extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new StopAllSoundsTreeItem(this)); + output.add(new StopAllSoundsActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java index 60380afb5..519b483ed 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ToggleHighQualityTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ToggleHighQualityActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionToggleQuality extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new ToggleHighQualityTreeItem(this)); + output.add(new ToggleHighQualityActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java index db9259292..67c5a366d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java @@ -24,9 +24,9 @@ import com.jpexs.decompiler.flash.action.ActionGraph; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.special.ActionStore; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.IfFrameLoadedTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -84,9 +84,9 @@ public class ActionWaitForFrame extends Action implements ActionStore { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - GraphTargetItem frameTi = new DirectValueTreeItem(null, 0, new Long(frame), new ArrayList()); + GraphTargetItem frameTi = new DirectValueActionItem(null, 0, new Long(frame), new ArrayList()); List body = ActionGraph.translateViaGraph(regNames, variables, functions, skipped, SWF.DEFAULT_VERSION, staticOperation, path); - output.add(new IfFrameLoadedTreeItem(frameTi, body, this)); + output.add(new IfFrameLoadedActionItem(frameTi, body, this)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAdd.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAdd.java index 7ec69ca4c..ab4be178e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAdd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAdd.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionAdd extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new AddTreeItem(this, b, a, false)); + stack.push(new AddActionItem(this, b, a, false)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAnd.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAnd.java index dd209bbc4..01c49b049 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAnd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAnd.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.AndTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.AndActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionAnd extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new AndTreeItem(this, b, a)); + stack.push(new AndActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java index 942bb2f67..6989e2caf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.AsciiToCharTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.AsciiToCharActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionAsciiToChar extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new AsciiToCharTreeItem(this, a)); + stack.push(new AsciiToCharActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java index ca3fae39d..ec3735d4a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.CallTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.CallActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionCall extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new CallTreeItem(this, stack.pop())); + output.add(new CallActionItem(this, stack.pop())); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java index 418cd0107..a36bad5fe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.CharToAsciiTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.CharToAsciiActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionCharToAscii extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new CharToAsciiTreeItem(this, a)); + stack.push(new CharToAsciiActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java index 74cc78c71..50cd62523 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.CloneSpriteTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.CloneSpriteActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,6 +39,6 @@ public class ActionCloneSprite extends Action { GraphTargetItem depth = stack.pop(); GraphTargetItem source = stack.pop(); GraphTargetItem target = stack.pop(); - output.add(new CloneSpriteTreeItem(this, source, target, depth)); + output.add(new CloneSpriteActionItem(this, source, target, depth)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionDivide.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionDivide.java index 36ae82c7d..d1ad66a65 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionDivide.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionDivide.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.DivideTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.DivideActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionDivide extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new DivideTreeItem(this, b, a)); + stack.push(new DivideActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java index 2fa568ba8..58a8abe17 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.StopDragTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.StopDragActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionEndDrag extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - output.add(new StopDragTreeItem(this)); + output.add(new StopDragActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEquals.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEquals.java index 32b995ff2..87ead409b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEquals.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEquals.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.EqTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.EqActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionEquals extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new EqTreeItem(this, b, a, false)); + stack.push(new EqActionItem(this, b, a, false)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java index 1f77a8a37..79eb022eb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetPropertyTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,11 +40,11 @@ public class ActionGetProperty extends Action { GraphTargetItem index = stack.pop(); GraphTargetItem target = stack.pop(); int indexInt = 0; - if (index instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) index).value instanceof Long) { - indexInt = (int) (long) (Long) ((DirectValueTreeItem) index).value; + if (index instanceof DirectValueActionItem) { + if (((DirectValueActionItem) index).value instanceof Long) { + indexInt = (int) (long) (Long) ((DirectValueActionItem) index).value; } } - stack.push(new GetPropertyTreeItem(this, target, indexInt)); + stack.push(new GetPropertyActionItem(this, target, indexInt)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetTime.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetTime.java index 1d8cdbbfb..54b5bec3e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetTime.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetTime.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.GetTimeTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.GetTimeActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,6 +36,6 @@ public class ActionGetTime extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { - stack.push(new GetTimeTreeItem(this)); + stack.push(new GetTimeActionItem(this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java index f814da7f2..421620832 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java @@ -21,19 +21,19 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetURL2TreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadMovieNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadMovieTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadVariablesNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.LoadVariablesTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintAsBitmapNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintAsBitmapTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PrintTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.UnLoadMovieNumTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.UnLoadMovieTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.GetURL2ActionItem; +import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.model.LoadMovieActionItem; +import com.jpexs.decompiler.flash.action.model.LoadVariablesNumActionItem; +import com.jpexs.decompiler.flash.action.model.LoadVariablesActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapNumActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapActionItem; +import com.jpexs.decompiler.flash.action.model.PrintNumActionItem; +import com.jpexs.decompiler.flash.action.model.PrintActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -111,15 +111,15 @@ public class ActionGetURL2 extends Action { } if (loadVariablesFlag) { if (num != null) { - output.add(new LoadVariablesNumTreeItem(this, urlString, new DirectValueTreeItem(null, 0, (Long) (long) (int) num, new ArrayList()), sendVarsMethod)); + output.add(new LoadVariablesNumActionItem(this, urlString, new DirectValueActionItem(null, 0, (Long) (long) (int) num, new ArrayList()), sendVarsMethod)); } else { - output.add(new LoadVariablesTreeItem(this, urlString, targetString, sendVarsMethod)); + output.add(new LoadVariablesActionItem(this, urlString, targetString, sendVarsMethod)); } } else if (loadTargetFlag) { - if ((urlString instanceof DirectValueTreeItem) && (urlString.getResult().equals(""))) { - output.add(new UnLoadMovieTreeItem(this, targetString)); + if ((urlString instanceof DirectValueActionItem) && (urlString.getResult().equals(""))) { + output.add(new UnLoadMovieActionItem(this, targetString)); } else { - output.add(new LoadMovieTreeItem(this, urlString, targetString, sendVarsMethod)); + output.add(new LoadMovieActionItem(this, urlString, targetString, sendVarsMethod)); } } else { String printPrefix = "print:#"; @@ -131,22 +131,22 @@ public class ActionGetURL2 extends Action { if (num != null) { if ("".equals(urlStr)) { - output.add(new UnLoadMovieNumTreeItem(this, new DirectValueTreeItem(null, 0, (Long) (long) (int) num, new ArrayList()))); + output.add(new UnLoadMovieNumActionItem(this, new DirectValueActionItem(null, 0, (Long) (long) (int) num, new ArrayList()))); } else if (urlStr != null && urlStr.startsWith(printPrefix)) { - output.add(new PrintNumTreeItem(this, new DirectValueTreeItem((Long) (long) (int) num), - new DirectValueTreeItem(urlStr.substring(printPrefix.length())))); + output.add(new PrintNumActionItem(this, new DirectValueActionItem((Long) (long) (int) num), + new DirectValueActionItem(urlStr.substring(printPrefix.length())))); } else if (urlStr != null && urlStr.startsWith(printAsBitmapPrefix)) { - output.add(new PrintAsBitmapNumTreeItem(this, new DirectValueTreeItem((Long) (long) (int) num), new DirectValueTreeItem(urlStr.substring(printAsBitmapPrefix.length())))); + output.add(new PrintAsBitmapNumActionItem(this, new DirectValueActionItem((Long) (long) (int) num), new DirectValueActionItem(urlStr.substring(printAsBitmapPrefix.length())))); } else { - output.add(new LoadMovieNumTreeItem(this, urlString, new DirectValueTreeItem(null, 0, (Long) (long) (int) num, new ArrayList()), sendVarsMethod)); + output.add(new LoadMovieNumActionItem(this, urlString, new DirectValueActionItem(null, 0, (Long) (long) (int) num, new ArrayList()), sendVarsMethod)); } } else { if (urlStr != null && urlStr.startsWith(printPrefix)) { - output.add(new PrintTreeItem(this, targetString, new DirectValueTreeItem(urlStr.substring(printPrefix.length())))); + output.add(new PrintActionItem(this, targetString, new DirectValueActionItem(urlStr.substring(printPrefix.length())))); } else if (urlStr != null && urlStr.startsWith(printAsBitmapPrefix)) { - output.add(new PrintAsBitmapTreeItem(this, targetString, new DirectValueTreeItem(urlStr.substring(printAsBitmapPrefix.length())))); + output.add(new PrintAsBitmapActionItem(this, targetString, new DirectValueActionItem(urlStr.substring(printAsBitmapPrefix.length())))); } else { - output.add(new GetURL2TreeItem(this, urlString, targetString, sendVarsMethod)); + output.add(new GetURL2ActionItem(this, urlString, targetString, sendVarsMethod)); } } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java index c4f642d44..6b2947033 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java @@ -17,12 +17,12 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.EvalTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVersionTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.EvalActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.GetVersionActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; @@ -43,12 +43,12 @@ public class ActionGetVariable extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem name = stack.pop(); GraphTargetItem computedVal = variables.get(Highlighting.stripHilights(name.toStringNoQuotes((ConstantPool) null))); - if (name instanceof DirectValueTreeItem && ((DirectValueTreeItem) name).value.equals("/:$version")) { - stack.push(new GetVersionTreeItem(this)); - } else if (!(name instanceof DirectValueTreeItem) && !(name instanceof GetVariableTreeItem)) { - stack.push(new EvalTreeItem(this, name)); + if (name instanceof DirectValueActionItem && ((DirectValueActionItem) name).value.equals("/:$version")) { + stack.push(new GetVersionActionItem(this)); + } else if (!(name instanceof DirectValueActionItem) && !(name instanceof GetVariableActionItem)) { + stack.push(new EvalActionItem(this, name)); } else { - GetVariableTreeItem gvt = new GetVariableTreeItem(this, name); + GetVariableActionItem gvt = new GetVariableActionItem(this, name); gvt.setComputedValue(computedVal); stack.push(gvt); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java index 3d3b18352..bb9f7ffe3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.GotoFrame2TreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.GotoFrame2ActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.HashMap; @@ -86,6 +86,6 @@ public class ActionGotoFrame2 extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem frame = stack.pop(); - output.add(new GotoFrame2TreeItem(this, frame, sceneBiasFlag, playFlag, sceneBias)); + output.add(new GotoFrame2ActionItem(this, frame, sceneBiasFlag, playFlag, sceneBias)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java index c5de5cfc6..bb43d9fcc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java @@ -22,8 +22,8 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraphSource; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java index e36e32529..be0432683 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java @@ -22,8 +22,8 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraphSource; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.graph.GraphSource; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSource; +import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionLess.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionLess.java index ce553b1c4..c235e44fa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionLess.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionLess.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.LtTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.LtActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionLess extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new LtTreeItem(this, b, a, false)); + stack.push(new LtActionItem(this, b, a, false)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java index 7771aa360..db9778cdc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.MBAsciiToCharTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.MBAsciiToCharActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionMBAsciiToChar extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new MBAsciiToCharTreeItem(this, a)); + stack.push(new MBAsciiToCharActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java index 4b78b4ecd..b2ce3ea83 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.MBCharToAsciiTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.MBCharToAsciiActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionMBCharToAscii extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new MBCharToAsciiTreeItem(this, a)); + stack.push(new MBCharToAsciiActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringExtract.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringExtract.java index 0f0f21a25..fedd4b81c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringExtract.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringExtract.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.MBStringExtractTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.MBStringExtractActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,6 +39,6 @@ public class ActionMBStringExtract extends Action { GraphTargetItem count = stack.pop(); GraphTargetItem index = stack.pop(); GraphTargetItem value = stack.pop(); - stack.push(new MBStringExtractTreeItem(this, value, index, count)); + stack.push(new MBStringExtractActionItem(this, value, index, count)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java index 04ee4b90a..559cb2a89 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.MBStringLengthTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.MBStringLengthActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionMBStringLength extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new MBStringLengthTreeItem(this, a)); + stack.push(new MBStringLengthActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMultiply.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMultiply.java index 20f5e0c75..7c6350316 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMultiply.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMultiply.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.MultiplyTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.MultiplyActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionMultiply extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new MultiplyTreeItem(this, b, a)); + stack.push(new MultiplyActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java index 7c2bcf1f9..cd7fa8287 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.graph.NotItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.NotItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionOr.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionOr.java index 8daf6a847..36d78c278 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionOr.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionOr.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.OrTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.OrActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionOr extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new OrTreeItem(this, b, a)); + stack.push(new OrActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java index 954b04ce3..1e5e539ec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java @@ -17,11 +17,11 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.CallFunctionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.CallMethodTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.NewMethodTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetTypeTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; +import com.jpexs.decompiler.flash.action.model.CallMethodActionItem; +import com.jpexs.decompiler.flash.action.model.NewMethodActionItem; +import com.jpexs.decompiler.flash.action.model.SetTypeActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,15 +43,15 @@ public class ActionPop extends Action { return; } GraphTargetItem val = stack.pop(); - if ((val instanceof CallFunctionTreeItem) || (val instanceof CallMethodTreeItem) || (val instanceof NewMethodTreeItem)) { + if ((val instanceof CallFunctionActionItem) || (val instanceof CallMethodActionItem) || (val instanceof NewMethodActionItem)) { output.add(val); - } else if (val instanceof SetTypeTreeItem) { + } else if (val instanceof SetTypeActionItem) { output.add(val); } else { - //output.add(new PopTreeItem(this)); + //output.add(new PopActionItem(this)); } - /*if (!(val instanceof DirectValueTreeItem)) { - output.add(new VoidTreeItem(this, val)); + /*if (!(val instanceof DirectValueActionItem)) { + output.add(new VoidActionItem(this, val)); }*/ } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java index 623149e5d..a4beb7d47 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java @@ -23,11 +23,11 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.ByteArrayInputStream; @@ -323,16 +323,16 @@ public class ActionPush extends Action { } else if (output.size() >= 2) { //chained assignments:, ignore for class prototype assignment GraphTargetItem last = output.get(output.size() - 1); GraphTargetItem prev = output.get(output.size() - 2); - if (last instanceof SetTypeTreeItem) { - if (prev instanceof StoreRegisterTreeItem) { - StoreRegisterTreeItem str = (StoreRegisterTreeItem) prev; + if (last instanceof SetTypeActionItem) { + if (prev instanceof StoreRegisterActionItem) { + StoreRegisterActionItem str = (StoreRegisterActionItem) prev; if (str.register.number == ((RegisterNumber) o).number) { - SetTypeTreeItem stt = (SetTypeTreeItem) last; + SetTypeActionItem stt = (SetTypeActionItem) last; stt.setTempRegister(((RegisterNumber) o).number); - if ((stt.getValue() instanceof IncrementTreeItem) && (((IncrementTreeItem) stt.getValue()).object.equals(stt.getObject()))) { - stack.push(new PreIncrementTreeItem(this, stt.getObject())); - } else if ((stt.getValue() instanceof DecrementTreeItem) && (((DecrementTreeItem) stt.getValue()).object.equals(stt.getObject()))) { - stack.push(new PreDecrementTreeItem(this, stt.getObject())); + if ((stt.getValue() instanceof IncrementActionItem) && (((IncrementActionItem) stt.getValue()).object.equals(stt.getObject()))) { + stack.push(new PreIncrementActionItem(this, stt.getObject())); + } else if ((stt.getValue() instanceof DecrementActionItem) && (((DecrementActionItem) stt.getValue()).object.equals(stt.getObject()))) { + stack.push(new PreDecrementActionItem(this, stt.getObject())); } else { //stack.push(last); continue; @@ -346,7 +346,7 @@ public class ActionPush extends Action { } } }*/ - DirectValueTreeItem dvt = new DirectValueTreeItem(this, pos, o, constantPool); + DirectValueActionItem dvt = new DirectValueActionItem(this, pos, o, constantPool); stack.push(dvt); if (o instanceof RegisterNumber) { dvt.computedRegValue = variables.get("__register" + ((RegisterNumber) o).number); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java index 4f4a48c1d..c3b241b13 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.RandomNumberTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.RandomNumberActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionRandomNumber extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem maximum = stack.pop(); - stack.push(new RandomNumberTreeItem(this, maximum)); + stack.push(new RandomNumberActionItem(this, maximum)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java index 449a7bf8f..20d73f477 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.RemoveSpriteTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.RemoveSpriteActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionRemoveSprite extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem target = stack.pop(); - output.add(new RemoveSpriteTreeItem(this, target)); + output.add(new RemoveSpriteActionItem(this, target)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java index b45de6ddb..c4b770f6f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java @@ -17,14 +17,14 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetPropertyTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DecrementActionItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.IncrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; +import com.jpexs.decompiler.flash.action.model.SetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -46,34 +46,34 @@ public class ActionSetProperty extends Action { GraphTargetItem index = stack.pop().getThroughDuplicate(); GraphTargetItem target = stack.pop().getThroughDuplicate(); int indexInt = 0; - if (index instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) index).value instanceof Long) { - indexInt = (int) (long) (Long) ((DirectValueTreeItem) index).value; + if (index instanceof DirectValueActionItem) { + if (((DirectValueActionItem) index).value instanceof Long) { + indexInt = (int) (long) (Long) ((DirectValueActionItem) index).value; } } - if (value.getThroughDuplicate() instanceof IncrementTreeItem) { - GraphTargetItem obj = ((IncrementTreeItem) value).object; + if (value.getThroughDuplicate() instanceof IncrementActionItem) { + GraphTargetItem obj = ((IncrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostIncrementTreeItem(this, obj)); + stack.push(new PostIncrementActionItem(this, obj)); return; } } } - if (value instanceof DecrementTreeItem) { - GraphTargetItem obj = ((DecrementTreeItem) value).object; + if (value instanceof DecrementActionItem) { + GraphTargetItem obj = ((DecrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostDecrementTreeItem(this, obj)); + stack.push(new PostDecrementActionItem(this, obj)); return; } } } - if (value instanceof StoreRegisterTreeItem) { - ((StoreRegisterTreeItem) value).define = false; + if (value instanceof StoreRegisterActionItem) { + ((StoreRegisterActionItem) value).define = false; } - output.add(new SetPropertyTreeItem(this, target, indexInt, value)); + output.add(new SetPropertyActionItem(this, target, indexInt, value)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java index 0f99012cd..0f41fa1d5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.SetTarget2TreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.SetTarget2ActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionSetTarget2 extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem target = stack.pop(); - output.add(new SetTarget2TreeItem(this, target)); + output.add(new SetTarget2ActionItem(this, target)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java index bc57edcb3..be6a9ad39 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java @@ -17,15 +17,15 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetVariableTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DecrementActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.IncrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; +import com.jpexs.decompiler.flash.action.model.SetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; @@ -47,46 +47,46 @@ public class ActionSetVariable extends Action { GraphTargetItem value = stack.pop().getThroughDuplicate(); GraphTargetItem name = stack.pop(); variables.put(Highlighting.stripHilights(name.toStringNoQuotes((ConstantPool) null)), value); - if (value instanceof IncrementTreeItem) { - GraphTargetItem obj = ((IncrementTreeItem) value).object; + if (value instanceof IncrementActionItem) { + GraphTargetItem obj = ((IncrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostIncrementTreeItem(this, obj)); + stack.push(new PostIncrementActionItem(this, obj)); return; } } } - if (value instanceof DecrementTreeItem) { - GraphTargetItem obj = ((DecrementTreeItem) value).object; + if (value instanceof DecrementActionItem) { + GraphTargetItem obj = ((DecrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostDecrementTreeItem(this, obj)); + stack.push(new PostDecrementActionItem(this, obj)); return; } } } - if (value instanceof IncrementTreeItem) { - if (((IncrementTreeItem) value).object instanceof GetVariableTreeItem) { - if (((GetVariableTreeItem) ((IncrementTreeItem) value).object).name.valueEquals(name)) { - output.add(new PostIncrementTreeItem(this, ((IncrementTreeItem) value).object)); + if (value instanceof IncrementActionItem) { + if (((IncrementActionItem) value).object instanceof GetVariableActionItem) { + if (((GetVariableActionItem) ((IncrementActionItem) value).object).name.valueEquals(name)) { + output.add(new PostIncrementActionItem(this, ((IncrementActionItem) value).object)); return; } } } - if (value instanceof DecrementTreeItem) { - if (((DecrementTreeItem) value).object instanceof GetVariableTreeItem) { - if (((GetVariableTreeItem) ((DecrementTreeItem) value).object).name.valueEquals(name)) { - output.add(new PostDecrementTreeItem(this, ((DecrementTreeItem) value).object)); + if (value instanceof DecrementActionItem) { + if (((DecrementActionItem) value).object instanceof GetVariableActionItem) { + if (((GetVariableActionItem) ((DecrementActionItem) value).object).name.valueEquals(name)) { + output.add(new PostDecrementActionItem(this, ((DecrementActionItem) value).object)); return; } } } - if (value instanceof StoreRegisterTreeItem) { - ((StoreRegisterTreeItem) value).define = false; + if (value instanceof StoreRegisterActionItem) { + ((StoreRegisterActionItem) value).define = false; } - SetVariableTreeItem svt = new SetVariableTreeItem(this, name, value); + SetVariableActionItem svt = new SetVariableActionItem(this, name, value); output.add(svt); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java index f205f7173..65e23be0e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StartDragTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.StartDragActionItem; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,7 +43,7 @@ public class ActionStartDrag extends Action { GraphTargetItem constrain = stack.pop(); boolean hasConstrains = true; - if (constrain instanceof DirectValueTreeItem) { + if (constrain instanceof DirectValueActionItem) { if (Double.compare(EcmaScript.toNumber(constrain.getResult()), 0) == 0) { hasConstrains = false; } @@ -58,6 +58,6 @@ public class ActionStartDrag extends Action { y1 = stack.pop(); x1 = stack.pop(); } - output.add(new StartDragTreeItem(this, target, lockCenter, constrain, x1, y1, x2, y2)); + output.add(new StartDragActionItem(this, target, lockCenter, constrain, x1, y1, x2, y2)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringAdd.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringAdd.java index 202d10fe3..bd7cb3706 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringAdd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringAdd.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.StringAddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.StringAddActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionStringAdd extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new StringAddTreeItem(this, b, a)); + stack.push(new StringAddActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringEquals.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringEquals.java index 345acf958..bbd33dd97 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringEquals.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringEquals.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.StringEqTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.StringEqActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionStringEquals extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new StringEqTreeItem(this, b, a)); + stack.push(new StringEqActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringExtract.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringExtract.java index 4d5f06617..7b10dc49a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringExtract.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringExtract.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.StringExtractTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.StringExtractActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,6 +39,6 @@ public class ActionStringExtract extends Action { GraphTargetItem count = stack.pop(); GraphTargetItem index = stack.pop(); GraphTargetItem value = stack.pop(); - stack.push(new StringExtractTreeItem(this, value, index, count)); + stack.push(new StringExtractActionItem(this, value, index, count)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java index 0279629e4..e0f166f03 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.StringLengthTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.StringLengthActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionStringLength extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new StringLengthTreeItem(this, a)); + stack.push(new StringLengthActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLess.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLess.java index 2cb482671..704d284bb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLess.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLess.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.StringLtTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.StringLtActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionStringLess extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new StringLtTreeItem(this, b, a)); + stack.push(new StringLtActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSubtract.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSubtract.java index 82af53318..e0fb60364 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSubtract.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSubtract.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.SubtractTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.SubtractActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionSubtract extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new SubtractTreeItem(this, b, a)); + stack.push(new SubtractActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java index d2281991a..58f2b8652 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ToIntegerTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ToIntegerActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionToInteger extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new ToIntegerTreeItem(this, a)); + stack.push(new ToIntegerActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java index 1b09f2140..22dd6f2a6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.TraceTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.TraceActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionTrace extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem value = stack.pop(); - output.add(new TraceTreeItem(this, value)); + output.add(new TraceActionItem(this, value)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java index 4652cc5f2..3e7d7f085 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java @@ -24,8 +24,8 @@ import com.jpexs.decompiler.flash.action.ActionGraph; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.special.ActionStore; -import com.jpexs.decompiler.flash.action.treemodel.clauses.IfFrameLoadedTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -93,6 +93,6 @@ public class ActionWaitForFrame2 extends Action implements ActionStore { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem frame = stack.pop(); List body = ActionGraph.translateViaGraph(regNames, variables, functions, skipped, SWF.DEFAULT_VERSION, staticOperation, path); - output.add(new IfFrameLoadedTreeItem(frame, body, this)); + output.add(new IfFrameLoadedActionItem(frame, body, this)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionAdd2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionAdd2.java index cb6dc9e7c..b2b39bfce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionAdd2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionAdd2.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.AddTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionAdd2 extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new AddTreeItem(this, b, a, true)); + stack.push(new AddActionItem(this, b, a, true)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitAnd.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitAnd.java index b2e6e41ce..e28c913d2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitAnd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitAnd.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.BitAndTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.BitAndActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionBitAnd extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new BitAndTreeItem(this, b, a)); + stack.push(new BitAndActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitLShift.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitLShift.java index be02090a4..742faf6a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitLShift.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitLShift.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.LShiftTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.LShiftActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionBitLShift extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new LShiftTreeItem(this, b, a)); + stack.push(new LShiftActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitOr.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitOr.java index a33d574b9..228d60f16 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitOr.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitOr.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.BitOrTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.BitOrActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionBitOr extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new BitOrTreeItem(this, b, a)); + stack.push(new BitOrActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitRShift.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitRShift.java index b7a18ff0d..baa88a233 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitRShift.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitRShift.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.RShiftTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.RShiftActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionBitRShift extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new RShiftTreeItem(this, b, a)); + stack.push(new RShiftActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitURShift.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitURShift.java index e9f7b7757..4bdc8f014 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitURShift.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitURShift.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.URShiftTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.URShiftActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionBitURShift extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new URShiftTreeItem(this, b, a)); + stack.push(new URShiftActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitXor.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitXor.java index 72486d648..3e01bfc31 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitXor.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitXor.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.BitXorTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.BitXorActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionBitXor extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new BitXorTreeItem(this, b, a)); + stack.push(new BitXorActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java index 619bbcc98..a96d01042 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.CallFunctionTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.ArrayList; import java.util.HashMap; @@ -45,7 +45,7 @@ public class ActionCallFunction extends Action { for (long l = 0; l < numArgs; l++) { args.add(stack.pop()); } - CallFunctionTreeItem cft = new CallFunctionTreeItem(this, functionName, args); + CallFunctionActionItem cft = new CallFunctionActionItem(this, functionName, args); cft.calculatedFunction = functions.get(Highlighting.stripHilights(functionName.toStringNoQuotes((ConstantPool) null))); stack.push(cft); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java index 4737e48bf..ec5612462 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.CallMethodTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.CallMethodActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -44,6 +44,6 @@ public class ActionCallMethod extends Action { for (long l = 0; l < numArgs; l++) { args.add(stack.pop()); } - stack.push(new CallMethodTreeItem(this, scriptObject, methodName, args)); + stack.push(new CallMethodActionItem(this, scriptObject, methodName, args)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java index f22da39cd..2a508f8e5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java @@ -22,7 +22,7 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java index 9cbd26532..45dac3dd0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DecrementActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionDecrement extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new DecrementTreeItem(this, a)); + stack.push(new DecrementActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java index 6eea8293c..c9687819a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java @@ -23,10 +23,10 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; -import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -204,7 +204,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta @Override public void translateContainer(List> content, Stack stack, List output, HashMap regNames, HashMap variables, HashMap functions) { - FunctionTreeItem fti = new FunctionTreeItem(this, functionName, paramNames, content.get(0), constantPool, 1); + FunctionActionItem fti = new FunctionActionItem(this, functionName, paramNames, content.get(0), constantPool, 1); //ActionGraph.translateViaGraph(regNames, variables, functions, code, version) stack.push(fti); functions.put(functionName, fti); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java index cbf013479..1cd2ebc49 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; -import com.jpexs.decompiler.flash.action.treemodel.DefineLocalTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DefineLocalActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; @@ -41,6 +41,6 @@ public class ActionDefineLocal extends Action { GraphTargetItem value = stack.pop(); GraphTargetItem name = stack.pop(); variables.put(Highlighting.stripHilights(name.toStringNoQuotes((ConstantPool) null)), value); - output.add(new DefineLocalTreeItem(this, name, value)); + output.add(new DefineLocalActionItem(this, name, value)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal2.java index ef52e620e..17020ff37 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal2.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DefineLocalTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DefineLocalActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionDefineLocal2 extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem name = stack.pop(); - output.add(new DefineLocalTreeItem(this, name, null)); + output.add(new DefineLocalActionItem(this, name, null)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java index 883ca4e4d..81de0a32c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DeleteTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DeleteActionItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -41,7 +41,7 @@ public class ActionDelete extends Action { GraphTargetItem propertyName = stack.pop(); GraphTargetItem object = stack.pop(); - output.add(new DeleteTreeItem(this, object, propertyName)); - stack.push(new DirectValueTreeItem(this, -1, Boolean.TRUE, new ArrayList())); + output.add(new DeleteActionItem(this, object, propertyName)); + stack.push(new DirectValueActionItem(this, -1, Boolean.TRUE, new ArrayList())); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java index 4f3e9a63c..5a4da9f13 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DeleteTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DeleteActionItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,7 +40,7 @@ public class ActionDelete2 extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem propertyName = stack.pop(); - output.add(new DeleteTreeItem(this, null, propertyName)); - stack.push(new DirectValueTreeItem(this, -1, Boolean.TRUE, new ArrayList())); + output.add(new DeleteActionItem(this, null, propertyName)); + stack.push(new DirectValueActionItem(this, -1, Boolean.TRUE, new ArrayList())); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java index cd43ace10..7395b7714 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.EnumerateTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.EnumerateActionItem; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,7 +40,7 @@ public class ActionEnumerate extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); - stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList())); - stack.push(new EnumerateTreeItem(this, object)); + stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList())); + stack.push(new EnumerateActionItem(this, object)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEquals2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEquals2.java index 1d5ebf568..d5ac46145 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEquals2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEquals2.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.EqTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.EqActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionEquals2 extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new EqTreeItem(this, b, a, true)); + stack.push(new EqActionItem(this, b, a, true)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java index 251d55584..b7440b720 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionGetMember extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem functionName = stack.pop(); GraphTargetItem object = stack.pop(); - stack.push(new GetMemberTreeItem(this, object, functionName)); + stack.push(new GetMemberActionItem(this, object, functionName)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java index e8ea9b5d8..6164f14f7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.IncrementActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionIncrement extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); - stack.push(new IncrementTreeItem(this, a)); + stack.push(new IncrementActionItem(this, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java index 1ce54685e..16c294631 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.InitArrayTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.InitArrayActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -37,7 +37,7 @@ public class ActionInitArray extends Action { for (int l = 0; l < numArgs; l++) { args.add(stack.pop()); } - stack.push(new InitArrayTreeItem(this, args)); + stack.push(new InitArrayActionItem(this, args)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java index 2bbcb3a15..7a1cfd173 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.InitObjectTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.InitObjectActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -44,6 +44,6 @@ public class ActionInitObject extends Action { values.add(stack.pop()); names.add(stack.pop()); } - stack.push(new InitObjectTreeItem(this, names, values)); + stack.push(new InitObjectActionItem(this, names, values)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionLess2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionLess2.java index bbbf91061..9bcd7796e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionLess2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionLess2.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.LtTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.LtActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionLess2 extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new LtTreeItem(this, b, a, true)); + stack.push(new LtActionItem(this, b, a, true)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionModulo.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionModulo.java index 9a9aa8884..845550420 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionModulo.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionModulo.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.ModuloTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.ModuloActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionModulo extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new ModuloTreeItem(this, b, a)); + stack.push(new ModuloActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java index 8fee219ef..d514eb830 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.NewMethodTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.NewMethodActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -44,6 +44,6 @@ public class ActionNewMethod extends Action { for (long l = 0; l < numArgs; l++) { args.add(stack.pop()); } - stack.push(new NewMethodTreeItem(this, scriptObject, methodName, args)); + stack.push(new NewMethodActionItem(this, scriptObject, methodName, args)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java index 4abd4deb3..ea2078e1b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.NewObjectTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.NewObjectActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -43,6 +43,6 @@ public class ActionNewObject extends Action { for (long l = 0; l < numArgs; l++) { args.add(stack.pop()); } - stack.push(new NewObjectTreeItem(this, objectName, args)); + stack.push(new NewObjectActionItem(this, objectName, args)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java index d8944e670..2ee5cc314 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java index bce6abefe..e9a509a77 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ReturnTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ReturnActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class ActionReturn extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem value = stack.pop(); - output.add(new ReturnTreeItem(this, value)); + output.add(new ReturnActionItem(this, value)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java index 8415554ee..0ea33b051 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java @@ -17,14 +17,14 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.SetMemberTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DecrementActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.IncrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; +import com.jpexs.decompiler.flash.action.model.SetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -45,50 +45,50 @@ public class ActionSetMember extends Action { GraphTargetItem value = stack.pop().getThroughDuplicate(); GraphTargetItem memberName = stack.pop(); GraphTargetItem object = stack.pop(); - if (value instanceof IncrementTreeItem) { - GraphTargetItem obj = ((IncrementTreeItem) value).object; + if (value instanceof IncrementActionItem) { + GraphTargetItem obj = ((IncrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostIncrementTreeItem(this, obj)); + stack.push(new PostIncrementActionItem(this, obj)); return; } } } - if (value instanceof DecrementTreeItem) { - GraphTargetItem obj = ((DecrementTreeItem) value).object; + if (value instanceof DecrementActionItem) { + GraphTargetItem obj = ((DecrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostDecrementTreeItem(this, obj)); + stack.push(new PostDecrementActionItem(this, obj)); return; } } } - if (value instanceof IncrementTreeItem) { - if (((IncrementTreeItem) value).object instanceof GetMemberTreeItem) { - if (((GetMemberTreeItem) ((IncrementTreeItem) value).object).object.equals(object)) { - if (((GetMemberTreeItem) ((IncrementTreeItem) value).object).memberName.equals(memberName)) { - output.add(new PostIncrementTreeItem(this, ((IncrementTreeItem) value).object)); + if (value instanceof IncrementActionItem) { + if (((IncrementActionItem) value).object instanceof GetMemberActionItem) { + if (((GetMemberActionItem) ((IncrementActionItem) value).object).object.equals(object)) { + if (((GetMemberActionItem) ((IncrementActionItem) value).object).memberName.equals(memberName)) { + output.add(new PostIncrementActionItem(this, ((IncrementActionItem) value).object)); return; } } } } - if (value instanceof DecrementTreeItem) { - if (((DecrementTreeItem) value).object instanceof GetMemberTreeItem) { - if (((GetMemberTreeItem) ((DecrementTreeItem) value).object).object.valueEquals(object)) { - if (((GetMemberTreeItem) ((DecrementTreeItem) value).object).memberName.equals(memberName)) { - output.add(new PostDecrementTreeItem(this, ((DecrementTreeItem) value).object)); + if (value instanceof DecrementActionItem) { + if (((DecrementActionItem) value).object instanceof GetMemberActionItem) { + if (((GetMemberActionItem) ((DecrementActionItem) value).object).object.valueEquals(object)) { + if (((GetMemberActionItem) ((DecrementActionItem) value).object).memberName.equals(memberName)) { + output.add(new PostDecrementActionItem(this, ((DecrementActionItem) value).object)); return; } } } } - if (value instanceof StoreRegisterTreeItem) { - ((StoreRegisterTreeItem) value).define = false; + if (value instanceof StoreRegisterActionItem) { + ((StoreRegisterActionItem) value).define = false; } - output.add(new SetMemberTreeItem(this, object, memberName, value)); + output.add(new SetMemberActionItem(this, object, memberName, value)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStackSwap.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStackSwap.java index 5e5d73a0d..4f01a2852 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStackSwap.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStackSwap.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java index 3a9d3e9f4..b2b9b4f69 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java @@ -22,14 +22,14 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; -import com.jpexs.decompiler.flash.action.treemodel.DecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.IncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostDecrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.PostIncrementTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemPos; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DecrementActionItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.IncrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; +import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.HashMap; @@ -82,43 +82,43 @@ public class ActionStoreRegister extends Action { value.moreSrc.add(new GraphSourceItemPos(this, 0)); boolean define = !variables.containsKey("__register" + registerNumber); variables.put("__register" + registerNumber, value); - if (value instanceof DirectValueTreeItem) { - if (((DirectValueTreeItem) value).value instanceof RegisterNumber) { - if (((RegisterNumber) ((DirectValueTreeItem) value).value).number == registerNumber) { + if (value instanceof DirectValueActionItem) { + if (((DirectValueActionItem) value).value instanceof RegisterNumber) { + if (((RegisterNumber) ((DirectValueActionItem) value).value).number == registerNumber) { stack.push(value); return; } } } - if (value instanceof StoreRegisterTreeItem) { - if (((StoreRegisterTreeItem) value).register.number == registerNumber) { + if (value instanceof StoreRegisterActionItem) { + if (((StoreRegisterActionItem) value).register.number == registerNumber) { stack.push(value); return; } } - if (value instanceof IncrementTreeItem) { - GraphTargetItem obj = ((IncrementTreeItem) value).object; + if (value instanceof IncrementActionItem) { + GraphTargetItem obj = ((IncrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostIncrementTreeItem(this, obj)); + stack.push(new PostIncrementActionItem(this, obj)); stack.push(obj); return; } } } - if (value instanceof DecrementTreeItem) { - GraphTargetItem obj = ((DecrementTreeItem) value).object; + if (value instanceof DecrementActionItem) { + GraphTargetItem obj = ((DecrementActionItem) value).object; if (!stack.isEmpty()) { if (stack.peek().valueEquals(obj)) { stack.pop(); - stack.push(new PostDecrementTreeItem(this, obj)); + stack.push(new PostDecrementActionItem(this, obj)); stack.push(obj); return; } } } - stack.push(new StoreRegisterTreeItem(this, rn, value, define)); + stack.push(new StoreRegisterActionItem(this, rn, value, define)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java index 6390ac0af..769f2e7c4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.TargetPathTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.TargetPathActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionTargetPath extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); - stack.push(new TargetPathTreeItem(this, object)); + stack.push(new TargetPathActionItem(this, object)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java index f1f32a416..89c6487b3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ToNumberTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ToNumberActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionToNumber extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); - stack.push(new ToNumberTreeItem(this, object)); + stack.push(new ToNumberActionItem(this, object)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java index 6ffaacf35..8c820b84f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ToStringTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ToStringActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionToString extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); - stack.push(new ToStringTreeItem(this, object)); + stack.push(new ToStringActionItem(this, object)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java index b0b330aac..aed2df72c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.TypeOfTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.TypeOfActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,6 +37,6 @@ public class ActionTypeOf extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); - stack.push(new TypeOfTreeItem(this, object)); + stack.push(new TypeOfActionItem(this, object)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java index 7f4a29136..252872894 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java @@ -23,10 +23,10 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; -import com.jpexs.decompiler.flash.action.treemodel.clauses.WithTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.clauses.WithActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -98,7 +98,7 @@ public class ActionWith extends Action implements GraphSourceItemContainer { @Override public void translateContainer(List> content, Stack stack, List output, HashMap regNames, HashMap variables, HashMap functions) { - output.add(new WithTreeItem(this, stack.pop(), content.get(0))); + output.add(new WithActionItem(this, stack.pop(), content.get(0))); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java index ed224e2be..ac7496e63 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.swf6; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.EnumerateTreeItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.EnumerateActionItem; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,7 +40,7 @@ public class ActionEnumerate2 extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); - stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList())); - stack.push(new EnumerateTreeItem(this, object)); + stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList())); + stack.push(new EnumerateActionItem(this, object)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionGreater.java b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionGreater.java index 65032abcb..ea1911480 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionGreater.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionGreater.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf6; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.GtTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.GtActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionGreater extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new GtTreeItem(this, b, a)); + stack.push(new GtActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java index d4ccf77dc..7e26c5b00 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf6; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.InstanceOfTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.InstanceOfActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionInstanceOf extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new InstanceOfTreeItem(this, b, a)); + stack.push(new InstanceOfActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStrictEquals.java b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStrictEquals.java index ebde8ffb6..9f0dc756b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStrictEquals.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStrictEquals.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf6; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.StrictEqTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.StrictEqActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionStrictEquals extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new StrictEqTreeItem(this, b, a)); + stack.push(new StrictEqActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStringGreater.java b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStringGreater.java index 7d3635d3e..9864384ca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStringGreater.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStringGreater.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf6; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.operations.GtTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.operations.GtActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionStringGreater extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem a = stack.pop(); GraphTargetItem b = stack.pop(); - stack.push(new GtTreeItem(this, b, a)); + stack.push(new GtActionItem(this, b, a)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java index 99ee5dbbd..bb3114b1b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf7; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.CastOpTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.CastOpActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionCastOp extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); GraphTargetItem constructor = stack.pop(); - stack.push(new CastOpTreeItem(this, constructor, object)); + stack.push(new CastOpActionItem(this, constructor, object)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java index 97ca0e611..74ece5bda 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java @@ -23,10 +23,10 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; -import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -341,7 +341,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont @Override public void translateContainer(List> content, Stack stack, List output, HashMap regNames, HashMap variables, HashMap functions) { - FunctionTreeItem fti = new FunctionTreeItem(this, functionName, paramNames, content.get(0), constantPool, getFirstRegister()); + FunctionActionItem fti = new FunctionActionItem(this, functionName, paramNames, content.get(0), constantPool, getFirstRegister()); functions.put(functionName, fti); stack.push(fti); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java index daaebc3f3..1c3fba6b8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf7; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ExtendsTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ExtendsActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,6 +38,6 @@ public class ActionExtends extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem superclass = stack.pop(); GraphTargetItem subclass = stack.pop(); - output.add(new ExtendsTreeItem(this, subclass, superclass)); + output.add(new ExtendsActionItem(this, subclass, superclass)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java index 14e96cd6f..ae34ff5cd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf7; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ImplementsOpTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ImplementsOpActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -43,6 +43,6 @@ public class ActionImplementsOp extends Action { for (long l = 0; l < inCount; l++) { superclasses.add(stack.pop()); } - output.add(new ImplementsOpTreeItem(this, subclass, superclasses)); + output.add(new ImplementsOpActionItem(this, subclass, superclasses)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionThrow.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionThrow.java index 4c9d845f0..dd15d2915 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionThrow.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionThrow.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.swf7; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.treemodel.ThrowTreeItem; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.ThrowActionItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class ActionThrow extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem object = stack.pop(); - output.add(new ThrowTreeItem(this, object)); + output.add(new ThrowActionItem(this, object)); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java index d1986130a..1d1aee13d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java @@ -25,12 +25,12 @@ import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; -import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; -import com.jpexs.decompiler.flash.action.treemodel.TreeItem; -import com.jpexs.decompiler.flash.action.treemodel.clauses.TryTreeItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.TryActionItem; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -263,11 +263,11 @@ public class ActionTry extends Action implements GraphSourceItemContainer { @Override public void translateContainer(List> contents, Stack stack, List output, HashMap regNames, HashMap variables, HashMap functions) { List tryCommands = contents.get(0); - TreeItem catchName; + ActionItem catchName; if (catchInRegisterFlag) { - catchName = new DirectValueTreeItem(this, -1, new RegisterNumber(this.catchRegister), new ArrayList()); + catchName = new DirectValueActionItem(this, -1, new RegisterNumber(this.catchRegister), new ArrayList()); } else { - catchName = new DirectValueTreeItem(this, -1, this.catchName, new ArrayList()); + catchName = new DirectValueActionItem(this, -1, this.catchName, new ArrayList()); } List catchExceptions = new ArrayList<>(); if (catchBlockFlag) { @@ -278,7 +278,7 @@ public class ActionTry extends Action implements GraphSourceItemContainer { catchCommands.add(contents.get(1)); } List finallyCommands = contents.get(2); - output.add(new TryTreeItem(tryCommands, catchExceptions, catchCommands, finallyCommands)); + output.add(new TryActionItem(tryCommands, catchExceptions, catchCommands, finallyCommands)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/LogicalOpItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/LogicalOpItem.java deleted file mode 100644 index f760e9838..000000000 --- a/trunk/src/com/jpexs/decompiler/flash/graph/LogicalOpItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jpexs.decompiler.flash.graph; - -/** - * - * @author JPEXS - */ -public interface LogicalOpItem { - - public GraphTargetItem invert(); -} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/GraphFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/GraphFrame.java index b2e9f222d..66642183e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/GraphFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/GraphFrame.java @@ -16,8 +16,8 @@ */ package com.jpexs.decompiler.flash.gui; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphPart; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphPart; import java.awt.*; import java.awt.geom.AffineTransform; import java.awt.geom.Line2D; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java index c6ca0cd23..b7efce0b0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java @@ -17,7 +17,7 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph; -import com.jpexs.decompiler.flash.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphPart; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JTree; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java index bbf591559..fb530b1d5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java @@ -22,7 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph; import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser; import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.gui.GraphFrame; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java index 19db00247..8962a7b6e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java @@ -27,8 +27,8 @@ import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser; import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; -import com.jpexs.decompiler.flash.graph.Graph; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphTargetItem; import static com.jpexs.decompiler.flash.gui.AppStrings.translate; import com.jpexs.decompiler.flash.gui.GraphFrame; import com.jpexs.decompiler.flash.gui.Main; diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java index b4b56daaf..fdbdb2a3f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.helpers; -import com.jpexs.decompiler.flash.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index 1d58e7416..7ae2ae771 100644 --- a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash.xfl; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; -import com.jpexs.decompiler.flash.graph.Graph; +import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.CSMTextSettingsTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Block.java b/trunk/src/com/jpexs/decompiler/graph/Block.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/graph/Block.java rename to trunk/src/com/jpexs/decompiler/graph/Block.java index b779206c8..f6454c402 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/Block.java +++ b/trunk/src/com/jpexs/decompiler/graph/Block.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; +import com.jpexs.decompiler.graph.model.ContinueItem; import java.util.List; public interface Block { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/graph/Graph.java similarity index 96% rename from trunk/src/com/jpexs/decompiler/flash/graph/Graph.java rename to trunk/src/com/jpexs/decompiler/graph/Graph.java index 69835d11f..a4af0b41e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/graph/Graph.java @@ -14,8 +14,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; +import com.jpexs.decompiler.graph.model.ExitItem; +import com.jpexs.decompiler.graph.model.OrItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.AndItem; +import com.jpexs.decompiler.graph.model.LoopItem; +import com.jpexs.decompiler.graph.model.DoWhileItem; +import com.jpexs.decompiler.graph.model.IntegerValueItem; +import com.jpexs.decompiler.graph.model.SwitchItem; +import com.jpexs.decompiler.graph.model.UniversalLoopItem; +import com.jpexs.decompiler.graph.model.TernarOpItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.WhileItem; +import com.jpexs.decompiler.graph.model.ScriptEndItem; +import com.jpexs.decompiler.graph.model.ForItem; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.helpers.Highlighting; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java b/trunk/src/com/jpexs/decompiler/graph/GraphPart.java similarity index 96% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java rename to trunk/src/com/jpexs/decompiler/graph/GraphPart.java index a4428cff0..d596fda28 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphPart.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPartMulti.java b/trunk/src/com/jpexs/decompiler/graph/GraphPartMulti.java similarity index 94% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphPartMulti.java rename to trunk/src/com/jpexs/decompiler/graph/GraphPartMulti.java index e9ece53a0..9d48c5ab2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPartMulti.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphPartMulti.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import java.util.Collections; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPath.java b/trunk/src/com/jpexs/decompiler/graph/GraphPath.java similarity index 95% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphPath.java rename to trunk/src/com/jpexs/decompiler/graph/GraphPath.java index bd6c9acf1..9feda02be 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPath.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphPath.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java b/trunk/src/com/jpexs/decompiler/graph/GraphSource.java similarity index 95% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java rename to trunk/src/com/jpexs/decompiler/graph/GraphSource.java index ca2e0fc43..7f9ca28e4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphSource.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import com.jpexs.decompiler.flash.action.Action; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItem.java similarity index 93% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java rename to trunk/src/com/jpexs/decompiler/graph/GraphSourceItem.java index d6b46528a..250179680 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemContainer.java b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemContainer.java similarity index 94% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemContainer.java rename to trunk/src/com/jpexs/decompiler/graph/GraphSourceItemContainer.java index e8c862392..5f80c078a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemContainer.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemContainer.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemPos.java b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemPos.java similarity index 92% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemPos.java rename to trunk/src/com/jpexs/decompiler/graph/GraphSourceItemPos.java index 4060cf280..0d5826a1d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemPos.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemPos.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; /** * diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java similarity index 95% rename from trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java rename to trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java index c1d475b2b..bf16e3c69 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; +import com.jpexs.decompiler.graph.model.BinaryOp; import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java b/trunk/src/com/jpexs/decompiler/graph/Loop.java similarity index 94% rename from trunk/src/com/jpexs/decompiler/flash/graph/Loop.java rename to trunk/src/com/jpexs/decompiler/graph/Loop.java index 5ef78bc3a..e2e01ef83 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java +++ b/trunk/src/com/jpexs/decompiler/graph/Loop.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/MarkItem.java b/trunk/src/com/jpexs/decompiler/graph/MarkItem.java similarity index 92% rename from trunk/src/com/jpexs/decompiler/flash/graph/MarkItem.java rename to trunk/src/com/jpexs/decompiler/graph/MarkItem.java index bced86fef..1c93fd8f1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/MarkItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/MarkItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/SourceGenerator.java b/trunk/src/com/jpexs/decompiler/graph/SourceGenerator.java similarity index 71% rename from trunk/src/com/jpexs/decompiler/flash/graph/SourceGenerator.java rename to trunk/src/com/jpexs/decompiler/graph/SourceGenerator.java index 30232b2ce..3416faf37 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/SourceGenerator.java +++ b/trunk/src/com/jpexs/decompiler/graph/SourceGenerator.java @@ -14,8 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph; +import com.jpexs.decompiler.graph.model.OrItem; +import com.jpexs.decompiler.graph.model.DuplicateItem; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.AndItem; +import com.jpexs.decompiler.graph.model.CommaExpressionItem; +import com.jpexs.decompiler.graph.model.DoWhileItem; +import com.jpexs.decompiler.graph.model.SwitchItem; +import com.jpexs.decompiler.graph.model.TernarOpItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.WhileItem; +import com.jpexs.decompiler.graph.model.ForItem; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/AndItem.java b/trunk/src/com/jpexs/decompiler/graph/model/AndItem.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/graph/AndItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/AndItem.java index 4e84bef31..590b410fd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/AndItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/AndItem.java @@ -14,8 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; public class AndItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOp.java b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOp.java similarity index 88% rename from trunk/src/com/jpexs/decompiler/flash/graph/BinaryOp.java rename to trunk/src/com/jpexs/decompiler/graph/model/BinaryOp.java index 8771570c9..c577d8170 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOp.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOp.java @@ -14,7 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; + +import com.jpexs.decompiler.graph.GraphTargetItem; /** * diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java similarity index 92% rename from trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java index f67086141..24d2ef168 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java @@ -14,8 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphPart; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; public abstract class BinaryOpItem extends GraphTargetItem implements BinaryOp { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BlockItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java similarity index 82% rename from trunk/src/com/jpexs/decompiler/flash/graph/BlockItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java index ff158c5cf..ef0b85cd0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BlockItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java @@ -14,8 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java index 2df621791..b4556739b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java @@ -1,5 +1,8 @@ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/CommaExpressionItem.java b/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/graph/CommaExpressionItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java index ce810604f..4ac724334 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/CommaExpressionItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java @@ -14,8 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/CommentItem.java b/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java similarity index 89% rename from trunk/src/com/jpexs/decompiler/flash/graph/CommentItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java index 08c10de18..24efe6b67 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/CommentItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java similarity index 73% rename from trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java index a969a0b31..75ba01971 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java @@ -1,5 +1,8 @@ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java similarity index 88% rename from trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java index c7cfb6764..b5aed1aca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java @@ -14,8 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java b/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java index 7c890db06..724105c2c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java @@ -14,8 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ExitItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ExitItem.java similarity index 54% rename from trunk/src/com/jpexs/decompiler/flash/graph/ExitItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/ExitItem.java index 1316ce904..699199a8e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ExitItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ExitItem.java @@ -1,4 +1,4 @@ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; /** * diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ForItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java similarity index 90% rename from trunk/src/com/jpexs/decompiler/flash/graph/ForItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/ForItem.java index ff06f7158..d82449dad 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ForItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java @@ -14,8 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java similarity index 91% rename from trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/IfItem.java index 82cb77f53..1169c8882 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java @@ -14,8 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.Block; +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; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/IntegerValueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/graph/IntegerValueItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java index 2e0dc440a..2c754eeb1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/IntegerValueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java @@ -14,8 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/graph/model/LogicalOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/LogicalOpItem.java new file mode 100644 index 000000000..1f9ff3839 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/graph/model/LogicalOpItem.java @@ -0,0 +1,12 @@ +package com.jpexs.decompiler.graph.model; + +import com.jpexs.decompiler.graph.GraphTargetItem; + +/** + * + * @author JPEXS + */ +public interface LogicalOpItem { + + public GraphTargetItem invert(); +} diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/LoopItem.java b/trunk/src/com/jpexs/decompiler/graph/model/LoopItem.java similarity index 80% rename from trunk/src/com/jpexs/decompiler/flash/graph/LoopItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/LoopItem.java index a2fb3b9b4..34516a645 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/LoopItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/LoopItem.java @@ -14,7 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; + +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; public abstract class LoopItem extends GraphTargetItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/NotItem.java b/trunk/src/com/jpexs/decompiler/graph/model/NotItem.java similarity index 77% rename from trunk/src/com/jpexs/decompiler/flash/graph/NotItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/NotItem.java index 34cb2f9c1..021d5d8d8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/NotItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/NotItem.java @@ -1,7 +1,10 @@ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; -import com.jpexs.decompiler.flash.action.treemodel.operations.Inverted; +import com.jpexs.decompiler.flash.action.model.operations.Inverted; import com.jpexs.decompiler.flash.ecma.EcmaScript; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/OrItem.java b/trunk/src/com/jpexs/decompiler/graph/model/OrItem.java similarity index 83% rename from trunk/src/com/jpexs/decompiler/flash/graph/OrItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/OrItem.java index e7fc679bc..1fa4500bd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/OrItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/OrItem.java @@ -14,8 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; public class OrItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ParenthesisItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/graph/ParenthesisItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java index 2ec7a074e..f8ba0f9c9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ParenthesisItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java @@ -14,8 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ScriptEndItem.java similarity index 89% rename from trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/ScriptEndItem.java index abc57f53b..0acc1e67a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ScriptEndItem.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java similarity index 90% rename from trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java index b59cab0a9..2af25106b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java @@ -14,8 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java index ce1979916..8b7cce0f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java @@ -14,8 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.List; public class TernarOpItem extends GraphTargetItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java similarity index 68% rename from trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java index fcb9a18e7..c6fe54b0b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java @@ -1,5 +1,7 @@ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOp.java b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOp.java similarity index 86% rename from trunk/src/com/jpexs/decompiler/flash/graph/UnaryOp.java rename to trunk/src/com/jpexs/decompiler/graph/model/UnaryOp.java index 3107c21e4..1a0ca3f65 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOp.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOp.java @@ -14,7 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; + +import com.jpexs.decompiler.graph.GraphTargetItem; /** * diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java similarity index 84% rename from trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java index 9af66790a..60825acc1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java @@ -14,8 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp { @@ -52,7 +55,7 @@ public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp { @Override public List getNeededSources() { - List ret = super.getNeededSources(); + List ret = super.getNeededSources(); ret.addAll(value.getNeededSources()); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/UniversalLoopItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java similarity index 87% rename from trunk/src/com/jpexs/decompiler/flash/graph/UniversalLoopItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java index 38d229794..87ce45ca5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/UniversalLoopItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java @@ -14,8 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java similarity index 88% rename from trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java rename to trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java index b930864b2..c0707f9bf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java @@ -14,8 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.graph; +package com.jpexs.decompiler.graph.model; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.SourceGenerator; import java.util.ArrayList; import java.util.List;