projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrated new types, tests still work, not used yet
[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
88b2393
..
0567138
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;
\r
import java.util.Arrays;
\r
\r
\r
import java.util.Arrays;
\r
\r
+import era.mi.logic.types.Bit;
\r
+
\r
public final class Util
\r
{
\r
\r
public final class Util
\r
{
\r
\r
@@
-50,17
+52,17
@@
public final class Util
\r
public static Bit[] and(Bit[] a, Bit[] b)
\r
{
\r
\r
public static Bit[] and(Bit[] a, Bit[] b)
\r
{
\r
- return binBitOp(a, b,
(bA, bB) -> Bit.and(bA, bB)
);
\r
+ return binBitOp(a, b,
Bit::and
);
\r
}
\r
\r
public static Bit[] or(Bit[] a, Bit[] b)
\r
{
\r
}
\r
\r
public static Bit[] or(Bit[] a, Bit[] b)
\r
{
\r
- return binBitOp(a, b,
(bA, bB) -> Bit.or(bA, bB)
);
\r
+ return binBitOp(a, b,
Bit::or
);
\r
}
\r
\r
public static Bit[] xor(Bit[] a, Bit[] b)
\r
{
\r
}
\r
\r
public static Bit[] xor(Bit[] a, Bit[] b)
\r
{
\r
- return binBitOp(a, b,
(bA, bB) -> Bit.xor(bA, bB)
);
\r
+ return binBitOp(a, b,
Bit::xor
);
\r
}
\r
\r
private static Bit[] binBitOp(Bit[] a, Bit[] b, BitOp op)
\r
}
\r
\r
private static Bit[] binBitOp(Bit[] a, Bit[] b, BitOp op)
\r
@@
-96,7
+98,7
@@
public final class Util
throw new IllegalArgumentException("Bit Arrays were not of equal length.");
\r
for (int i = 0; i < addition.length; i++)
\r
{
\r
throw new IllegalArgumentException("Bit Arrays were not of equal length.");
\r
for (int i = 0; i < addition.length; i++)
\r
{
\r
- dest[i] = dest[i].
combineWith
(addition[i]);
\r
+ dest[i] = dest[i].
join
(addition[i]);
\r
}
\r
return dest;
\r
}
\r
}
\r
return dest;
\r
}
\r