X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FMerger.java;fp=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FMerger.java;h=acc05d3ca2c763daf594ccfaf75793b87ab37e2f;hb=153f81323a215691a0477af3fd1dd4a9d5b02958;hp=07303a2e04a3772ee2fbcb7037b965463afa21c0;hpb=40fa7adb9fe05cd2d2eeb18a787b98299b76136a;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 07303a2e..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
@@ -27,15 +27,15 @@ 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].width();
+			beginningIndex[i] = width;
+			width += inputs[i].width();
 			inputs[i].registerObserver(this);
 		}
 
-		if (length != union.width())
+		if (width != union.width())
 			throw new IllegalArgumentException(
 					"The output of merging n WireArrays into one must have width = a1.width() + a2.width() + ... + an.width().");
 	}