Improved logging, especially for solve

3 files changed, 3 insertions, 22 deletions

diff --git a/src/core/io_moves.h b/src/core/io_moves.h
index c94b6b7..97926cc 100644
--- a/src/core/io_moves.h
+++ b/src/core/io_moves.h
@@ -14,7 +14,7 @@ STATIC int64_t writemoves(size_t n, const uint8_t [n], size_t m, char [m]);
                 if (*VAR_B == '\0' || ARG_C == ARG_MAX) \
                         break; \
                 if ((VAR_MOVE_NOMOD = readmove(*VAR_B)) == UINT8_ERROR) { \
-                        LOG("Error: unknown move '%c'\n", *VAR_B); \
+                        LOG("Unknown move: %c\n", *VAR_B); \
                         return RET_ERROR; \
                 } \
                 if ((VAR_MOD = readmodifier(*(VAR_B+1))) != 0) \
diff --git a/src/core/moves.h b/src/core/moves.h
index 1238c7d..cc91706 100644
--- a/src/core/moves.h
+++ b/src/core/moves.h
@@ -17,25 +17,6 @@ STATIC bool are_lastmoves_singlecw(size_t n, const uint8_t [n]);
 
 STATIC cube_t applymoves(cube_t, const char *);
 
-#define FOREACH_READMOVE(ARG_BUF, ARG_MOVE, ARG_C, ARG_MAX, \
-        RET_ERROR, ARG_ACTION) \
-        const char *VAR_B; \
-        uint8_t VAR_MOVE_NOMOD, VAR_MOD; \
-        for (VAR_B = ARG_BUF, ARG_C = 0; *VAR_B != '\0'; VAR_B++, ARG_C++) { \
-                while (*VAR_B == ' ' || *VAR_B == '\t' || *VAR_B == '\n') \
-                        VAR_B++; \
-                if (*VAR_B == '\0' || ARG_C == ARG_MAX) \
-                        break; \
-                if ((VAR_MOVE_NOMOD = readmove(*VAR_B)) == UINT8_ERROR) { \
-                        LOG("Error: unknown move '%c'\n", *VAR_B); \
-                        return RET_ERROR; \
-                } \
-                if ((VAR_MOD = readmodifier(*(VAR_B+1))) != 0) \
-                        VAR_B++; \
-                ARG_MOVE = VAR_MOVE_NOMOD + VAR_MOD; \
-                ARG_ACTION \
-        }
-
 STATIC_INLINE bool
 allowednextmove(uint8_t m1, uint8_t m2)
 {
diff --git a/src/core/transform.h b/src/core/transform.h
index a6bb937..b480593 100644
--- a/src/core/transform.h
+++ b/src/core/transform.h
@@ -126,7 +126,7 @@ transform_edges(cube_t c, uint8_t t)
         case TRANS_BLm:
                 return TRANS_EDGES_MIRRORED(BLm, c);
         default:
-                LOG("transform error, unknown transformation %" PRIu8 "\n", t);
+                LOG("transform error: unknown transformation %" PRIu8 "\n", t);
                 return ZERO_CUBE;
         }
 }
@@ -353,7 +353,7 @@ applytrans(cube_t cube, const char *buf)
         t = readtrans(buf);
 
         if (t == UINT8_ERROR)
-                LOG("Unknown transformation '%s'\n", buf);
+                LOG("Unknown transformation: %s\n", buf);
 
         return transform(cube, t);
 }