projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed executeNext; added comment about timeout
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
Util.java
diff --git
a/era.mi/src/era/mi/logic/Util.java
b/era.mi/src/era/mi/logic/Util.java
index
b7402c2
..
d621a44
100644
(file)
--- 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 java.util.Arrays;
+import era.mi.logic.types.Bit;
+
public final class Util
{
public final class Util
{
@@
-50,17
+52,17
@@
public final class Util
public static Bit[] and(Bit[] a, Bit[] b)
{
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)
{
}
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)
{
}
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)
}
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++)
{
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;
}
}
return dest;
}