commit 1d9b8acfeece68c4f55d2499d8aed127f98a383c
parent f1575ed335166a0897f2cfd314a0f4bade6a10fc
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date: Mon, 21 Apr 2025 10:33:46 +0200
Merged some files, renamed another
Diffstat:
6 files changed, 154 insertions(+), 154 deletions(-)
diff --git a/src/core/core.h b/src/core/core.h
@@ -1,7 +1,5 @@
#include "constant_cubes.h"
-#include "io_moves.h"
-#include "io_trans.h"
#include "cube.h"
-#include "io_cube.h"
+#include "io_formats.h"
#include "moves.h"
#include "transform.h"
diff --git a/src/core/io_cube.h b/src/core/io_formats.h
diff --git a/src/core/io_moves.h b/src/core/io_moves.h
@@ -1,127 +0,0 @@
-STATIC uint8_t readmove(char);
-STATIC int64_t readmoves(const char *, size_t n, uint8_t [n]);
-STATIC int64_t countmoves(const char *);
-STATIC uint8_t readmodifier(char);
-STATIC int64_t writemoves(size_t n, const uint8_t [n], size_t m, char [m]);
-
-#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("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 uint8_t
-readmove(char c)
-{
- switch (c) {
- case 'U':
- return MOVE_U;
- case 'D':
- return MOVE_D;
- case 'R':
- return MOVE_R;
- case 'L':
- return MOVE_L;
- case 'F':
- return MOVE_F;
- case 'B':
- return MOVE_B;
- default:
- return UINT8_ERROR;
- }
-}
-
-STATIC uint8_t
-readmodifier(char c)
-{
- switch (c) {
- case '1': /* Fallthrough */
- case '2': /* Fallthrough */
- case '3':
- return c - '0' - 1;
- case '\'':
- return 2;
- default:
- return 0;
- }
-}
-
-STATIC int64_t
-readmoves(const char *buf, size_t n, uint8_t ret[n])
-{
- uint8_t m;
- uint64_t c;
-
- FOREACH_READMOVE(buf, m, c, n, NISSY_ERROR_INVALID_MOVES,
- ret[c] = m;
- )
-
- return (int64_t)c;
-}
-
-STATIC int64_t
-countmoves(const char *buf)
-{
- uint8_t m;
- uint64_t c;
-
- FOREACH_READMOVE(buf, m, c, INT_MAX, NISSY_ERROR_INVALID_MOVES,
- {}
- )
-
- (void)m; /* Ignore "variable set but not used" warning */
-
- return (int64_t)c;
-}
-
-STATIC int64_t
-writemoves(
- size_t nmoves,
- const uint8_t m[nmoves],
- size_t buf_size,
- char buf[buf_size]
-)
-{
- size_t i, len, w;
- const char *s;
-
- if (buf_size == 0) {
- LOG("Error: cannot write moves to buffer of size 0.\n");
- return NISSY_ERROR_BUFFER_SIZE;
- }
-
- for (i = 0, w = 0; i < nmoves; i++, w++) {
- s = movestr[m[i]];
- len = strlen(s);
- if (len + w >= buf_size) {
- LOG("Error: the given buffer is too small for "
- "writing the given moves.\n");
- goto writemoves_error;
- }
- memcpy(buf+w, s, len);
- w += len;
- buf[w] = ' ';
- }
-
- if (w > 0) w--; /* Remove last space */
- buf[w] = '\0';
-
- return (int64_t)w;
-
-writemoves_error:
- *buf = '\0';
- return NISSY_ERROR_BUFFER_SIZE;
-}
diff --git a/src/core/io_trans.h b/src/core/io_trans.h
@@ -1,24 +0,0 @@
-STATIC uint8_t readtrans(const char [static NISSY_SIZE_TRANSFORMATION]);
-STATIC void writetrans(uint8_t, char [static NISSY_SIZE_TRANSFORMATION]);
-
-STATIC uint8_t
-readtrans(const char buf[static NISSY_SIZE_TRANSFORMATION])
-{
- uint8_t t;
-
- for (t = 0; t < NTRANS; t++)
- if (!strncmp(buf, transstr[t], 11))
- return t;
-
- return UINT8_ERROR;
-}
-
-STATIC void
-writetrans(uint8_t t, char buf[static NISSY_SIZE_TRANSFORMATION])
-{
- if (t >= 48)
- memcpy(buf, "error trans", 11);
- else
- memcpy(buf, transstr[t], 11);
- buf[11] = '\0';
-}
diff --git a/src/core/moves.h b/src/core/moves.h
@@ -1,6 +1,12 @@
#define MOVE(M, c) compose(c, MOVE_CUBE_ ## M)
#define PREMOVE(M, c) compose(MOVE_CUBE_ ## M, c)
+STATIC uint8_t readmove(char);
+STATIC int64_t readmoves(const char *, size_t n, uint8_t [n]);
+STATIC int64_t countmoves(const char *);
+STATIC uint8_t readmodifier(char);
+STATIC int64_t writemoves(size_t n, const uint8_t [n], size_t m, char [m]);
+
STATIC_INLINE bool allowednextmove(uint8_t, uint8_t);
STATIC bool allowedmoves(size_t n, const uint8_t [n]);
@@ -17,6 +23,128 @@ 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("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 uint8_t
+readmove(char c)
+{
+ switch (c) {
+ case 'U':
+ return MOVE_U;
+ case 'D':
+ return MOVE_D;
+ case 'R':
+ return MOVE_R;
+ case 'L':
+ return MOVE_L;
+ case 'F':
+ return MOVE_F;
+ case 'B':
+ return MOVE_B;
+ default:
+ return UINT8_ERROR;
+ }
+}
+
+STATIC uint8_t
+readmodifier(char c)
+{
+ switch (c) {
+ case '1': /* Fallthrough */
+ case '2': /* Fallthrough */
+ case '3':
+ return c - '0' - 1;
+ case '\'':
+ return 2;
+ default:
+ return 0;
+ }
+}
+
+STATIC int64_t
+readmoves(const char *buf, size_t n, uint8_t ret[n])
+{
+ uint8_t m;
+ uint64_t c;
+
+ FOREACH_READMOVE(buf, m, c, n, NISSY_ERROR_INVALID_MOVES,
+ ret[c] = m;
+ )
+
+ return (int64_t)c;
+}
+
+STATIC int64_t
+countmoves(const char *buf)
+{
+ uint8_t m;
+ uint64_t c;
+
+ FOREACH_READMOVE(buf, m, c, INT_MAX, NISSY_ERROR_INVALID_MOVES,
+ {}
+ )
+
+ (void)m; /* Ignore "variable set but not used" warning */
+
+ return (int64_t)c;
+}
+
+STATIC int64_t
+writemoves(
+ size_t nmoves,
+ const uint8_t m[nmoves],
+ size_t buf_size,
+ char buf[buf_size]
+)
+{
+ size_t i, len, w;
+ const char *s;
+
+ if (buf_size == 0) {
+ LOG("Error: cannot write moves to buffer of size 0.\n");
+ return NISSY_ERROR_BUFFER_SIZE;
+ }
+
+ for (i = 0, w = 0; i < nmoves; i++, w++) {
+ s = movestr[m[i]];
+ len = strlen(s);
+ if (len + w >= buf_size) {
+ LOG("Error: the given buffer is too small for "
+ "writing the given moves.\n");
+ goto writemoves_error;
+ }
+ memcpy(buf+w, s, len);
+ w += len;
+ buf[w] = ' ';
+ }
+
+ if (w > 0) w--; /* Remove last space */
+ buf[w] = '\0';
+
+ return (int64_t)w;
+
+writemoves_error:
+ *buf = '\0';
+ return NISSY_ERROR_BUFFER_SIZE;
+}
+
STATIC_INLINE bool
allowednextmove(uint8_t m1, uint8_t m2)
{
diff --git a/src/core/transform.h b/src/core/transform.h
@@ -17,6 +17,9 @@
invertco(compose(compose(TRANS_CUBE_ ## T, c), \
TRANS_CUBE_ ## T ## _INVERSE))
+STATIC uint8_t readtrans(const char [static NISSY_SIZE_TRANSFORMATION]);
+STATIC void writetrans(uint8_t, char [static NISSY_SIZE_TRANSFORMATION]);
+
STATIC cube_t transform_edges(cube_t, uint8_t);
STATIC cube_t transform_corners(cube_t, uint8_t);
STATIC cube_t transform(cube_t, uint8_t);
@@ -25,6 +28,28 @@ STATIC_INLINE uint8_t inverse_trans(uint8_t);
STATIC uint8_t transform_move(uint8_t, uint8_t);
STATIC uint64_t symmetry_mask(cube_t);
+STATIC uint8_t
+readtrans(const char buf[static NISSY_SIZE_TRANSFORMATION])
+{
+ uint8_t t;
+
+ for (t = 0; t < NTRANS; t++)
+ if (!strncmp(buf, transstr[t], 11))
+ return t;
+
+ return UINT8_ERROR;
+}
+
+STATIC void
+writetrans(uint8_t t, char buf[static NISSY_SIZE_TRANSFORMATION])
+{
+ if (t >= 48)
+ memcpy(buf, "error trans", 11);
+ else
+ memcpy(buf, transstr[t], 11);
+ buf[11] = '\0';
+}
+
STATIC cube_t
transform_edges(cube_t c, uint8_t t)
{
