Changeset 5b21636b for libcfa

Timestamp:

Apr 13, 2026, 9:41:59 AM (9 days ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

0f9c67bf

Parents:

1abcec9b

Message:

Retract work in progress mistakenly included in 1abcec9b.

Location:

libcfa/src/collections

Files:

• array.hfa (modified) (2 diffs)
• string.cfa (modified) (1 diff)

libcfa/src/collections/array.hfa

@@ -1 +1 @@
 #pragma once
+
 
 
@@ -175 +176 @@
 }
 
-// RAII for copying interacts poorly with CFA RAII's default (quasi-mandate) to take
-// 'src' parameters by value; note doc/proposals/autogen.md suggests changing this pattern.
-// If Timmed offers a by-value copy-ctor, then
-//  - the array copy-ctor will make lots of memcpys of them
-//  - the array assignment operator will make temporaries (and call their RAII, implying
-//    the above memcpys) of them
-//  - the array assignment operator will scale poorly to higher dimensionality due to #226
-// Furthermore, enabling this experimental flag breaks some multidimensional behaviour,
-// as illustraed by a test failure in array-md-sbscr-cases, which has not been investigated.
-// These limitations kick in upon calling the copy operation, not upon including the definitions.
-// Design choice here:
-//  - FIX ME: deal with `const &` on params
-#ifdef EXPERIMENTAL_ARRAY_ALLOW_COPY_RAII
-        // call copy ctor on elements
-        //   array(float, 5) y;     // given
-        //   array(float, 5) x = y; // <- do
-        forall( [N], S & | sized(S), Timmed *, Tbase & | { void ?{}( Timmed &, Timmed & ); } )
-        static inline void ?{}( arpk( N, S, Timmed, Tbase ) & this, arpk( N, S, Timmed, Tbase ) & src ) {
-                ?{}( this, delay_init );
-                for (i; N) ?{}( (Timmed &)this.strides[i], src[i] );
-        }
-        forall( [N], S & | sized(S), Timmed *, Tbase & | { void ?{}( Timmed &, const Timmed & ); } )
-        static inline void ?{}( arpk( N, S, Timmed, Tbase ) & this, arpk( N, S, Timmed, Tbase ) & src  ) {
-                ?{}( this, delay_init );
-                for (i; N) ?{}( (Timmed &)this.strides[i], src[i] );
-        }
-
-        // call assignment on elements
-        //   array(float, 5) x, y;  // given
-        //   x = y;                 // <- do
-        forall( [N], S & | sized(S), Timmed & | is_value(Timmed), Tbase & )
-        static inline void ?=?( arpk( N, S, Timmed, Tbase ) & this, arpk( N, S, Timmed, Tbase ) & src ) {
-                for (i; N) this[i] = src[i];
-                return src;
-        }
-        forall( [N], S & | sized(S), Timmed &, Tbase & | { void ?=?( Timmed &, const Timmed & ); } )
-        static inline void ?=?( arpk( N, S, Timmed, Tbase ) & this, arpk( N, S, Timmed, Tbase ) & src  ) {
-                for (i; N) this[i] = src[i];
-                return src;
-        }
-#endif // EXPERIMENTAL_ARRAY_ALLOW_COPY_RAII
-
 
 //

libcfa/src/collections/string.cfa

@@ -244 +244 @@
 
 string ?()( string & s, ssize_t start, ssize_t len ) {
-        // if ( start < 0 ) start += len( s );
-        // if ( len < 0 ) { len = -len; start -= len - 1; }
-        // if ( start < 0 ) start = 0;
-        // if ( start > len( s ) ) start = len( s );
-        // if ( start + len > len( s ) ) len = len( s ) - start;
+        if ( start < 0 ) start += len( s );
+        if ( len < 0 ) { len = -len; start -= len - 1; }
+        if ( start < 0 || start >= len( s ) ) return (string){ "" };
+        if ( start + len > len( s ) ) len = len( s ) - start;
         string ret = { *s.inner, start, len };
         return ret`share;