16 files changed, 83 insertions, 100 deletions

diff --git a/src/bitreader.nim b/src/bitio/bitreader.nim
index baa8bf8..e4ad225 100644
--- a/src/bitreader.nim
+++ b/src/bitio/bitreader.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import streams
-import integers
+import ../integers
 
 type BitReader* = ref object
   stream: Stream
diff --git a/src/bitwriter.nim b/src/bitio/bitwriter.nim
index 4fe499a..f1b44ca 100644
--- a/src/bitwriter.nim
+++ b/src/bitio/bitwriter.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import streams
-import integers
+import ../integers
 
 type BitWriter* = ref object
   stream: Stream
diff --git a/src/huffmandecoder.nim b/src/huffmandecoder.nim
index 4df712a..5cf4ca5 100644
--- a/src/huffmandecoder.nim
+++ b/src/huffmandecoder.nim
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import huffmantree, bitreader
+import huffmantree, bitio/bitreader
 
 type HuffmanDecoder*[T: SomeUnsignedInt] = object
   tree: HuffmanTreeNode[T]
diff --git a/src/huffmanencoder.nim b/src/huffmanencoder.nim
index 60c3d46..05ed64f 100644
--- a/src/huffmanencoder.nim
+++ b/src/huffmanencoder.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import tables
-import integers, huffmantree, bitwriter
+import integers, huffmantree, bitio/bitwriter
 
 type HuffmanEncoder*[T, U: SomeUnsignedInt] = object
   codebook: TableRef[T, U]
diff --git a/src/huffmantree.nim b/src/huffmantree.nim
index 0266dfb..6208ecf 100644
--- a/src/huffmantree.nim
+++ b/src/huffmantree.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import tables, heapqueue
-import integers, bitreader, bitwriter
+import integers, bitio/bitreader, bitio/bitwriter
 
 const valueLengthFieldBitLength* = 6  # 64
 
diff --git a/src/lzssblock.nim b/src/lzssblock.nim
index be8c4f0..317e768 100644
--- a/src/lzssblock.nim
+++ b/src/lzssblock.nim
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import bitreader, bitwriter
+import bitio/bitreader, bitio/bitwriter
 
 type LzssBlock* = object
   discard
diff --git a/src/main.nim b/src/main.nim
index 4fc137f..450f52d 100644
--- a/src/main.nim
+++ b/src/main.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import os, streams, sugar
-import bitreader, bitwriter, streamblock
+import bitio/bitreader, bitio/bitwriter, streamblock
 
 proc transform*(operation: (BitReader, BitWriter) -> void, input, output: string) =
   let inputStream = openFileStream(input, fmRead)
diff --git a/src/rawblock.nim b/src/rawblock.nim
index 4a83b1d..b9a1e63 100644
--- a/src/rawblock.nim
+++ b/src/rawblock.nim
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import integers, bitreader, bitwriter
+import integers, bitio/bitreader, bitio/bitwriter
 
 const maxDataBitLength = high(uint16).int
 const bitLengthFieldBitLength = 2 * wordBitLength
diff --git a/src/streamblock.nim b/src/streamblock.nim
index 403687e..ff649b1 100644
--- a/src/streamblock.nim
+++ b/src/streamblock.nim
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import sequtils
-import integers, bitreader, bitwriter
+import integers, bitio/bitreader, bitio/bitwriter
 import rawblock, lzssblock
 
 type BlockKind* = enum
diff --git a/tests/tbitreader.nim b/tests/tbitio.nim
index 294f6c9..0391974 100644
--- a/tests/tbitreader.nim
+++ b/tests/tbitio.nim
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import unittest, streams, sugar, sequtils
-import integers, bitreader
+import integers
+import bitio/bitreader, bitio/bitwriter
 
 suite "bitreader":
   test "readBool":
@@ -82,3 +83,70 @@ suite "bitreader":
     check bitReader.readSeq(32, uint16) == (32, @[0xF0F0'u16, 0xF0F0])
     check bitReader.readSeq(40, uint8) == (32, @[0xFF'u8, 0xF0, 0x00, 0x0F])
     check bitReader.atEnd()
+
+suite "bitwriter":
+  test "flush":
+    let stream = newStringStream()
+    defer: stream.close()
+    let bitWriter = stream.bitWriter()
+
+    bitWriter.writeBool(true)
+    stream.setPosition(0)
+    expect IOError: discard stream.peekUint8()
+  
+    bitWriter.flush()
+    stream.setPosition(0)
+    check stream.readUint8() == 0x01'u8
+    check stream.atEnd()
+
+    bitWriter.flush()
+    check stream.atEnd()
+
+  test "writeBool":
+    let stream = newStringStream()
+    defer: stream.close()
+
+    let bitWriter = stream.bitWriter()
+    let booleanValues = @[
+      true, true, true, true, true, false, false, true,
+      false, false, false, false, false, true, true, false,
+      true, true, false, true]
+    for b in booleanValues: bitWriter.writeBool(b)
+    bitWriter.flush()
+
+    stream.setPosition(0)
+    check stream.readUint8() == 0b1001_1111'u8
+    check stream.readUint8() == 0b0110_0000'u8
+    check stream.readUint8() == 0b0000_1011'u8
+    expect IOError: discard stream.readUint8()
+    check stream.atEnd()
+
+  test "writeBits":
+    let stream = newStringStream()
+    defer: stream.close()
+
+    let bitWriter = stream.bitWriter()
+    bitWriter.writeBits(4, 0xF00F'u16)
+    bitWriter.writeBits(16, 0xF00F'u16)
+    bitWriter.writeBits(16, 0xFFFF'u16)
+    bitWriter.flush()
+
+    stream.setPosition(0)
+    check stream.readUint16() == 0x00FF'u16
+    check stream.readUint16() == 0xFFFF'u16
+    check stream.readUint8() == 0x0F'u8
+    expect IOError: discard stream.readUint8()
+    check stream.atEnd()
+
+  test "writeSeq":
+    let stream = newStringStream()
+    defer: stream.close()
+
+    let bitWriter = stream.bitWriter()
+    bitWriter.writeSeq(32, @[0xF0F0'u16, 0xF0F0])
+    bitWriter.writeSeq(28, @[0xFF'u8, 0xF0, 0x00, 0xFF])
+    bitWriter.flush()
+
+    stream.setPosition(0)
+    check stream.readUint64() == 0x0F00_F0FF_F0F0_F0F0'u64
+    check stream.atEnd()
diff --git a/tests/tbitwriter.nim b/tests/tbitwriter.nim
deleted file mode 100644
index 2c570af..0000000
--- a/tests/tbitwriter.nim
+++ /dev/null
@@ -1,85 +0,0 @@
-# gzip-like LZSS compressor
-# Copyright (C) 2018  Pacien TRAN-GIRARD
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import unittest, streams
-import integers, bitwriter
-
-suite "bitwriter":
-  test "flush":
-    let stream = newStringStream()
-    defer: stream.close()
-    let bitWriter = stream.bitWriter()
-
-    bitWriter.writeBool(true)
-    stream.setPosition(0)