Refactoring

5 files changed, 10 insertions, 10 deletions

diff --git a/utils/genmovecode.sh b/utils/genmovecode.sh
index c389ea8..688ee39 100755
--- a/utils/genmovecode.sh
+++ b/utils/genmovecode.sh
@@ -2,16 +2,16 @@
 
 type="${1:-src}"
 
-gcc -DDEBUG h48_to_"$type".c ../src/cube.c -o h48_to_"$type"
+gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type"
 
 genfuncs() {
         for f in move_??_*.txt; do
                 move="$(echo $f | sed 's/.*_// ; s/\.txt//')"
-                printf 'static inline cube_t\ninline_move_%s' "$move"
+                printf 'static inline cube_t\n_move_%s' "$move"
                 printf '(cube_t c)\n{\n'
                 printf '\tcube_t m = '
                 ./h48_to_"$type" <"$f" | sed '2,4s/^/\t/'
-                printf ';\n\n\treturn compose(c, m);\n}\n\n'
+                printf ';\n\n\treturn _compose(c, m);\n}\n\n'
         done
 }
 
diff --git a/utils/gentranscode.sh b/utils/gentranscode.sh
index 7749ba7..2f73df7 100755
--- a/utils/gentranscode.sh
+++ b/utils/gentranscode.sh
@@ -2,8 +2,8 @@
 
 type="${1:-src}"
 
-gcc -DDEBUG h48_to_"$type".c ../src/cube.c -o h48_to_"$type"
-gcc -DDEBUG invert.c ../src/cube.c -o invert
+gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type"
+gcc -DDEBUG invert.c ../cube.c -o invert
 
 # Old version
 genarray() {
@@ -22,7 +22,7 @@ genarray() {
 genfuncs() {
         for f in transform_??_???.txt; do
                 trans="$(echo $f | sed 's/.*_// ; s/\.txt//')"
-                printf 'static inline cube_t\ninline_trans_%s' "$trans"
+                printf 'static inline cube_t\n_trans_%s' "$trans"
                 printf '(cube_t c)\n{\n'
                 printf '\tcube_t ret;\n\n'
                 printf '\tcube_t tn = '
@@ -32,7 +32,7 @@ genfuncs() {
                 printf ';\n\n\tret = compose(tn, c);\n'
                 printf '\tret = compose(ret, ti);\n'
                 if [ -n "$(echo "$trans" | grep "m")" ]; then
-                        printf '\tret = flipallcorners(ret);\n'
+                        printf '\tret = _invertco(ret);\n'
                 fi
                 printf '\n\treturn ret;\n}\n\n'
         done
diff --git a/utils/h48_to_avx.c b/utils/h48_to_avx.c
index e1d8c2e..e5df2aa 100644
--- a/utils/h48_to_avx.c
+++ b/utils/h48_to_avx.c
@@ -2,7 +2,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "../src/cube.h"
+#include "../cube.h"
 
 #define STRLENMAX 1000
 
diff --git a/utils/h48_to_src.c b/utils/h48_to_src.c
index 97ee4bf..a8fda00 100644
--- a/utils/h48_to_src.c
+++ b/utils/h48_to_src.c
@@ -2,7 +2,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "../src/cube.h"
+#include "../cube.h"
 
 #define STRLENMAX 1000
 
diff --git a/utils/invert.c b/utils/invert.c
index 3088273..aa912e5 100644
--- a/utils/invert.c
+++ b/utils/invert.c
@@ -2,7 +2,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "../src/cube.h"
+#include "../cube.h"
 
 #define STRLENMAX 1000