Changes in libcfa/src/bits/containers.hfa [8b73526:768bd556]

File:

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

libcfa/src/bits/containers.hfa

@@ -17 +17 @@
 #include "bits/align.hfa"
 #include "bits/defs.hfa"
-#include <stdio.h>
+
 //-----------------------------------------------------------------------------
 // Array
@@ -36 +36 @@
         #define __small_array_t(T) __small_array(T)
 #else
-        #define __small_array_t(T) __small_array
+        #define __small_array_t(T) struct __small_array
 #endif
 
@@ -146 +146 @@
         static inline forall( dtype T | is_node(T) ) {
                 void ?{}( __queue(T) & this ) with( this ) {
-                        (this.head){ 1p };
-                        (this.tail){ &this.head };
-                        verify(*this.tail == 1p);
+                        head{ 0p };
+                        tail{ &head };
                 }
 
                 void append( __queue(T) & this, T * val ) with( this ) {
-                        verify(this.tail != 0p);
-                        verify(*this.tail == 1p);
-                        *this.tail = val;
-                        this.tail = &get_next( *val );
-                        *this.tail = 1p;
-                }
-
-                T * peek( __queue(T) & this ) {
-                        verify(*this.tail == 1p);
-                        T * front = this.head;
-                        if( front != 1p ) {
-                                verify(*this.tail == 1p);
-                                return front;
-                        }
-                        verify(*this.tail == 1p);
-                        return 0p;
+                        verify(tail != 0p);
+                        *tail = val;
+                        tail = &get_next( *val );
                 }
 
                 T * pop_head( __queue(T) & this ) {
-                        verify(*this.tail == 1p);
-                        T * _head = this.head;
-                        if( _head != 1p ) {
-                                this.head = get_next( *_head );
-                                if( get_next( *_head ) == 1p ) {
+                        T * head = this.head;
+                        if( head ) {
+                                this.head = get_next( *head );
+                                if( !get_next( *head ) ) {
                                         this.tail = &this.head;
                                 }
-                                get_next( *_head ) = 0p;
-                                verify(*this.tail == 1p);
-                                verify( get_next(*_head) == 0p );
-                                return _head;
-                        }
-                        verify(*this.tail == 1p);
-                        return 0p;
+                                get_next( *head ) = 0p;
+                        }
+                        return head;
                 }
 
@@ -193 +174 @@
                         (*it) = get_next( *val );
 
-                        if( this.tail == &get_next( *val ) ) {
-                                this.tail = it;
+                        if( tail == &get_next( *val ) ) {
+                                tail = it;
                         }
 
                         get_next( *val ) = 0p;
 
-                        verify( (this.head == 1p) == (&this.head == this.tail) );
-                        verify( *this.tail == 1p );
+                        verify( (head == 0p) == (&head == tail) );
+                        verify( *tail == 0p );
                         return val;
                 }
 
                 int ?!=?( const __queue(T) & this, __attribute__((unused)) zero_t zero ) {
-                        return this.head != 1p;
+                        return this.head != 0;
                 }
         }
@@ -239 +220 @@
         forall(dtype T )
         static inline [void] ?{}( __dllist(T) & this, * [T * & next, T * & prev] ( T & ) __get ) {
-                (this.head){ 0p };
+                this.head{ 0p };
                 this.__get = __get;
         }
@@ -248 +229 @@
                 void push_front( __dllist(T) & this, T & node ) with( this ) {
                         verify(__get);
-                        if ( this.head ) {
-                                __get( node ).next = this.head;
-                                __get( node ).prev = __get( *this.head ).prev;
+                        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( *this.head ).prev = &node;
+                                __get( *head ).prev = &node;
                                 T & _prev = *__get( node ).prev;
                                 __get( _prev ).next = &node;
@@ -264 +245 @@
                         // prevent code movement across barrier
                         asm( "" : : : "memory" );
-                        this.head = &node;
+                        head = &node;
                 }
 
                 void remove( __dllist(T) & this, T & node ) with( this ) {
                         verify(__get);
-                        if ( &node == this.head ) {
-                                if ( __get( *this.head ).next == this.head ) {
-                                        this.head = 0p;
+                        if ( &node == head ) {
+                                if ( __get( *head ).next == head ) {
+                                        head = 0p;
                                 } else {
-                                        this.head = __get( *this.head ).next;
+                                        head = __get( *head ).next;
                                 }
                         }
@@ -285 +266 @@
                         return this.head != 0;
                 }
-
-                void move_to_front( __dllist(T) & src, __dllist(T) & dst, T & node ) {
-                        remove    (src, node);
-                        push_front(dst, node);
-                }
         }
         #undef next