Clean up

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 33 insertions, 95 deletions

diff --git a/libcharconv_rotated_90deg_cw.c b/libcharconv_rotated_90deg_cw.c
index c22b44f..7b23dba 100644
--- a/libcharconv_rotated_90deg_cw.c
+++ b/libcharconv_rotated_90deg_cw.c
@@ -3,109 +3,47 @@
 
 
 static struct {
+#ifndef REVERSED
+# define FUNC_NAME libcharconv_rotated_90deg_cw
 	uint_least32_t from;
 	uint_least32_t to;
+#else
+# define FUNC_NAME libcharconv_rotated_90deg_ccw
+	uint_least32_t to;
+	uint_least32_t from;
+#endif
 } pairs[] = {
-	{UINT32_C(0x230E), UINT32_C(0x230C)},
-	{UINT32_C(0x230C), UINT32_C(0x230D)},
-	{UINT32_C(0x230D), UINT32_C(0x230F)},
-	{UINT32_C(0x230F), UINT32_C(0x230E)},
-	{UINT32_C(0x1FA04), UINT32_C(0x1FA19)},
-	{UINT32_C(0x1FA19), UINT32_C(0x1FA2E)},
-	{UINT32_C(0x1FA2E), UINT32_C(0x1FA43)},
-	{UINT32_C(0x1FA43), UINT32_C(0x1FA04)},
-	{UINT32_C(0x02658), UINT32_C(0x1FA0D)},
-	{UINT32_C(0x1FA0D), UINT32_C(0x1FA22)},
-	{UINT32_C(0x1FA22), UINT32_C(0x1FA37)},
-	{UINT32_C(0x1FA37), UINT32_C(0x02658)},
-	{UINT32_C(0x0265E), UINT32_C(0x1FA13)},
-	{UINT32_C(0x1FA13), UINT32_C(0x1FA28)},
-	{UINT32_C(0x1FA28), UINT32_C(0x1FA3D)},
-	{UINT32_C(0x1FA3D), UINT32_C(0x0265E)},
-	{UINT32_C(0x1FA08), UINT32_C(0x1FA1D)},
-	{UINT32_C(0x1FA1D), UINT32_C(0x1FA32)},
-	{UINT32_C(0x1FA32), UINT32_C(0x1FA47)},
-	{UINT32_C(0x1FA47), UINT32_C(0x1FA08)},
-	{UINT32_C(0x1FA06), UINT32_C(0x1FA1B)},
-	{UINT32_C(0x1FA1B), UINT32_C(0x1FA30)},
-	{UINT32_C(0x1FA30), UINT32_C(0x1FA45)},
-	{UINT32_C(0x1FA45), UINT32_C(0x1FA06)},
-	{UINT32_C(0x1FA07), UINT32_C(0x1FA1C)},
-	{UINT32_C(0x1FA1C), UINT32_C(0x1FA31)},
-	{UINT32_C(0x1FA31), UINT32_C(0x1FA46)},
-	{UINT32_C(0x1FA46), UINT32_C(0x1FA07)},
-	{UINT32_C(0x1FA48), UINT32_C(0x1FA4B)},
-	{UINT32_C(0x1FA49), UINT32_C(0x1FA4C)},
-	{UINT32_C(0x1FA4A), UINT32_C(0x1FA4D)},
-	{UINT32_C(0x1FA4B), UINT32_C(0x1FA48)},
-	{UINT32_C(0x1FA4C), UINT32_C(0x1FA49)},
-	{UINT32_C(0x1FA4D), UINT32_C(0x1FA4A)},
-	{UINT32_C(0x1FA00), UINT32_C(0x1FA15)},
-	{UINT32_C(0x1FA15), UINT32_C(0x1FA2A)},
-	{UINT32_C(0x1FA2A), UINT32_C(0x1FA3F)},
-	{UINT32_C(0x1FA3F), UINT32_C(0x1FA00)},
-	{UINT32_C(0x1FA01), UINT32_C(0x1FA16)},
-	{UINT32_C(0x1FA16), UINT32_C(0x1FA2B)},
-	{UINT32_C(0x1FA2B), UINT32_C(0x1FA40)},
-	{UINT32_C(0x1FA40), UINT32_C(0x1FA01)},
-	{UINT32_C(0x1FA02), UINT32_C(0x1FA17)},
-	{UINT32_C(0x1FA17), UINT32_C(0x1FA2C)},
-	{UINT32_C(0x1FA2C), UINT32_C(0x1FA41)},
-	{UINT32_C(0x1FA41), UINT32_C(0x1FA02)},
-	{UINT32_C(0x1FA03), UINT32_C(0x1FA18)},
-	{UINT32_C(0x1FA18), UINT32_C(0x1FA2D)},
-	{UINT32_C(0x1FA2D), UINT32_C(0x1FA42)},
-	{UINT32_C(0x1FA42), UINT32_C(0x1FA03)},
-	{UINT32_C(0x1FA05), UINT32_C(0x1FA1A)},
-	{UINT32_C(0x1FA1A), UINT32_C(0x1FA2F)},
-	{UINT32_C(0x1FA2F), UINT32_C(0x1FA44)},
-	{UINT32_C(0x1FA44), UINT32_C(0x1FA05)},
-	{UINT32_C(0x2654), UINT32_C(0x1FA09)},
-	{UINT32_C(0x1FA09), UINT32_C(0x1FA1E)},
-	{UINT32_C(0x1FA1E), UINT32_C(0x1FA33)},
-	{UINT32_C(0x1FA33), UINT32_C(0x2654)},
-	{UINT32_C(0x2655), UINT32_C(0x1FA0A)},
-	{UINT32_C(0x1FA0A), UINT32_C(0x1FA1F)},
-	{UINT32_C(0x1FA1F), UINT32_C(0x1FA34)},
-	{UINT32_C(0x1FA34), UINT32_C(0x2655)},
-	{UINT32_C(0x2656), UINT32_C(0x1FA0B)},
-	{UINT32_C(0x1FA0B), UINT32_C(0x1FA20)},
-	{UINT32_C(0x1FA20), UINT32_C(0x1FA35)},
-	{UINT32_C(0x1FA35), UINT32_C(0x2656)},
-	{UINT32_C(0x2657), UINT32_C(0x1FA0C)},
-	{UINT32_C(0x1FA0C), UINT32_C(0x1FA21)},
-	{UINT32_C(0x1FA21), UINT32_C(0x1FA36)},
-	{UINT32_C(0x1FA36), UINT32_C(0x2657)},
-	{UINT32_C(0x2659), UINT32_C(0x1FA0E)},
-	{UINT32_C(0x1FA0E), UINT32_C(0x1FA23)},
-	{UINT32_C(0x1FA23), UINT32_C(0x1FA38)},
-	{UINT32_C(0x1FA38), UINT32_C(0x2659)},
-	{UINT32_C(0x265A), UINT32_C(0x1FA0F)},
-	{UINT32_C(0x1FA0F), UINT32_C(0x1FA24)},
-	{UINT32_C(0x1FA24), UINT32_C(0x1FA39)},
-	{UINT32_C(0x1FA39), UINT32_C(0x265A)},
-	{UINT32_C(0x265B), UINT32_C(0x1FA10)},
-	{UINT32_C(0x1FA10), UINT32_C(0x1FA25)},
-	{UINT32_C(0x1FA25), UINT32_C(0x1FA3A)},
-	{UINT32_C(0x1FA3A), UINT32_C(0x265B)},
-	{UINT32_C(0x265C), UINT32_C(0x1FA11)},
-	{UINT32_C(0x1FA11), UINT32_C(0x1FA26)},
-	{UINT32_C(0x1FA26), UINT32_C(0x1FA3B)},
-	{UINT32_C(0x1FA3B), UINT32_C(0x265C)},
-	{UINT32_C(0x265D), UINT32_C(0x1FA12)},
-	{UINT32_C(0x1FA12), UINT32_C(0x1FA27)},
-	{UINT32_C(0x1FA27), UINT32_C(0x1FA3C)},
-	{UINT32_C(0x1FA3C), UINT32_C(0x265D)},
-	{UINT32_C(0x265F), UINT32_C(0x1FA14)},
-	{UINT32_C(0x1FA14), UINT32_C(0x1FA29)},
-	{UINT32_C(0x1FA29), UINT32_C(0x1FA3E)},
-	{UINT32_C(0x1FA3E), UINT32_C(0x265F)},
+	CYCLE_4(0x230E, 0x230C, 0x230D, 0x230F),
+	CYCLE_4(0x1FA04, 0x1FA19, 0x1FA2E, 0x1FA43),
+	CYCLE_4(0x02658, 0x1FA0D, 0x1FA22, 0x1FA37),
+	CYCLE_4(0x0265E, 0x1FA13, 0x1FA28, 0x1FA3D),
+	CYCLE_4(0x1FA08, 0x1FA1D, 0x1FA32, 0x1FA47),
+	CYCLE_4(0x1FA06, 0x1FA1B, 0x1FA30, 0x1FA45),
+	CYCLE_4(0x1FA07, 0x1FA1C, 0x1FA31, 0x1FA46),
+	CYCLE_2(0x1FA48, 0x1FA4B),
+	CYCLE_2(0x1FA49, 0x1FA4C),
+	CYCLE_2(0x1FA4A, 0x1FA4D),
+	CYCLE_4(0x1FA00, 0x1FA15, 0x1FA2A, 0x1FA3F),
+	CYCLE_4(0x1FA01, 0x1FA16, 0x1FA2B, 0x1FA40),
+	CYCLE_4(0x1FA02, 0x1FA17, 0x1FA2C, 0x1FA41),
+	CYCLE_4(0x1FA03, 0x1FA18, 0x1FA2D, 0x1FA42),
+	CYCLE_4(0x1FA05, 0x1FA1A, 0x1FA2F, 0x1FA44),
+	CYCLE_4(0x2654, 0x1FA09, 0x1FA1E, 0x1FA33),
+	CYCLE_4(0x2655, 0x1FA0A, 0x1FA1F, 0x1FA34),
+	CYCLE_4(0x2656, 0x1FA0B, 0x1FA20, 0x1FA35),
+	CYCLE_4(0x2657, 0x1FA0C, 0x1FA21, 0x1FA36),
+	CYCLE_4(0x2659, 0x1FA0E, 0x1FA23, 0x1FA38),
+	CYCLE_4(0x265A, 0x1FA0F, 0x1FA24, 0x1FA39),
+	CYCLE_4(0x265B, 0x1FA10, 0x1FA25, 0x1FA3A),
+	CYCLE_4(0x265C, 0x1FA11, 0x1FA26, 0x1FA3B),
+	CYCLE_4(0x265D, 0x1FA12, 0x1FA27, 0x1FA3C),
+	CYCLE_4(0x265F, 0x1FA14, 0x1FA29, 0x1FA3E),
 	{UINT32_C(0x213A), (uint_least32_t)'Q'}
 };
 
 
 enum libcharconv_result
-libcharconv_rotated_90deg_cw(const char *s, size_t slen, size_t *n, uint_least32_t *cp, size_t *ncp)
+FUNC_NAME(const char *s, size_t slen, size_t *n, uint_least32_t *cp, size_t *ncp)
 {
 	uint_least32_t c;
 	size_t i, clen;