Changes in libcfa/src/containers/list.hfa [7ee3c87:fd54fef]

File:

• libcfa/src/containers/list.hfa (modified) (9 diffs)

libcfa/src/containers/list.hfa

@@ -83 +83 @@
                 (this.is_terminator){ 1 };
         }
-        static inline void ?=?( $mgd_link(tE) &this, tE* elem ) {
-                this.elem = elem ;
-                this.terminator = 0p;
-                this.is_terminator = 0;
-        }
-        static inline void ?=?( $mgd_link(tE) &this, void * terminator ) {
-                this.elem = 0p;
-                this.terminator = terminator;
-                this.is_terminator = 1;
+        forall ( tInit | { void ?{}( $mgd_link(tE) &, tInit); } )
+        static inline void ?=?( $mgd_link(tE) &this, tInit i ) {
+                ^?{}( this );
+                ?{}( this, i );
         }
         struct $dlinks {
@@ -186 +181 @@
 
         static inline void insert_after(Tnode &list_pos, Telem &to_insert) {
-                verify (&list_pos != 0p);
-                verify (&to_insert != 0p);
+                assert (&list_pos != 0p);
+                assert (&to_insert != 0p);
                 Tnode &singleton_to_insert = $tempcv_e2n(to_insert);
-                verify($prev_link(singleton_to_insert).elem == 0p);
-                verify($next_link(singleton_to_insert).elem == 0p);
+                assert($prev_link(singleton_to_insert).elem == 0p);
+                assert($next_link(singleton_to_insert).elem == 0p);
                 $prev_link(singleton_to_insert) = & $tempcv_n2e(list_pos);
                 $next_link(singleton_to_insert) = $next_link(list_pos);
@@ -209 +204 @@
 
         static inline void insert_before(Tnode &list_pos, Telem &to_insert) {
-                verify (&list_pos != 0p);
-                verify (&to_insert != 0p);
+                assert (&list_pos != 0p);
+                assert (&to_insert != 0p);
                 Tnode &singleton_to_insert = $tempcv_e2n(to_insert);
-                verify($prev_link(singleton_to_insert).elem == 0p);
-                verify($next_link(singleton_to_insert).elem == 0p);
+                assert($prev_link(singleton_to_insert).elem == 0p);
+                assert($next_link(singleton_to_insert).elem == 0p);
                 $next_link(singleton_to_insert) = & $tempcv_n2e(list_pos);
                 $prev_link(singleton_to_insert) = $prev_link(list_pos);
@@ -232 +227 @@
 
     static inline void insert_first(dlist(Tnode, Telem) &list, Telem &to_insert) {
-                verify (&list != 0p);
-                verify (&to_insert != 0p);
+                assert (&list != 0p);
+                assert (&to_insert != 0p);
                 Tnode &singleton_to_insert = $tempcv_e2n(to_insert);
-                verify($prev_link(singleton_to_insert).elem == 0p);
-                verify($next_link(singleton_to_insert).elem == 0p);
+                assert($prev_link(singleton_to_insert).elem == 0p);
+                assert($next_link(singleton_to_insert).elem == 0p);
 
                 $prev_link(singleton_to_insert) = (void*) &list;
@@ -254 +249 @@
 
     static inline void insert_last(dlist(Tnode, Telem) &list, Telem &to_insert) {
-                verify (&list != 0p);
-                verify (&to_insert != 0p);
+                assert (&list != 0p);
+                assert (&to_insert != 0p);
                 Tnode &singleton_to_insert = $tempcv_e2n(to_insert);
-                verify($next_link(singleton_to_insert).elem == 0p);
-                verify($prev_link(singleton_to_insert).elem == 0p);
+                assert($next_link(singleton_to_insert).elem == 0p);
+                assert($prev_link(singleton_to_insert).elem == 0p);
 
                 $next_link(singleton_to_insert) = (void*) &list;
@@ -276 +271 @@
 
     static inline void remove(Tnode &list_pos) {
-                verify( &list_pos != 0p );
+                assert( &list_pos != 0p );
 
                 $mgd_link(Telem) &incoming_from_prev = *0p;
@@ -313 +308 @@
 
         static inline bool ?`is_empty(dlist(Tnode, Telem) &list) {
-                verify( &list != 0p );
+                assert( &list != 0p );
                 $dlinks(Telem) *listLinks = & list.$links;
                 if (listLinks->next.is_terminator) {
-                        verify(listLinks->prev.is_terminator);
-                        verify(listLinks->next.terminator);
-                        verify(listLinks->prev.terminator);
+                        assert(listLinks->prev.is_terminator);
+                        assert(listLinks->next.terminator);
+                        assert(listLinks->prev.terminator);
                         return true;
                 } else {
-                        verify(!listLinks->prev.is_terminator);
-                        verify(listLinks->next.elem);
-                        verify(listLinks->prev.elem);
+                        assert(!listLinks->prev.is_terminator);
+                        assert(listLinks->next.elem);
+                        assert(listLinks->prev.elem);
                         return false;
                 }
@@ -329 +324 @@
 
         static inline Telem & pop_first(dlist(Tnode, Telem) &list) {
-                verify( &list != 0p );
-                verify( !list`is_empty );
+                assert( &list != 0p );
+                assert( !list`is_empty );
                 $dlinks(Telem) *listLinks = & list.$links;
                 Telem & first = *listLinks->next.elem;
@@ -339 +334 @@
 
         static inline Telem & pop_last(dlist(Tnode, Telem) &list) {
-                verify( &list != 0p );
-                verify( !list`is_empty );
+                assert( &list != 0p );
+                assert( !list`is_empty );
                 $dlinks(Telem) *listLinks = & list.$links;
                 Telem & last = *listLinks->prev.elem;