Completely changed the structure and switched to Eclipse Plugin.

[Mograsim.git] / net.mograsim.logic.core / src / net / mograsim / logic / core / wires / Wire.java

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
index 479054a..8eff2ef 100644 (file)
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/wires/Wire.java
@@ -61,7 +61,7 @@ public class Wire
                BitVectorMutator mutator = BitVectorMutator.empty();
                for (ReadWriteEnd wireArrayEnd : inputs)
                        mutator.join(wireArrayEnd.getInputValues());
-               setNewValues(mutator.get());
+               setNewValues(mutator.toBitVector());
        }
 
        private void setNewValues(BitVector newValues)
@@ -495,7 +495,7 @@ public class Wire
                                        continue;
                                mutator.join(wireEnd.inputValues);
                        }
-                       return mutator.get();
+                       return mutator.toBitVector();
                }
 
                @Override
@@ -556,7 +556,7 @@ public class Wire
         * @param fromB  The first bit of {@link Wire} b to be fused
         * @param length The amount of bits to fuse
         */
-       private static void fuse(Wire a, Wire b, int fromA, int fromB, int length)
+       public static void fuse(Wire a, Wire b, int fromA, int fromB, int length)
        {
                ReadWriteEnd rA = a.createReadWriteEnd(), rB = b.createReadWriteEnd();
                rA.setWriting(false);