32 files changed, 38 insertions, 8 deletions

diff --git a/TODO.txt b/TODO.txt
index f41d786..e64c1ec 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,14 +1,13 @@
 Refactoring: remove cube_fast_t and add b32 format
   - see TODO comments in cube.h
-  - switch to b32 by default (part 1)
-    add tests for b32 (write at some by hand)
   - fix utility code in utils/*.c
     replace h48_to_lst with convert.c
     fix invert.c
     fix utils/*.sh scripts to use the new convert
     convert all utils/cubes/*.txt files in b32 format
-  - switch to b32 by default (part 2)
+  - switch to b32 by default
     change all tests to use b32
+    split read and write for H48
   - if all public functions work with strings, always use return value
     as error code (solve already does this), and use string as buffer
     to print error
diff --git a/src/io_cube.h b/src/io_cube.h
index 63c9f53..430d3ac 100644
--- a/src/io_cube.h
+++ b/src/io_cube.h
@@ -324,17 +324,17 @@ writecube_LST(cube_t cube, char *buf)
 _static uint8_t
 b32toedge(char c)
 {
-        if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'g'))
+        if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'f')))
                 return 255;
 
-        return c <= 'Z' ? (uint8_t)(c - 'A') : (uint8_t)(c - 'a');
+        return c <= 'Z' ? (uint8_t)(c - 'A') : (uint8_t)(c - 'a') + 26;
 }
 
 _static uint8_t
 b32tocorner(char c) {
         uint8_t val;
 
-        if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'g'))
+        if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'f')))
                 return 255;
 
         val = c <= 'Z' ? (uint8_t)(c - 'A') : (uint8_t)(c - 'a') + 26;
@@ -345,7 +345,7 @@ b32tocorner(char c) {
 _static char
 edgetob32(uint8_t edge)
 {
-        return edge <= 26 ? 'A' + (char)edge : 'a' + (char)(edge - 26);
+        return edge < 26 ? 'A' + (char)edge : 'a' + (char)(edge - 26);
 }
 
 _static char
@@ -355,5 +355,5 @@ cornertob32(uint8_t corner)
 
         val = (corner & 7) | ((corner & 96) >> 2);
 
-        return val <= 26 ? 'A' + (char)val : 'a' + (char)(val - 26);
+        return val < 26 ? 'A' + (char)val : 'a' + (char)(val - 26);
 }
diff --git a/test/020_io_H48_read_write/00_garbage.in b/test/020_io_B32_read_write/00_garbage.in
index 9ac203a..9ac203a 100644
--- a/test/020_io_H48_read_write/00_garbage.in
+++ b/test/020_io_B32_read_write/00_garbage.in
diff --git a/test/020_io_H48_read_write/00_garbage.out b/test/020_io_B32_read_write/00_garbage.out
index 5b9114e..5b9114e 100644
--- a/test/020_io_H48_read_write/00_garbage.out
+++ b/test/020_io_B32_read_write/00_garbage.out
diff --git a/test/020_io_B32_read_write/01_solved.in b/test/020_io_B32_read_write/01_solved.in
new file mode 100644
index 0000000..e1df94b
--- /dev/null
+++ b/test/020_io_B32_read_write/01_solved.in
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL
diff --git a/test/020_io_B32_read_write/01_solved.out b/test/020_io_B32_read_write/01_solved.out
new file mode 100644
index 0000000..e1df94b
--- /dev/null
+++ b/test/020_io_B32_read_write/01_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL
diff --git a/test/020_io_B32_read_write/02_F.in b/test/020_io_B32_read_write/02_F.in
new file mode 100644
index 0000000..1677251
--- /dev/null
+++ b/test/020_io_B32_read_write/02_F.in
@@ -0,0 +1 @@
+MBODSFQH=ZBCYEFGHQTKL
diff --git a/test/020_io_B32_read_write/02_F.out b/test/020_io_B32_read_write/02_F.out
new file mode 100644
index 0000000..1677251
--- /dev/null
+++ b/test/020_io_B32_read_write/02_F.out
@@ -0,0 +1 @@
+MBODSFQH=ZBCYEFGHQTKL
diff --git a/test/020_io_B32_read_write/03_scrambled.in b/test/020_io_B32_read_write/03_scrambled.in
new file mode 100644
index 0000000..ed442fe
--- /dev/null
+++ b/test/020_io_B32_read_write/03_scrambled.in
@@ -0,0 +1 @@
+OINUTCXB=JCRIEDAbVaGH
diff --git a/test/020_io_B32_read_write/03_scrambled.out b/test/020_io_B32_read_write/03_scrambled.out
new file mode 100644
index 0000000..ed442fe
--- /dev/null
+++ b/test/020_io_B32_read_write/03_scrambled.out
@@ -0,0 +1 @@
+OINUTCXB=JCRIEDAbVaGH
diff --git a/test/020_io_B32_read_write/io_B32_tests.c b/test/020_io_B32_read_write/io_B32_tests.c
new file mode 100644
index 0000000..1953453
--- /dev/null
+++ b/test/020_io_B32_read_write/io_B32_tests.c
@@ -0,0 +1,21 @@
+#include "../test.h"
+
+int main(void) {
+        char str[STRLENMAX];
+        cube_t cube;
+
+        fgets(str, STRLENMAX, stdin);
+
+        cube = readcube("B32", str);
+
+        if (iserror(cube)) {
+                printf("Error reading cube\n");
+        } else if (!issolvable(cube)) {
+                printf("Cube is not solvable\n");
+        } else {
+                writecube("B32", cube, str);
+                printf("%s\n", str);
+        }
+
+        return 0;
+}
diff --git a/test/021_io_H48_read_write/00_garbage.in b/test/021_io_H48_read_write/00_garbage.in
new file mode 100644
index 0000000..9ac203a
--- /dev/null
+++ b/test/021_io_H48_read_write/00_garbage.in
@@ -0,0 +1,3 @@
+FUF0 UBBBR2 k4
+hello
+garbage
diff --git a/test/021_io_H48_read_write/00_garbage.out b/test/021_io_H48_read_write/00_garbage.out
new file mode 100644
index 0000000..5b9114e
--- /dev/null
+++ b/test/021_io_H48_read_write/00_garbage.out
@@ -0,0 +1 @@
+Error reading cube
diff --git a/test/020_io_H48_read_write/01_solved_oneline.in b/test/021_io_H48_read_write/01_solved_oneline.in
index dff224d..dff224d 100644
--- a/test/020_io_H48_read_write/01_solved_oneline.in
+++ b/test/021_io_H48_read_write/01_solved_oneline.in
diff --git a/test/020_io_H48_read_write/01_solved_oneline.out b/test/021_io_H48_read_write/01_solved_oneline.out
index dff224d..dff224d 100644
--- a/test/020_io_H48_read_write/01_solved_oneline.out
+++ b/test/021_io_H48_read_write/01_solved_oneline.out
diff --git a/test/020_io_H48_read_write/02_solved_oneline_whitespace.in b/test/021_io_H48_read_write/02_solved_oneline_whitespace.in
index 5d10368..5d10368 100644
--- a/test/020_io_H48_read_write/02_solved_oneline_whitespace.in
+++ b/test/021_io_H48_read_write/02_solved_oneline_whitespace.in
diff --git a/test/020_io_H48_read_write/02_solved_oneline_whitespace.out b/test/021_io_H48_read_write/02_solved_oneline_whitespace.out
index dff224d..dff224d 100644
--- a/test/020_io_H48_read_write/02_solved_oneline_whitespace.out
+++ b/test/021_io_H48_read_write/02_solved_oneline_whitespace.out
diff --git a/test/020_io_H48_read_write/03_solved_multiline.in b/test/021_io_H48_read_write/03_solved_multiline.in
index 9f9652b..9f9652b 100644
--- a/test/020_io_H48_read_write/03_solved_multiline.in
+++ b/test/021_io_H48_read_write/03_solved_multiline.in
diff --git a/test/020_io_H48_read_write/03_solved_multiline.out b/test/021_io_H48_read_write/03_solved_multiline.out
index dff224d..dff224d 100644
--- a/test/020_io_H48_read_write/03_solved_multiline.out
+++ b/test/021_io_H48_read_write/03_solved_multiline.out
diff --git a/test/020_io_H48_read_write/04_unsolvable_ep.in b/test/021_io_H48_read_write/04_unsolvable_ep.in
index 8483962..8483962 100644
--- a/test/020_io_H48_read_write/04_unsolvable_ep.in
+++ b/test/021_io_H48_read_write/04_unsolvable_ep.in
diff --git a/test/020_io_H48_read_write/04_unsolvable_ep.out b/test/021_io_H48_read_write/04_unsolvable_ep.out
index e35c6e4..e35c6e4 100644
--- a/test/020_io_H48_read_write/04_unsolvable_ep.out
+++ b/test/021_io_H48_read_write/04_unsolvable_ep.out
diff --git a/test/020_io_H48_read_write/05_unsolvable_eo.in b/test/021_io_H48_read_write/05_unsolvable_eo.in
index a92089d..a92089d 100644
--- a/test/020_io_H48_read_write/05_unsolvable_eo.in
+++ b/test/021_io_H48_read_write/05_unsolvable_eo.in
diff --git a/test/020_io_H48_read_write/05_unsolvable_eo.out b/test/021_io_H48_read_write/05_unsolvable_eo.out
index e35c6e4..e35c6e4 100644
--- a/test/020_io_H48_read_write/05_unsolvable_eo.out
+++ b/test/021_io_H48_read_write/05_unsolvable_eo.out
diff --git a/test/020_io_H48_read_write/06_unsolvable_cp.in b/test/021_io_H48_read_write/06_unsolvable_cp.in
index 2085dd5..2085dd5 100644
--- a/test/020_io_H48_read_write/06_unsolvable_cp.in
+++ b/test/021_io_H48_read_write/06_unsolvable_cp.in
diff --git a/test/020_io_H48_read_write/06_unsolvable_cp.out b/test/021_io_H48_read_write/06_unsolvable_cp.out
index e35c6e4..e35c6e4 100644
--- a/test/020_io_H48_read_write/06_unsolvable_cp.out
+++ b/test/021_io_H48_read_write/06_unsolvable_cp.out
diff --git a/test/020_io_H48_read_write/07_unsolvable_co.in b/test/021_io_H48_read_write/07_unsolvable_co.in
index abd74e2..abd74e2 100644
--- a/test/020_io_H48_read_write/07_unsolvable_co.in
+++ b/test/021_io_H48_read_write/07_unsolvable_co.in
diff --git a/test/020_io_H48_read_write/07_unsolvable_co.out b/test/021_io_H48_read_write/07_unsolvable_co.out
index e35c6e4..e35c6e4 100644
--- a/test/020_io_H48_read_write/07_unsolvable_co.out
+++ b/test/021_io_H48_read_write/07_unsolvable_co.out
diff --git a/test/020_io_H48_read_write/08_unsolved.in b/test/021_io_H48_read_write/08_unsolved.in
index c992ce7..c992ce7 100644
--- a/test/020_io_H48_read_write/08_unsolved.in
+++ b/test/021_io_H48_read_write/08_unsolved.in
diff --git a/test/020_io_H48_read_write/08_unsolved.out b/test/021_io_H48_read_write/08_unsolved.out
index 8c132cf..8c132cf 100644
--- a/test/020_io_H48_read_write/08_unsolved.out
+++ b/test/021_io_H48_read_write/08_unsolved.out
diff --git a/test/020_io_H48_read_write/io_H48_tests.c b/test/021_io_H48_read_write/io_H48_tests.c
index 705356c..705356c 100644
--- a/test/020_io_H48_read_write/io_H48_tests.c
+++ b/test/021_io_H48_read_write/io_H48_tests.c
diff --git a/test/023_io_LST_write/io_LST_tests.c b/test/023_io_LST_write/io_LST_write_tests.c
index df35632..df35632 100644
--- a/test/023_io_LST_write/io_LST_tests.c
+++ b/test/023_io_LST_write/io_LST_write_tests.c
diff --git a/test/024_io_LST_read/io_LST_tests.c b/test/024_io_LST_read/io_LST_read_tests.c
index 506a23d..506a23d 100644
--- a/test/024_io_LST_read/io_LST_tests.c
+++ b/test/024_io_LST_read/io_LST_read_tests.c