Changeset c08c3cf for libcfa/src/bits/containers.hfa

Timestamp:

Jan 20, 2021, 8:46:31 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

481cf3a

Parents:

467c8b7 (diff), 9db2c92 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflict

File:

• libcfa/src/bits/containers.hfa (modified) (10 diffs)

libcfa/src/bits/containers.hfa

@@ -23 +23 @@
 
 #ifdef __cforall
-        forall(dtype T)
+        forall(T &)
 #else
         #define T void
@@ -40 +40 @@
 
 #ifdef __cforall
-        // forall(otype T | sized(T))
+        // forall(T | sized(T))
         // static inline void ?{}(__small_array(T) & this) {}
 
-        forall(dtype T | sized(T))
+        forall(T & | sized(T))
         static inline T & ?[?]( __small_array(T) & this, __lock_size_t idx ) {
                 return ((typeof(this.data))this.data)[idx];
         }
 
-        forall(dtype T | sized(T))
+        forall(T & | sized(T))
         static inline T & ?[?]( const __small_array(T) & this, __lock_size_t idx ) {
                 return ((typeof(this.data))this.data)[idx];
         }
 
-        forall(dtype T)
+        forall(T &)
         static inline T * begin( const __small_array(T) & this ) {
                 return ((typeof(this.data))this.data);
         }
 
-        forall(dtype T | sized(T))
+        forall(T & | sized(T))
         static inline T * end( const __small_array(T) & this ) {
                 return ((typeof(this.data))this.data) + this.size;
@@ -69 +69 @@
 
 #ifdef __cforall
-        trait is_node(dtype T) {
+        trait is_node(T &) {
                 T *& get_next( T & );
         };
@@ -78 +78 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE)
+        forall(TYPE &)
         #define T TYPE
 #else
@@ -95 +95 @@
 
 #ifdef __cforall
-        forall(dtype T)
+        forall(T &)
         static inline void ?{}( __stack(T) & this ) {
                 (this.top){ 0p };
         }
 
-        static inline forall( dtype T | is_node(T) ) {
+        static inline forall( T & | is_node(T) ) {
                 void push( __stack(T) & this, T * val ) {
                         verify( !get_next( *val ) );
@@ -126 +126 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE)
+        forall(TYPE &)
         #define T TYPE
 #else
@@ -144 +144 @@
 
 #ifdef __cforall
-        static inline forall( dtype T | is_node(T) ) {
+        static inline forall( T & | is_node(T) ) {
                 void ?{}( __queue(T) & this ) with( this ) {
                         (this.head){ 1p };
@@ -215 +215 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE)
+        forall(TYPE &)
         #define T TYPE
         #define __getter_t * [T * & next, T * & prev] ( T & )
@@ -237 +237 @@
 
 #ifdef __cforall
-        forall(dtype T )
+        forall(T & )
         static inline [void] ?{}( __dllist(T) & this, * [T * & next, T * & prev] ( T & ) __get ) {
                 (this.head){ 0p };
@@ -245 +245 @@
         #define next 0
         #define prev 1
-        static inline forall(dtype T) {
+        static inline forall(T &) {
                 void push_front( __dllist(T) & this, T & node ) with( this ) {
                         verify(__get);