simplified allowedmoves logic

17 files changed, 16 insertions, 15 deletions

diff --git a/test/080_allowednext/00_empty_U.in b/test/080_allowedmoves/00_empty.in
index feb4bc3..573541a 100644
--- a/test/080_allowednext/00_empty_U.in
+++ b/test/080_allowedmoves/00_empty.in
@@ -1,2 +1 @@
 0
-U
diff --git a/test/080_allowednext/00_empty_U.out b/test/080_allowedmoves/00_empty.out
index 27ba77d..27ba77d 100644
--- a/test/080_allowednext/00_empty_U.out
+++ b/test/080_allowedmoves/00_empty.out
diff --git a/test/080_allowedmoves/01_onemove.in b/test/080_allowedmoves/01_onemove.in
new file mode 100644
index 0000000..aac8dac
--- /dev/null
+++ b/test/080_allowedmoves/01_onemove.in
@@ -0,0 +1,2 @@
+1
+B'
diff --git a/test/080_allowednext/02_U_F.out b/test/080_allowedmoves/01_onemove.out
index 27ba77d..27ba77d 100644
--- a/test/080_allowednext/02_U_F.out
+++ b/test/080_allowedmoves/01_onemove.out
diff --git a/test/080_allowednext/01_F_F2.in b/test/080_allowedmoves/02_F_F2.in
index 93f0a9c..93f0a9c 100644
--- a/test/080_allowednext/01_F_F2.in
+++ b/test/080_allowedmoves/02_F_F2.in
diff --git a/test/080_allowednext/01_F_F2.out b/test/080_allowedmoves/02_F_F2.out
index c508d53..c508d53 100644
--- a/test/080_allowednext/01_F_F2.out
+++ b/test/080_allowedmoves/02_F_F2.out
diff --git a/test/080_allowednext/02_U_F.in b/test/080_allowedmoves/03_U_F.in
index ad3607e..ad3607e 100644
--- a/test/080_allowednext/02_U_F.in
+++ b/test/080_allowedmoves/03_U_F.in
diff --git a/test/080_allowednext/04_longer_true.out b/test/080_allowedmoves/03_U_F.out
index 27ba77d..27ba77d 100644
--- a/test/080_allowednext/04_longer_true.out
+++ b/test/080_allowedmoves/03_U_F.out
diff --git a/test/080_allowednext/03_R_L_R.in b/test/080_allowedmoves/04_R_L_R.in
index ffd9542..ffd9542 100644
--- a/test/080_allowednext/03_R_L_R.in
+++ b/test/080_allowedmoves/04_R_L_R.in
diff --git a/test/080_allowednext/03_R_L_R.out b/test/080_allowedmoves/04_R_L_R.out
index c508d53..c508d53 100644
--- a/test/080_allowednext/03_R_L_R.out
+++ b/test/080_allowedmoves/04_R_L_R.out
diff --git a/test/080_allowednext/04_longer_true.in b/test/080_allowedmoves/05_longer_true.in
index 0360619..1d9999c 100644
--- a/test/080_allowednext/04_longer_true.in
+++ b/test/080_allowedmoves/05_longer_true.in
@@ -1,11 +1,11 @@
 11
 F2
 B
-D2
-D'
-L
-R2
 U
+D'
+R
+L2
+F
 U'
 D
 F
diff --git a/test/080_allowedmoves/05_longer_true.out b/test/080_allowedmoves/05_longer_true.out
new file mode 100644
index 0000000..27ba77d
--- /dev/null
+++ b/test/080_allowedmoves/05_longer_true.out
@@ -0,0 +1 @@
+true
diff --git a/test/080_allowednext/05_longer_false.in b/test/080_allowedmoves/06_longer_false.in
index 6cf8ecd..00fe94f 100644
--- a/test/080_allowednext/05_longer_false.in
+++ b/test/080_allowedmoves/06_longer_false.in
@@ -1,9 +1,12 @@
 8
 D
-B2
 F'
+B2
 L'
 F'
-L'
-R2
-L
+R'
+L2
+R
+B
+U2
+D
diff --git a/test/080_allowednext/05_longer_false.out b/test/080_allowedmoves/06_longer_false.out
index c508d53..c508d53 100644
--- a/test/080_allowednext/05_longer_false.out
+++ b/test/080_allowedmoves/06_longer_false.out
diff --git a/test/080_allowednext/06_D_U_false_order.in b/test/080_allowedmoves/07_D_U_false_order.in
index 680d1a1..680d1a1 100644
--- a/test/080_allowednext/06_D_U_false_order.in
+++ b/test/080_allowedmoves/07_D_U_false_order.in
diff --git a/test/080_allowednext/06_D_U_false_order.out b/test/080_allowedmoves/07_D_U_false_order.out
index c508d53..c508d53 100644
--- a/test/080_allowednext/06_D_U_false_order.out
+++ b/test/080_allowedmoves/07_D_U_false_order.out
diff --git a/test/080_allowednext/allowednext_tests.c b/test/080_allowedmoves/allowedmoves_tests.c
index 08fe491..aa6bda7 100644
--- a/test/080_allowednext/allowednext_tests.c
+++ b/test/080_allowedmoves/allowedmoves_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-bool allowednextmove(size_t n, const uint8_t [n]);
+bool allowedmoves(size_t n, const uint8_t [n]);
 
 static char *moves[] = {
         "U", "U2", "U'",
@@ -27,9 +27,5 @@ void run(void) {
                                 m[i] = j;
         }
 
-        fprintf(stderr, "Last two: %s, %s\nNext: %s\n",
-            n > 2 ? moves[m[n-3]] : "-",
-            n > 1 ? moves[m[n-2]] : "-",
-            n > 0 ? moves[m[n-1]] : "-");
-        printf("%s\n", allowednextmove(n, m) ? "true" : "false");
+        printf("%s\n", allowedmoves(n, m) ? "true" : "false");
 }