From 0f47403d0220757fed189b76e2071e25b1025cb8 Mon Sep 17 00:00:00 2001
From: Runemoro
Date: Wed, 3 Jun 2020 13:39:42 -0400
Subject: Split GUI code to separate module (#242)

* Split into modules

* Post merge compile fixes

Co-authored-by: modmuss50 <modmuss50@gmail.com>---
 .../cuchaz/enigma/analysis/InterpreterPair.java    | 131 ---------------------
 1 file changed, 131 deletions(-)
 delete mode 100644 src/main/java/cuchaz/enigma/analysis/InterpreterPair.java

(limited to 'src/main/java/cuchaz/enigma/analysis/InterpreterPair.java')

diff --git a/src/main/java/cuchaz/enigma/analysis/InterpreterPair.java b/src/main/java/cuchaz/enigma/analysis/InterpreterPair.java
deleted file mode 100644
index 8a1c238..0000000
--- a/src/main/java/cuchaz/enigma/analysis/InterpreterPair.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package cuchaz.enigma.analysis;
-
-import cuchaz.enigma.utils.Utils;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.analysis.AnalyzerException;
-import org.objectweb.asm.tree.analysis.Interpreter;
-import org.objectweb.asm.tree.analysis.Value;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-public class InterpreterPair<V extends Value, W extends Value> extends Interpreter<InterpreterPair.PairValue<V, W>> {
-    private final Interpreter<V> left;
-    private final Interpreter<W> right;
-
-    public InterpreterPair(Interpreter<V> left, Interpreter<W> right) {
-        super(Utils.ASM_VERSION);
-        this.left = left;
-        this.right = right;
-    }
-
-    @Override
-    public PairValue<V, W> newValue(Type type) {
-        return pair(
-                left.newValue(type),
-                right.newValue(type)
-        );
-    }
-
-    @Override
-    public PairValue<V, W> newOperation(AbstractInsnNode insn) throws AnalyzerException {
-        return pair(
-                left.newOperation(insn),
-                right.newOperation(insn)
-        );
-    }
-
-    @Override
-    public PairValue<V, W> copyOperation(AbstractInsnNode insn, PairValue<V, W> value) throws AnalyzerException {
-        return pair(
-                left.copyOperation(insn, value.left),
-                right.copyOperation(insn, value.right)
-        );
-    }
-
-    @Override
-    public PairValue<V, W> unaryOperation(AbstractInsnNode insn, PairValue<V, W> value) throws AnalyzerException {
-        return pair(
-                left.unaryOperation(insn, value.left),
-                right.unaryOperation(insn, value.right)
-        );
-    }
-
-    @Override
-    public PairValue<V, W> binaryOperation(AbstractInsnNode insn, PairValue<V, W> value1, PairValue<V, W> value2) throws AnalyzerException {
-        return pair(
-                left.binaryOperation(insn, value1.left, value2.left),
-                right.binaryOperation(insn, value1.right, value2.right)
-        );
-    }
-
-    @Override
-    public PairValue<V, W> ternaryOperation(AbstractInsnNode insn, PairValue<V, W> value1, PairValue<V, W> value2, PairValue<V, W> value3) throws AnalyzerException {
-        return pair(
-                left.ternaryOperation(insn, value1.left, value2.left, value3.left),
-                right.ternaryOperation(insn, value1.right, value2.right, value3.right)
-        );
-    }
-
-    @Override
-    public PairValue<V, W> naryOperation(AbstractInsnNode insn, List<? extends PairValue<V, W>> values) throws AnalyzerException {
-        return pair(
-                left.naryOperation(insn, values.stream().map(v -> v.left).collect(Collectors.toList())),
-                right.naryOperation(insn, values.stream().map(v -> v.right).collect(Collectors.toList()))
-        );
-    }
-
-    @Override
-    public void returnOperation(AbstractInsnNode insn, PairValue<V, W> value, PairValue<V, W> expected) throws AnalyzerException {
-        left.returnOperation(insn, value.left, expected.left);
-        right.returnOperation(insn, value.right, expected.right);
-    }
-
-    @Override
-    public PairValue<V, W> merge(PairValue<V, W> value1, PairValue<V, W> value2) {
-        return pair(
-                left.merge(value1.left, value2.left),
-                right.merge(value1.right, value2.right)
-        );
-    }
-
-    private PairValue<V, W> pair(V left, W right) {
-        if (left == null && right == null) {
-            return null;
-        }
-
-        return new PairValue<>(left, right);
-    }
-
-    public static final class PairValue<V extends Value, W extends Value> implements Value {
-        public final V left;
-        public final W right;
-
-        public PairValue(V left, W right) {
-            if (left == null && right == null) {
-                throw new IllegalArgumentException("should use null rather than pair of nulls");
-            }
-
-            this.left = left;
-            this.right = right;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return o instanceof InterpreterPair.PairValue && Objects.equals(left, ((PairValue) o).left) && Objects.equals(right, ((PairValue) o).right);
-        }
-
-        @Override
-        public int hashCode() {
-            return left.hashCode() * 31 + right.hashCode();
-        }
-
-        @Override
-        public int getSize() {
-            return (left == null ? right : left).getSize();
-        }
-    }
-}
-- 
cgit v1.2.3