projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development' into 'master'
[Mograsim.git]
/
plugins
/
net.mograsim.logic.core
/
src
/
net
/
mograsim
/
logic
/
core
/
types
/
BitVector.java
diff --git
a/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
b/plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
index
4b10292
..
3ca16a1
100644
(file)
--- a/
plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
+++ b/
plugins/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
@@
-406,13
+406,18
@@
public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
return Arrays.equals(bits, offset, offset + other.length(), other.bits, 0, other.length());
}
return Arrays.equals(bits, offset, offset + other.length(), other.bits, 0, other.length());
}
+ @Override
+ public String toString()
+ {
+ return toBitstring();
+ }
+
/**
* All {@link Bit}s symbols concatenated together (MSB first)
*
/**
* All {@link Bit}s symbols concatenated together (MSB first)
*
- * @see #parse(String)
+ * @see #parse
Bitstring
(String)
*/
*/
- @Override
- public String toString()
+ public String toBitstring()
{
StringBuilder sb = new StringBuilder(bits.length);
for (Bit bit : bits)
{
StringBuilder sb = new StringBuilder(bits.length);
for (Bit bit : bits)
@@
-475,9
+480,9
@@
public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
/**
* Parses a String containing solely {@link Bit} symbols (MSB first)
*
/**
* Parses a String containing solely {@link Bit} symbols (MSB first)
*
- * @see #toString()
+ * @see #to
Bit
String()
*/
*/
- public static BitVector parse(String s)
+ public static BitVector parse
Bitstring
(String s)
{
Bit[] values = new Bit[s.length()];
for (int i = 0; i < s.length(); i++)
{
Bit[] values = new Bit[s.length()];
for (int i = 0; i < s.length(); i++)