Changeset 8ee211d for libcfa/src/collections/array.hfa

Timestamp:

Dec 12, 2024, 4:45:14 PM (6 days ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

ad8b6df

Parents:

35cc6d4

Message:

Make array and list headers free of warnings upon include and as used in a libcfa build

File:

• libcfa/src/collections/array.hfa (modified) (2 diffs)

libcfa/src/collections/array.hfa

@@ -9 +9 @@
 
 #ifdef __CFA_DEBUG__
-#define subcheck( arr, sub, lb, ub ) \
-        if ( (sub) < (lb) || (sub) >= (ub) ) \
-                abort( "subscript %ld exceeds dimension range [%d,%zd) for array %p.\n", \
-                           (sub), (lb), (ub), (arr) )
+#define subcheck( arr, sub, len ) \
+        if ( (sub) < 0 || (sub) >= (len) ) \
+                abort( "subscript %ld exceeds dimension range [0,%zd) for array %p.\n", \
+                           (sub), (len), (arr) )
+#define subchecku( arr, sub, len ) \
+        if ( (sub) >= (len) ) \
+                abort( "subscript %ld exceeds dimension range [0,%zd) for array %p.\n", \
+                           (sub), (len), (arr) )
 #else
-#define subcheck( arr, sub, lb, ub ) do {} while (0)
+#define subcheck( arr, sub, len ) do {} while (0)
+#define subchecku( arr, sub, len ) do {} while (0)
 #endif
 
@@ -84 +89 @@
 
         static inline Timmed & ?[?]( arpk( N, S, Timmed, Tbase ) & a, zero_t ) {
-                //assert( 0 < N );
-                subcheck( a, 0L, 0, N );
+                subcheck( a, 0L, N );
                 return (Timmed &)a.strides[0];
         }
 
         static inline Timmed & ?[?]( arpk( N, S, Timmed, Tbase ) & a, one_t ) {
-                //assert( 1 < N );
-                subcheck( a, 1L, 0, N );
+                subcheck( a, 1L, N );
                 return (Timmed &)a.strides[1];
         }
 
         static inline Timmed & ?[?]( arpk( N, S, Timmed, Tbase ) & a, int i ) {
-                //assert( i < N );
-                subcheck( a, (long int)i, 0, N );
+                subcheck( a, (long int)i, N );
                 return (Timmed &)a.strides[i];
         }
 
         static inline const Timmed & ?[?]( const arpk( N, S, Timmed, Tbase ) & a, int i ) {
-                //assert( i < N );
-                subcheck( a, (long int)i, 0, N );
+                subcheck( a, (long int)i, N );
                 return (Timmed &)a.strides[i];
         }
 
         static inline Timmed & ?[?]( arpk( N, S, Timmed, Tbase ) & a, unsigned int i ) {
-                //assert( i < N );
-                subcheck( a, (long int)i, 0, N );
+                subchecku( a, (unsigned long int)i, N );
                 return (Timmed &)a.strides[i];
         }
 
         static inline const Timmed & ?[?]( const arpk( N, S, Timmed, Tbase ) & a, unsigned int i ) {
-                //assert( i < N );
-                subcheck( a, (unsigned long int)i, 0, N );
+                subchecku( a, (unsigned long int)i, N );
                 return (Timmed &)a.strides[i];
         }
 
         static inline Timmed & ?[?]( arpk( N, S, Timmed, Tbase ) & a, long int i ) {
-                //assert( i < N );
-                subcheck( a, i, 0, N );
+                subcheck( a, i, N );
                 return (Timmed &)a.strides[i];
         }
 
         static inline const Timmed & ?[?]( const arpk( N, S, Timmed, Tbase ) & a, long int i ) {
-                //assert( i < N );
-                subcheck( a, i, 0, N );
+                subcheck( a, i, N );
                 return (Timmed &)a.strides[i];
         }
 
         static inline Timmed & ?[?]( arpk( N, S, Timmed, Tbase ) & a, unsigned long int i ) {
-                //assert( i < N );
-                subcheck( a, i, 0, N );
+                subchecku( a, i, N );
                 return (Timmed &)a.strides[i];
         }
 
         static inline const Timmed & ?[?]( const arpk( N, S, Timmed, Tbase ) & a, unsigned long int i ) {
-                //assert( i < N );
-                subcheck( a, i, 0, N );
-                return (Timmed &)a.strides[i];
-        }
-
-        static inline size_t ?`len( arpk( N, S, Timmed, Tbase ) & a ) {
+                subchecku( a, i, N );
+                return (Timmed &)a.strides[i];
+        }
+
+        static inline size_t ?`len( arpk( N, S, Timmed, Tbase ) & ) {
                 return N;
         }