Fixed #1888 Casts in binary operations, not casting any type

This commit is contained in:
Jindra Petřík
2022-11-30 22:58:35 +01:00
parent 954200484c
commit 9e8d00edba
40 changed files with 124 additions and 96 deletions
@@ -25,8 +25,8 @@ import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.TypeItem;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -97,6 +97,6 @@ public abstract class ActionItem extends GraphTargetItem implements Serializable
@Override
public GraphTargetItem returnType() {
return new UnboundedTypeItem();
return TypeItem.UNBOUNDED;
}
}
@@ -23,8 +23,8 @@ import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.TypeItem;
import com.jpexs.decompiler.graph.model.BinaryOpItem;
import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
import java.util.ArrayList;
import java.util.List;
@@ -54,7 +54,7 @@ public class AndActionItem extends BinaryOpItem {
@Override
public GraphTargetItem returnType() {
return new UnboundedTypeItem();
return TypeItem.UNBOUNDED;
}
@Override
@@ -23,9 +23,9 @@ import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.TypeItem;
import com.jpexs.decompiler.graph.model.BinaryOpItem;
import com.jpexs.decompiler.graph.model.CompoundableBinaryOp;
import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
import java.util.ArrayList;
import java.util.List;
@@ -55,7 +55,7 @@ public class BitAndActionItem extends BinaryOpItem implements CompoundableBinary
@Override
public GraphTargetItem returnType() {
return new UnboundedTypeItem();
return TypeItem.UNBOUNDED;
}
@Override
@@ -23,9 +23,9 @@ import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.TypeItem;
import com.jpexs.decompiler.graph.model.BinaryOpItem;
import com.jpexs.decompiler.graph.model.CompoundableBinaryOp;
import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
import java.util.ArrayList;
import java.util.List;
@@ -55,7 +55,7 @@ public class BitOrActionItem extends BinaryOpItem implements CompoundableBinaryO
@Override
public GraphTargetItem returnType() {
return new UnboundedTypeItem();
return TypeItem.UNBOUNDED;
}
@Override
@@ -25,10 +25,10 @@ import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.TypeItem;
import com.jpexs.decompiler.graph.model.BinaryOpItem;
import com.jpexs.decompiler.graph.model.CompoundableBinaryOp;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
import java.util.ArrayList;
import java.util.List;
@@ -75,7 +75,7 @@ public class BitXorActionItem extends BinaryOpItem implements CompoundableBinary
@Override
public GraphTargetItem returnType() {
return new UnboundedTypeItem();
return TypeItem.UNBOUNDED;
}
@Override
@@ -22,9 +22,9 @@ import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.TypeItem;
import com.jpexs.decompiler.graph.model.BinaryOpItem;
import com.jpexs.decompiler.graph.model.CompoundableBinaryOp;
import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
import java.util.ArrayList;
import java.util.List;
@@ -59,7 +59,7 @@ public class DivideActionItem extends BinaryOpItem implements CompoundableBinary
@Override
public GraphTargetItem returnType() {
return new UnboundedTypeItem();
return TypeItem.UNBOUNDED;
}
@Override