rework library to use structs

[hexagon] / t / cantor.c

diff --git a/t/cantor.c b/t/cantor.c
index 1e7dbf6e8c6358f46cafdc07ab622e786ba83b46..7362714c09e5ae9823acea24715059dbdfdb1c11 100644 (file)
--- a/t/cantor.c
+++ b/t/cantor.c
@@ -5,21 +5,21 @@
 #include "ctap.h"
 
 int main(void) {
-       int xy[2];
-       int ijk[3];
        int hex;
+       struct HL_hex in;
+       struct HL_hex out;
        int x, y;
 
-       plan(81*4);
+       plan(81*2);
 
        for (x=-4;x<=4;x++) {
                for (y=-4;y<=4;y++) {
-                       hex = HL_cantor_xy(x,y);
-                       HL_cantor_arrays(hex, xy, ijk);
-                       ok(x == xy[0], "x check %d %d", x, y);
-                       ok(y == xy[1], "y check %d %d", x, y);
-                       ok(x == HL_cantor_x(hex), "reverse check x %d %d",hex,x);
-                       ok(x == HL_cantor_x(hex), "reverse check y %d %d",hex,y);
+                       in.x = x;
+                       in.y = y;
+                       hex = HL_cantor(in);
+                       out = HL_uncantor(hex);
+                       is_int(x, out.x, "x check %d %d", x, y);
+                       is_int(y, out.y, "y check %d %d", x, y);
                }
        }