Changeset 1665ee5

Timestamp:

Sep 11, 2024, 4:49:07 PM (2 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

05f8761

Parents:

6325bd4

Message:

Add uArray delayed-initialization equivalent to CFA array

Files:

• libcfa/src/collections/array.hfa (modified) (2 diffs)
• tests/array-collections/.expect/array-raii-c.txt (modified) (1 diff)
• tests/array-collections/.expect/array-raii-cfa.txt (modified) (2 diffs)
• tests/array-collections/array-raii-c.cfa (modified) (1 diff)
• tests/array-collections/array-raii-cfa.cfa (modified) (2 diffs)
• tests/array-collections/array-raii.hfa (modified) (3 diffs)

libcfa/src/collections/array.hfa

@@ -156 +156 @@
 //      other two.  This solution offers ?{}() that needs only ?{}(), and similar for ^?{}.
 
+// skip initializing elements
+//   array(float, 5) x = { delay_init };
+struct delay_init_t {} delay_init;
+forall( [N], S & | sized(S), Timmed &, Tbase & )
+static inline void ?{}( arpk( N, S, Timmed, Tbase ) & this, delay_init_t ) {
+        void ?{}( S (&)[N] ) {}
+        ?{}(this.strides);
+}
+
+// call default ctor on elements
+//   array(float, 5) x;
 forall( [N], S & | sized(S), Timmed &, Tbase & | { void ?{}( Timmed & ); } )
 static inline void ?{}( arpk( N, S, Timmed, Tbase ) & this ) {  
-        void ?{}( S (&)[N] ) {}
-        ?{}(this.strides);
-
+        ?{}( this, delay_init );
         for (i; N) ?{}( (Timmed &)this.strides[i] );
 }
@@ -173 +182 @@
         }
 }
+
 
 //

tests/array-collections/.expect/array-raii-c.txt

@@ -70 +70 @@
 dtor 1
 dtor 0
-=== uninit
+=== uninit ( uNoCtor[] )
  [1]
 before ctors

tests/array-collections/.expect/array-raii-cfa.txt

@@ -70 +70 @@
 dtor 1
 dtor 0
-=== uninit
+=== uninit ( uNoCtor[] )
  [1]
 before ctors
@@ -108 +108 @@
 dtor 101
 dtor 100
+=== uninit alt ( uArray )
+ [1]
+before ctors
+ctor 0
+ctor 999
+ctor 888
+ctor 3
+ctor 4
+func 0
+func 999
+func 888
+func 3
+func 4
+dtor 4
+dtor 3
+dtor 888
+dtor 999
+dtor 0
+ [2]
+before ctors
+ctor 100
+ctor 101
+ctor 102
+ctor 110
+ctor 999
+ctor 888
+func 100 at (0, 0)
+func 101 at (0, 1)
+func 102 at (0, 2)
+func 110 at (1, 0)
+func 999 at (1, 1)
+func 888 at (1, 2)
+dtor 888
+dtor 999
+dtor 110
+dtor 102
+dtor 101
+dtor 100
+=== uC++ cheat sheet
+ctor 0
+ctor 1
+ctor 2
+ctor 3
+ctor 4
+0
+1
+2
+3
+4
+dtor 4
+dtor 3
+dtor 2
+dtor 1
+dtor 0

tests/array-collections/array-raii-c.cfa

@@ -20 +20 @@
 
 #include "array-raii.hfa"
+
+void test_extras() {}

tests/array-collections/array-raii-cfa.cfa

@@ -16 +16 @@
 // CFA array means like `array(float, 17) x;`
 
+
+#include <fstream.hfa>
 #include <collections/array.hfa>
 
@@ -22 +24 @@
 
 #include "array-raii.hfa"
+
+void test_uninit_alt() {
+    printf(" [1]\n");
+    {
+        array(thing, 5) a = { delay_init };
+        printf("before ctors\n");
+        for(i; 5) {
+            if (i == 1)
+                (a[i]){};  // no need for `emplace` bc no-arg ctor call means elem's real ctor
+            else if (i == 2)
+                (a[i]){888};
+            else
+                (a[i]){i};
+        }
+        for(i; 5) printf("func %d\n", a[i].mem);
+    }
+    printf(" [2]\n");
+    {
+        array(thing, 2, 3) a = { delay_init };
+        printf("before ctors\n");
+        for(i; 2) for(j; 3) {
+            if (i == 1 && j == 1)
+                (a[i][j]){};
+            else if (i == 1 && j == 2)
+                (a[i][j]){888};
+            else
+                (a[i][j]){100 + 10 * i + j};
+        }
+        for(i; 2) for(j; 3) {
+            printf("func %d at (%d, %d)\n", a[i][j].mem, i, j);
+        }
+    }
+}
+
+void test_uCxxCheatSheet() {
+    struct S {
+        int i;
+    };
+    void ?{}( S & s, int i ) { s.i = i; sout | "ctor" | s.i; }
+    void ^?{}( S & s ) { sout | "dtor" | s.i; }
+//  int main() {
+        enum { N = 5 };
+        array(S, N) s = { delay_init };   // no constructor calls
+        for ( i; N ) s[i]{ i };
+        for ( i; N ) sout | s[i].i;
+//  }
+}
+
+void test_extras() {
+
+    printf("=== uninit alt ( uArray )\n");
+    test_uninit_alt();
+
+    printf("=== uC++ cheat sheet\n");
+    test_uCxxCheatSheet();
+}

tests/array-collections/array-raii.hfa

@@ -118 +118 @@
 }
 
+struct thing { int mem; };
+void ?{}( thing & this, int i ) {
+    (this.mem){ i };
+    printf("ctor %d\n", this.mem);
+}
+void ?{}( thing & this ) {
+    (this){ 999 };
+}
+void ^?{}( thing & this ) {
+    printf("dtor %d\n", this.mem);
+}
+
 // Array of uninits sees explicit ctor calls (only), and implied dtor calls
 void test_uninit() {
-    struct thing { int mem; };
-    void ?{}( thing & this, int i ) {
-        (this.mem){ i };
-        printf("ctor %d\n", this.mem);
-    }
-    void ?{}( thing & this ) {
-        (this){ 999 };
-    }
-    void ^?{}( thing & this ) {
-        printf("dtor %d\n", this.mem);
-    }
     printf(" [1]\n");
     {
@@ -163 +164 @@
 }
 
+void test_extras();
+
 int main() {
     printf("=== builtins\n");
@@ -170 +173 @@
     test_custom();
 
-    printf("=== uninit\n");
+    printf("=== uninit ( uNoCtor[] )\n");
     test_uninit();
+
+    test_extras();
 }