X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FMerger.java;h=acc05d3ca2c763daf594ccfaf75793b87ab37e2f;hb=4d7f92457692ef00a591084390dc191f84c99628;hp=6fa5b93c126d057850a2e8430f1c7f702c47a8fe;hpb=e202298a91603f3b8cfae3c1192e5be796db2786;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java
index 6fa5b93c..acc05d3c 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java
@@ -17,7 +17,7 @@ public class Merger extends Component implements LogicObserver
 
 	/**
 	 * 
-	 * @param union  The output of merging n {@link Wire}s into one. Must have length = a1.length() + a2.length() + ... + an.length().
+	 * @param union  The output of merging n {@link Wire}s into one. Must have width = a1.width() + a2.width() + ... + an.width().
 	 * @param inputs The inputs to be merged into the union
 	 */
 	public Merger(Timeline timeline, ReadWriteEnd union, ReadEnd... inputs)
@@ -27,17 +27,17 @@ public class Merger extends Component implements LogicObserver
 		this.out = union;
 		this.beginningIndex = new int[inputs.length];
 
-		int length = 0;
+		int width = 0;
 		for (int i = 0; i < inputs.length; i++)
 		{
-			beginningIndex[i] = length;
-			length += inputs[i].length();
+			beginningIndex[i] = width;
+			width += inputs[i].width();
 			inputs[i].registerObserver(this);
 		}
 
-		if (length != union.length())
+		if (width != union.width())
 			throw new IllegalArgumentException(
-					"The output of merging n WireArrays into one must have length = a1.length() + a2.length() + ... + an.length().");
+					"The output of merging n WireArrays into one must have width = a1.width() + a2.width() + ... + an.width().");
 	}
 
 	public ReadEnd getInput(int index)