Changes in src/libcfa/bits/containers.h [705e612:14a61b5]

File:

• src/libcfa/bits/containers.h (modified) (2 diffs)

src/libcfa/bits/containers.h

@@ -191 +191 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE | sized(TYPE))
+        trait is_db_node(dtype T) {
+                T*& get_next( T& );
+                T*& get_prev( T& );
+        };
+#endif
+
+#ifdef __cforall
+        forall(dtype TYPE | is_db_node(TYPE))
         #define T TYPE
-        #define __getter_t * [T * & next, T * & prev] ( T & )
-#else
-        typedef void (*__generit_c_getter_t)();
-        #define T void
-        #define __getter_t __generit_c_getter_t
+#else
+        #define T void
 #endif
 struct __dllist {
         T * head;
-        __getter_t __get;
-};
-#undef T
-#undef __getter_t
+};
+#undef T
 
 #ifdef __cforall
@@ -214 +216 @@
 #ifdef __cforall
 
-        forall(dtype T | sized(T))
-        static inline [void] ?{}( __dllist(T) & this, * [T * & next, T * & prev] ( T & ) __get ) {
-                this.head{ NULL };
-                this.__get = __get;
-        }
-
-        #define _next .0
-        #define _prev .1
-        forall(dtype T | sized(T))
-        static inline void push_front( __dllist(T) & this, T & node ) with( this ) {
-                if ( head ) {
-                        __get( node )_next = head;
-                        __get( node )_prev = __get( *head )_prev;
-                        // inserted node must be consistent before it is seen
-                        // prevent code movement across barrier
-                        asm( "" : : : "memory" );
-                        __get( *head )_prev = &node;
-                        T & prev = *__get( node )_prev;
-                        __get( prev )_next = &node;
-                }
-                else {
-                        __get( node )_next = &node;
-                        __get( node )_prev = &node;
-                }
-
-                // prevent code movement across barrier
-                asm( "" : : : "memory" );
-                head = &node;
-        }
-
-        forall(dtype T | sized(T))
-        static inline void remove( __dllist(T) & this, T & node ) with( this ) {
-                if ( &node == head ) {
-                        if ( __get( *head )_next == head ) {
-                                head = NULL;
-                        }
-                        else {
-                                head = __get( *head )_next;
-                        }
-                }
-                __get( *__get( node )_next )_prev = __get( node )_prev;
-                __get( *__get( node )_prev )_next = __get( node )_next;
-                __get( node )_next = NULL;
-                __get( node )_prev = NULL;
-        }
-        #undef _next
-        #undef _prev
+        forall(dtype T | is_db_node(T))
+        static inline void ?{}( __dllist(T) & this ) with( this ) {
+                head{ NULL };
+        }
+
+        // forall(dtype T | is_db_node(T) | sized(T))
+        // static inline void push_front( __dllist(T) & this, T & node ) with( this ) {
+        //      if ( head ) {
+        //              get_next( node ) = head;
+        //              get_prev( node ) = get_prev( *head );
+        //              // inserted node must be consistent before it is seen
+        //              // prevent code movement across barrier
+        //              asm( "" : : : "memory" );
+        //              get_prev( *head ) = node;
+        //              T & prev = *get_prev( node );
+        //              get_next( prev ) = node;
+        //      }
+        //      else {
+        //              get_next( node ) = &node;
+        //              get_prev( node ) = &node;
+        //      }
+
+        //      // prevent code movement across barrier
+        //      asm( "" : : : "memory" );
+        //      head = val;
+        // }
+
+        // forall(dtype T | is_db_node(T) | sized(T))
+        // static inline T * remove( __dllist(T) & this, T & node ) with( this ) {
+        //      if ( &node == head ) {
+        //              if ( get_next( *head ) == head ) {
+        //                      head = NULL;
+        //              }
+        //              else {
+        //                      head = get_next( *head );
+        //              }
+        //      }
+        //      get_prev( *get_next( node ) ) = get_prev( node );
+        //      get_next( *get_prev( node ) ) = get_next( node );
+        //      get_next( node ) = NULL;
+        //      get_prev( node ) = NULL;
+        // }
 #endif