Reverted CArr to CArray again.

2 files changed, 23 insertions, 23 deletions

diff --git a/examples/complex.c b/examples/complex.c
index d4800260..a52bd175 100644
--- a/examples/complex.c
+++ b/examples/complex.c
@@ -1,12 +1,12 @@
 #include <stc/cstr.h>

 #include <stc/cmap.h>

 #include <stc/clist.h>

-#include <stc/carr.h>

+#include <stc/carray.h>

 

 void check_destroy(float* v) {printf("destroy %g\n", *v);}

 

-declare_CArr(f, float, check_destroy); // normally omit the last argument - float type need no destroy.

-declare_CList(t2, CArr2_f, carr2_f_destroy, c_noCompare);

+declare_CArray(f, float, check_destroy); // normally omit the last argument - float type need no destroy.

+declare_CList(t2, CArray2_f, carray2_f_destroy, c_noCompare);

 declare_CMap(il, int, CList_t2, clist_t2_destroy);

 declare_CMap_str(sm, CMap_il, cmap_il_destroy);

 

@@ -17,20 +17,20 @@ int main() {
     CMap_sm theMap = cmap_init;

 

     { // Construct.

-        CArr2_f table = carr2_f_make(ydim, xdim, 0.f);

-        printf("table: (%zu, %zu)\n", carr2_ydim(table), carr2_xdim(table));

+        CArray2_f table = carray2_f_make(ydim, xdim, 0.f);

+        printf("table: (%zu, %zu)\n", carray2_ydim(table), carray2_xdim(table));

         CList_t2 tableList = clist_init;

         CMap_il listMap = cmap_init;

         

         // Put in some data.

-        carr2_f_data(table, y)[x] = 3.1415927; // table[y][x]

+        carray2_f_data(table, y)[x] = 3.1415927; // table[y][x]

         clist_t2_pushBack(&tableList, table);

         cmap_il_put(&listMap, tableKey, tableList);

         cmap_sm_put(&theMap, strKey, listMap);

     }

     { // Access the data entry

-        CArr2_f table = clist_back(cmap_il_find(&cmap_sm_find(&theMap, strKey)->value, tableKey)->value);

-        printf("value (%d, %d) is: %f\n", y, x, carr2_f_value(table, y, x));

+        CArray2_f table = clist_back(cmap_il_find(&cmap_sm_find(&theMap, strKey)->value, tableKey)->value);

+        printf("value (%d, %d) is: %f\n", y, x, carray2_f_value(table, y, x));

     }

 

     cmap_sm_destroy(&theMap); // free up the whole shebang!

diff --git a/examples/demos.c b/examples/demos.c
index 9eec136a..e6e76d7a 100644
--- a/examples/demos.c
+++ b/examples/demos.c
@@ -1,6 +1,6 @@
 #include <stc/cvec.h>

 #include <stc/clist.h>

-#include <stc/carr.h>

+#include <stc/carray.h>

 #include <stc/cmap.h>

 #include <stc/cstr.h>

 

@@ -174,28 +174,28 @@ void mapdemo3()
 

 

 

-declare_CArr(f, float);

+declare_CArray(f, float);

 

 void arraydemo1()

 {

     printf("\nARRAYDEMO1\n");

-    CArr3_f a3 = carr3_f_make(30, 20, 10, 0.f);

-    carr3_f_data(a3, 5, 4)[3] = 10.2f;  // a3[5][4][3]

-    CArr2_f a2 = carr3_f_at(a3, 5);     // sub-array reference (no data copy).

+    CArray3_f a3 = carray3_f_make(30, 20, 10, 0.f);

+    carray3_f_data(a3, 5, 4)[3] = 10.2f;  // a3[5][4][3]

+    CArray2_f a2 = carray3_f_at(a3, 5);     // sub-array reference (no data copy).

 

-    printf("a3: %zu: (%zu, %zu, %zu) = %zu\n", sizeof(a3), carr3_xdim(a3), carr3_ydim(a3), carr3_zdim(a3), carr3_size(a3));

-    printf("a2: %zu: (%zu, %zu) = %zu\n", sizeof(a2), carr2_xdim(a2), carr2_ydim(a2), carr2_size(a2));

+    printf("a3: %zu: (%zu, %zu, %zu) = %zu\n", sizeof(a3), carray3_xdim(a3), carray3_ydim(a3), carray3_zdim(a3), carray3_size(a3));

+    printf("a2: %zu: (%zu, %zu) = %zu\n", sizeof(a2), carray2_xdim(a2), carray2_ydim(a2), carray2_size(a2));

 

-    printf("%f\n", carr2_f_value(a2, 4, 3));   // readonly lookup a2[4][3] (=10.2f)

-    printf("%f\n", carr2_f_data(a2, 4)[3]);    // same, but this is writable.

-    printf("%f\n", carr2_f_at(a2, 4).data[3]); // same, via sub-array access.

+    printf("%f\n", carray2_f_value(a2, 4, 3));   // readonly lookup a2[4][3] (=10.2f)

+    printf("%f\n", carray2_f_data(a2, 4)[3]);    // same, but this is writable.

+    printf("%f\n", carray2_f_at(a2, 4).data[3]); // same, via sub-array access.

     

-    printf("%f\n", carr3_f_value(a3, 5, 4, 3)); // same data location, via a3 array.

-    printf("%f\n", carr3_f_data(a3, 5, 4)[3]);

-    printf("%f\n", carr3_f_at2(a3, 5, 4).data[3]);

+    printf("%f\n", carray3_f_value(a3, 5, 4, 3)); // same data location, via a3 array.

+    printf("%f\n", carray3_f_data(a3, 5, 4)[3]);

+    printf("%f\n", carray3_f_at2(a3, 5, 4).data[3]);

 

-    carr2_f_destroy(&a2); // does nothing, since it is a sub-array.

-    carr3_f_destroy(&a3); // also invalidates a2.

+    carray2_f_destroy(&a2); // does nothing, since it is a sub-array.

+    carray3_f_destroy(&a3); // also invalidates a2.

 }