Changeset a8e2215

Timestamp:

Feb 6, 2025, 2:50:36 PM (8 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

cd28605

Parents:

301e9f7

Message:

Tidy vector-iterator POC and remedy its warnings

Files:

• libcfa/src/collections/vector2.hfa (modified) (12 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/collections/vector-demo.cfa (modified) (2 diffs)

libcfa/src/collections/vector2.hfa

@@ -13 +13 @@
 // Update Count     : 2
 //
+
+// This libcfa header and the vector-demo test form a standalone POC.
+// The 'vector' is really a host for a style of iterator.
+// The iterators represent a style proposed to be part of "how CFA collections should do iterators."
+// The vector API is not built out, beyond what's needed to test the iterators.
 
 #pragma once
@@ -75 +80 @@
     void ?{}( vector_exit(T) &, vector(T) * ) = void;
 
-    void ^?{}( vector_exit(T) & );
     void ?{}( vector_exit(T) &, vector_transit(T) & );
     void ?{}( vector_exit(T) &, vector_exit(T) & );
+    void ^?{}( vector_exit(T) & );
 
     T ?`val( vector_exit(T) & src );
     void ?=?( vector_exit(T) & dst, T val );
-    T & ?=?( T & dst, vector_exit(T) & src );
-    void ?*=?( T & dst, vector_exit(T) & src );
+    void ?*=?( T & dst, vector_exit(T) & src ); // wish it were ?=?, but that's not working
 
     bool ?`moveNext( vector_exit(T) & it );
@@ -141 +145 @@
     void ^?{}( vector_transit(T) & ) {}
 
-
-    vector_transit(T) ?[?]( vector( T ) & vec, ptrdiff_t idx ) {
-        // call autogen constructor deleted at end of hfa
-        vector_transit(T) ret = { & vec, idx };
-        return ret;
-    }
 
     T & findElemMem_$( vector(T) & v, ptrdiff_t idx ) {
@@ -176 +174 @@
         this.invec_$->exit_refcount_$ ++;
     }
+
     void ?{}( vector_exit(T) & this, vector_exit(T) & src ){
         ( this.invec_$ ){ src.invec_$ };
@@ -189 +188 @@
     T ?`val( vector_exit(T) & src ) {
         return *src.item_$;
+    }
+
+    void ?=?( vector_exit(T) & dst, T val ) {
+        *dst.item_$ = val;
     }
 
@@ -243 +246 @@
     // vec internals
 
-    void grow( vector( T ) & this ) {
+    void grow_$( vector( T ) & this ) {
         size_t newCapacity = 2 * (this.buffer_end_$ - this.buffer_first_$);
         T * newItems = aalloc( newCapacity );
@@ -263 +266 @@
     }
 
+    bool inRange_$( T * query, T * from, T * to) {
+        if (from == to) return false;
+        if (from < to) return from <= query && query < to;
+        return query < to || from <= query;
+    }
+
     // vec api
 
@@ -269 +278 @@
         if (col`length >= col`capacity) {
             assert (col`length == col`capacity);
-            grow(col);
+            grow_$(col);
         }
         // call autogen constructor deleted at end of hfa
@@ -280 +289 @@
     }
 
+    vector_transit(T) ?[?]( vector( T ) & vec, ptrdiff_t idx ) {
+        // call autogen constructor deleted at end of hfa
+        vector_transit(T) ret = { & vec, idx };
+        return ret;
+    }
+
     vector_exit(T) ?`origin( vector( T ) & vec ) {
 
@@ -294 +309 @@
     }
 
-    bool inRange_$( T * query, T * from, T * to) {
-        if (from == to) return false;
-        if (from < to) return from <= query && query < to;
-        return query < to || from <= query;
+    size_t ?`capacity( vector(T) & v ) {
+        return v.buffer_end_$ - v.buffer_first_$;
+    }
+
+    size_t ?`length( vector(T) & v ) {
+        if (v.elems_first_$ == 0p) return 0;
+        if (v.elems_first_$ < v.elems_end_$ ) return v.elems_end_$ - v.elems_first_$;
+        return v.buffer_end_$ - v.elems_first_$ + v.elems_end_$ - v.buffer_first_$;
     }
 
@@ -304 +323 @@
         if (col`length >= col`capacity) {
             assert (col`length == col`capacity);
-            grow(col);
+            grow_$(col);
         }
         
@@ -339 +358 @@
     }
 
-    size_t ?`capacity( vector(T) & v ) {
-        return v.buffer_end_$ - v.buffer_first_$;
-    }
-
-    size_t ?`length( vector(T) & v ) {
-        if (v.elems_first_$ == 0p) return 0;
-        if (v.elems_first_$ < v.elems_end_$ ) return v.elems_end_$ - v.elems_first_$;
-        return v.buffer_end_$ - v.elems_first_$ + v.elems_end_$ - v.buffer_first_$;
-    }
-
-
 } // forall T
 

tests/Makefile.am

@@ -62 +62 @@
 # Tests that need investigation from the CFA team about why they require lax wflags.  Goal is to eliminate this list.
 WFLAGS_OPT_LAX_TO_INVESTIGATE = \
-        collections/vector-demo \
         concurrency/actors/dynamic \
         concurrency/actors/executor \

tests/collections/vector-demo.cfa

@@ -138 +138 @@
     assert( v`capacity == 4 && v`length == 4 );
 
-    push_last(v, -100); // v is [0.0, 98.6, 0.1, 0.2, 0.3]; iter at 0.1, but RTP it's not looking at the old memory's 0.1
+    push_last(v, -100); // v is [0.0, 98.6, 0.1, 0.2, -100]; iter at 0.1, but RTP it's not looking at the old memory's 0.1
 
     // that made it bigger
     assert( v`capacity >  5 && v`length == 5 );
 
-    v[2] = -0.1f;  // v is [0.0, 98.6, -0.1, 0.2, 0.3]; iter at -0.1, where only the new memory had that change
+    v[2] = -0.1f;  // v is [0.0, 98.6, -0.1, 0.2, -100]; iter at -0.1, where only the new memory had that change
 
     float val3 = iter`val;
@@ -158 +158 @@
 
     while( vector_exit(float) it = v`origin; it`moveNext ) {
-        toPrint *= it;
+        toPrint *= it;  // wish for ?=?, but it's not working
         printf("loop sees %f\n", toPrint);
     }
+
+    // todo: loop a permit
 }