X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2FUtil.java;h=d621a44c69de41eeb9c3a9eceb8f4a615b2998f0;hb=dcbba0b189fd37135adc4487f1b8b645e7045bc4;hp=b7402c262621cb358c856d017e75e74f9b834698;hpb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/Util.java b/era.mi/src/era/mi/logic/Util.java
index b7402c26..d621a44c 100644
--- a/era.mi/src/era/mi/logic/Util.java
+++ b/era.mi/src/era/mi/logic/Util.java
@@ -2,6 +2,8 @@ package era.mi.logic;
 
 import java.util.Arrays;
 
+import era.mi.logic.types.Bit;
+
 public final class Util
 {
 
@@ -50,17 +52,17 @@ public final class Util
 
 	public static Bit[] and(Bit[] a, Bit[] b)
 	{
-		return binBitOp(a, b, (bA, bB) -> Bit.and(bA, bB));
+		return binBitOp(a, b, Bit::and);
 	}
 
 	public static Bit[] or(Bit[] a, Bit[] b)
 	{
-		return binBitOp(a, b, (bA, bB) -> Bit.or(bA, bB));
+		return binBitOp(a, b, Bit::or);
 	}
 
 	public static Bit[] xor(Bit[] a, Bit[] b)
 	{
-		return binBitOp(a, b, (bA, bB) -> Bit.xor(bA, bB));
+		return binBitOp(a, b, Bit::xor);
 	}
 
 	private static Bit[] binBitOp(Bit[] a, Bit[] b, BitOp op)
@@ -96,7 +98,7 @@ public final class Util
 			throw new IllegalArgumentException("Bit Arrays were not of equal length.");
 		for (int i = 0; i < addition.length; i++)
 		{
-			dest[i] = dest[i].combineWith(addition[i]);
+			dest[i] = dest[i].join(addition[i]);
 		}
 		return dest;
 	}