Changeset 65deb18 for src/libcfa/bits/containers.h

Timestamp:

Jan 30, 2018, 3:52:42 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f792cb8

Parents:

5b51f5e

Message:

Kernel now properly uses with statments

File:

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

src/libcfa/bits/containers.h

@@ -140 +140 @@
 
 #ifdef __cforall
+
         forall(dtype T | is_node(T))
-        static inline void ?{}( __queue(T) & this ) {
-                (this.head){ NULL };
-                (this.tail){ &this.head };
+        static inline void ?{}( __queue(T) & this ) with( this ) {
+                head{ NULL };
+                tail{ &head };
         }
 
         forall(dtype T | is_node(T) | sized(T))
-        static inline void append( __queue(T) & this, T * val ) {
-                verify(this.tail != NULL);
-                *this.tail = val;
-                this.tail = &get_next( *val );
+        static inline void append( __queue(T) & this, T * val ) with( this ) {
+                verify(tail != NULL);
+                *tail = val;
+                tail = &get_next( *val );
         }
 
@@ -167 +168 @@
 
         forall(dtype T | is_node(T) | sized(T))
-        static inline T * remove( __queue(T) & this, T ** it ) {
+        static inline T * remove( __queue(T) & this, T ** it ) with( this ) {
                 T * val = *it;
                 verify( val );
@@ -173 +174 @@
                 (*it) = get_next( *val );
 
-                if( this.tail == &get_next( *val ) ) {
-                        this.tail = it;
+                if( tail == &get_next( *val ) ) {
+                        tail = it;
                 }
 
                 get_next( *val ) = NULL;
 
-                verify( (this.head == NULL) == (&this.head == this.tail) );
-                verify( *this.tail == NULL );
+                verify( (head == NULL) == (&head == tail) );
+                verify( *tail == NULL );
                 return val;
         }
 #endif
+
+//-----------------------------------------------------------------------------
+// Tools
+//-----------------------------------------------------------------------------
+#ifdef __cforall
+
+#endif