Failed attempts to fix / debug eoesep + other changes

8 files changed, 11 insertions, 16 deletions

diff --git a/test/080_allowednext/02_F_F2.in b/test/080_allowednext/01_F_F2.in
index 06f504f..93f0a9c 100644
--- a/test/080_allowednext/02_F_F2.in
+++ b/test/080_allowednext/01_F_F2.in
@@ -1,3 +1,3 @@
-1
+2
 F
 F2
diff --git a/test/080_allowednext/02_F_F2.out b/test/080_allowednext/01_F_F2.out
index c508d53..c508d53 100644
--- a/test/080_allowednext/02_F_F2.out
+++ b/test/080_allowednext/01_F_F2.out
diff --git a/test/080_allowednext/02_U_F.in b/test/080_allowednext/02_U_F.in
index 3a41149..ad3607e 100644
--- a/test/080_allowednext/02_U_F.in
+++ b/test/080_allowednext/02_U_F.in
@@ -1,3 +1,3 @@
-1
+2
 U
 F
diff --git a/test/080_allowednext/03_R_L_R.in b/test/080_allowednext/03_R_L_R.in
index e215381..ffd9542 100644
--- a/test/080_allowednext/03_R_L_R.in
+++ b/test/080_allowednext/03_R_L_R.in
@@ -1,4 +1,4 @@
-2
+3
 R
 L'
 R2
diff --git a/test/080_allowednext/04_longer_true.in b/test/080_allowednext/04_longer_true.in
index e1f1d62..0360619 100644
--- a/test/080_allowednext/04_longer_true.in
+++ b/test/080_allowednext/04_longer_true.in
@@ -1,4 +1,4 @@
-10
+11
 F2
 B
 D2
diff --git a/test/080_allowednext/05_longer_false.in b/test/080_allowednext/05_longer_false.in
index 6befeff..6cf8ecd 100644
--- a/test/080_allowednext/05_longer_false.in
+++ b/test/080_allowednext/05_longer_false.in
@@ -1,4 +1,4 @@
-7
+8
 D
 B2
 F'
diff --git a/test/080_allowednext/06_D_U_false_order.in b/test/080_allowednext/06_D_U_false_order.in
index 7bfd8c2..680d1a1 100644
--- a/test/080_allowednext/06_D_U_false_order.in
+++ b/test/080_allowednext/06_D_U_false_order.in
@@ -1,3 +1,3 @@
-1
+2
 D
 U
diff --git a/test/080_allowednext/allowednext_tests.c b/test/080_allowednext/allowednext_tests.c
index 7ae7f66..e531911 100644
--- a/test/080_allowednext/allowednext_tests.c
+++ b/test/080_allowednext/allowednext_tests.c
@@ -1,6 +1,6 @@
 #include "../test.h"
 
-bool allowednextmove(uint8_t *, int, uint8_t);
+bool allowednextmove(uint8_t *, uint8_t);
 
 static char *moves[] = {
         "U", "U2", "U'",
@@ -13,7 +13,7 @@ static char *moves[] = {
 
 int main(void) {
         char movestr[STRLENMAX];
-        uint8_t m[100], next;
+        uint8_t m[100];
         int n, i, j;
 
         fgets(movestr, STRLENMAX, stdin);
@@ -26,17 +26,12 @@ int main(void) {
                         if (!strcmp(movestr, moves[j]))
                                 m[i] = j;
         }
-        fgets(movestr, STRLENMAX, stdin);
-        movestr[strcspn(movestr, "\n")] = 0;
-        for (j = 0; j < 18; j++)
-                if (!strcmp(movestr, moves[j]))
-                        next = 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]] : "-",
-            moves[next]);
-        printf("%s\n", allowednextmove(m, n, next) ? "true" : "false");
+            n > 0 ? moves[m[n-1]] : "-");
+        printf("%s\n", allowednextmove(m, n) ? "true" : "false");
 
         return 0;
 }