equals and hashcode added to model

compoundable binary op introduced

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/BinaryOp.java

@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.graph.GraphTargetItem;
@@ -35,4 +36,6 @@ public interface BinaryOp {
     public int getPrecedence();
 
     public List<GraphTargetItem> getAllSubItems();
+
+    public String getOperator();
 }

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java

@@ -12,9 +12,11 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
+import com.jpexs.decompiler.flash.abc.avm2.model.operations.AddAVM2Item;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.graph.GraphPart;
 import com.jpexs.decompiler.graph.GraphSourceItem;
@@ -212,4 +214,9 @@ public abstract class BinaryOpItem extends GraphTargetItem implements BinaryOp {
         visitor.visit(getLeftSide());
         visitor.visit(getRightSide());
     }
+
+    @Override
+    public String getOperator() {
+        return operator;
+    }
 }

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/CompoundableBinaryOp.java

@@ -0,0 +1,9 @@
+package com.jpexs.decompiler.graph.model;
+
+/**
+ *
+ * @author JPEXS
+ */
+public interface CompoundableBinaryOp extends BinaryOp {
+
+}

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/FalseItem.java

@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
@@ -75,4 +76,24 @@ public class FalseItem extends GraphTargetItem implements LogicalOpItem, SimpleV
     public Object getResult() {
         return Boolean.FALSE;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        return hash;
+    }
 }

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java

@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
@@ -63,4 +64,30 @@ public class IntegerValueItem extends GraphTargetItem implements IntegerValueTyp
     public int intValue() {
         return intValue;
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 83 * hash + this.intValue;
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final IntegerValueItem other = (IntegerValueItem) obj;
+        if (this.intValue != other.intValue) {
+            return false;
+        }
+        return true;
+    }
+
 }

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/OrItem.java

@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.flash.SourceGeneratorLocalData;

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/PushItem.java

@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
@@ -23,6 +24,7 @@ import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.SourceGenerator;
 import com.jpexs.decompiler.graph.TypeItem;
 import java.util.List;
+import java.util.Objects;
 
 /**
  *
@@ -77,4 +79,28 @@ public class PushItem extends GraphTargetItem {
     public GraphTargetItem getNotCoercedNoDup() {
         return value.getNotCoercedNoDup();
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final GraphTargetItem other = (GraphTargetItem) obj;
+        if (!Objects.equals(this.value, other.value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        return hash;
+    }
 }

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/TernarOpItem.java

@@ -24,6 +24,7 @@ import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.SourceGenerator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  *
@@ -94,4 +95,38 @@ public class TernarOpItem extends GraphTargetItem {
     public GraphTargetItem returnType() {
         return onTrue.returnType();
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 61 * hash + Objects.hashCode(this.expression);
+        hash = 61 * hash + Objects.hashCode(this.onTrue);
+        hash = 61 * hash + Objects.hashCode(this.onFalse);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final TernarOpItem other = (TernarOpItem) obj;
+        if (!Objects.equals(this.expression, other.expression)) {
+            return false;
+        }
+        if (!Objects.equals(this.onTrue, other.onTrue)) {
+            return false;
+        }
+        if (!Objects.equals(this.onFalse, other.onFalse)) {
+            return false;
+        }
+        return true;
+    }
+
 }

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/TrueItem.java

@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
@@ -75,4 +76,24 @@ public class TrueItem extends GraphTargetItem implements LogicalOpItem, SimpleVa
     public Object getResult() {
         return Boolean.TRUE;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        return hash;
+    }
 }

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java

@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.␍ */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.graph.model;
 
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
@@ -20,6 +21,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphSourceItemPos;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -102,4 +104,28 @@ public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp {
     public boolean hasReturnValue() {
         return true;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final GraphTargetItem other = (GraphTargetItem) obj;
+        if (!Objects.equals(this.value, other.value)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        return hash;
+    }
 }