# See the License for the specific language governing permissions and
# limitations under the License.
-# Add reading and writing binary services
+# Read and write binary data with any `Reader` and `Writer`
#
# ~~~
# var w = new FileWriter.open("/tmp/data.bin")
# w.write "hello"
# w.write_int64 123456789
-# w.write_byte 3u8
+# w.write_byte 3
# w.write_float 1.25
# w.write_double 1.234567
# w.write_bits(true, false, true)
# var r = new FileReader.open("/tmp/data.bin")
# assert r.read(5) == "hello"
# assert r.read_int64 == 123456789
-# assert r.read_byte == 3u8
+# assert r.read_byte == 3
# assert r.read_float == 1.25
# assert r.read_double == 1.234567
#
super BinaryStream
# Write a boolean `value` on a byte, using 0 for `false` and 1 for `true`
- fun write_bool(value: Bool) do write_byte if value then 1u8 else 0u8
+ fun write_bool(value: Bool) do write_byte if value then 1 else 0
# Write up to 8 `Bool` in a byte
#
var int = 0
for b in bits.length.times do
- if bits[b] then int += 2**b
+ if bits[b] then int |= 1 << (7 - b)
end
write_byte int
fun write_string(text: Text)
do
write text
- write_byte 0x00u8
+ write_byte 0x00
end
# Write the length as a 64 bits integer, then the content of `text`
# Compared to `write_string`, this method supports null bytes in `text`.
fun write_block(text: Text)
do
- write_int64 text.length
+ write_int64 text.byte_length
write text
end
# Read a single byte and return `true` if its value is different than 0
#
# Returns `false` when an error is pending (`last_error != null`).
- fun read_bool: Bool do return read_byte != 0
+ fun read_bool: Bool do return read_byte > 0
# Get an `Array` of 8 `Bool` by reading a single byte
#
fun read_bits: Array[Bool]
do
var int = read_byte
- if int == null then return new Array[Bool]
- return [for b in 8.times do int.bin_and(2**b) > 0]
+ if int < 0 then return new Array[Bool]
+ var arr = new Array[Bool]
+ for i in [7 .. 0].step(-1) do
+ arr.push(((int >> i) & 1) != 0)
+ end
+ return arr
end
# Read a null terminated string
# Returns a truncated string when an error is pending (`last_error != null`).
fun read_string: String
do
- var buf = new FlatBuffer
+ var buf = new Bytes.empty
loop
var byte = read_byte
- if byte == null or byte == 0x00 then return buf.to_s
- buf.bytes.add byte
+ if byte <= 0 then
+ return buf.to_s
+ end
+ buf.add byte
end
end
do
var length = read_int64
if length == 0 then return ""
- return read(length)
+ return read_bytes(length).to_s
end
# Read a floating point on 32 bits and return it as a `Float`
var b3 = read_byte
# Check for error, `last_error` is set by `read_byte`
- if b0 == null or b1 == null or b2 == null or b3 == null then return 0.0
+ if b0 < 0 or b1 < 0 or b2 < 0 or b3 < 0 then return 0.0
return native_read_float(b0, b1, b2, b3, big_endian)
end
var b7 = read_byte
# Check for error, `last_error` is set by `read_byte`
- if b0 == null or b1 == null or b2 == null or b3 == null or
- b4 == null or b5 == null or b6 == null or b7 == null then return 0.0
+ if b0 < 0 or b1 < 0 or b2 < 0 or b3 < 0 or
+ b4 < 0 or b5 < 0 or b6 < 0 or b7 < 0 then return 0.0
return native_read_double(b0, b1, b2, b3, b4, b5, b6, b7, big_endian)
end
var b7 = read_byte
# Check for error, `last_error` is set by `read_byte`
- if b0 == null or b1 == null or b2 == null or b3 == null or
- b4 == null or b5 == null or b6 == null or b7 == null then return 0
+ if b0 < 0 or b1 < 0 or b2 < 0 or b3 < 0 or
+ b4 < 0 or b5 < 0 or b6 < 0 or b7 < 0 then return 0
return native_read_int64(b0, b1, b2, b3, b4, b5, b6, b7, big_endian)
end