Feature completed cspan.

2 files changed, 4 insertions, 7 deletions

diff --git a/misc/examples/multidim.c b/misc/examples/multidim.c
index 49b24172..49d7fbc4 100644
--- a/misc/examples/multidim.c
+++ b/misc/examples/multidim.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 
 using_cspan3(ispan, int);
-#define c_ALL 0,-1
 
 int main()
 {
@@ -32,7 +31,7 @@ int main()
     puts("ss3 = ms3[:, 1:3, 1:3]");
     ispan3 ss3 = ms3;
     //cspan_slice(&ss3, {c_ALL}, {1,3}, {1,3});
-    ss3 = cspan_subslice(ispan3, &ms3, {c_ALL}, {1,3}, {1,3});
+    ss3 = cspan_slice(ispan3, &ms3, {c_ALL}, {1,3}, {1,3});
 
     for (int i=0; i != ss3.dim[0]; i++) {
         for (int j=0; j != ss3.dim[1]; j++) {
diff --git a/misc/tests/cspan_test.c b/misc/tests/cspan_test.c
index cd6a1271..044ce629 100644
--- a/misc/tests/cspan_test.c
+++ b/misc/tests/cspan_test.c
@@ -31,8 +31,7 @@ CTEST(cspan, slice) {
         }
     }
 
-    intspan2 m2 = m1;
-    cspan_slice(&m2, {c_ALL}, {2,4});
+    intspan2 m2 = cspan_slice(intspan2, &m1, {c_ALL}, {2,4});
 
     size_t sum2 = 0;
     for (size_t i = 0; i < m2.dim[0]; ++i) {
@@ -54,7 +53,7 @@ CTEST(cspan, slice2) {
             cstack_int_push(&stack, i);
 
         intspan3 ms3 = cspan_md(stack.data, 10, 20, 30);
-        cspan_slice(&ms3, {1,4}, {3,7}, {20,24});
+        ms3 = cspan_slice(intspan3, &ms3, {1,4}, {3,7}, {20,24});
 
         size_t sum = 0;
         for (size_t i = 0; i < ms3.dim[0]; ++i) {
@@ -98,8 +97,7 @@ CTEST_SETUP(cspan_cube) {
     c_FORRANGE (i, 0, ms3.dim[0], TSIZE) {
         c_FORRANGE (j, 0, ms3.dim[1], TSIZE) {
             c_FORRANGE (k, 0, ms3.dim[2], TSIZE) {
-                intspan3 tile = ms3;
-                cspan_slice(&tile, {i, i + TSIZE}, {j, j + TSIZE}, {k, k + TSIZE});
+                intspan3 tile = cspan_slice(intspan3, &ms3, {i, i + TSIZE}, {j, j + TSIZE}, {k, k + TSIZE});
                 Tiles_push(&_self->tiles, tile);
             }
         }