Changes in libcfa/src/bits/collection.hfa [9536761:58870e6b]

File:

• libcfa/src/bits/collection.hfa (modified) (5 diffs)

libcfa/src/bits/collection.hfa

@@ -1 +1 @@
 #pragma once
-#include <stdio.h> // REMOVE THIS AFTER DEBUGGING
-
 
 struct Colable {
-        struct Colable * next;                                                                          // next node in the list
+        Colable * next;                                                                         // next node in the list
         // invariant: (next != 0) <=> listed()
 };
-#ifdef __cforall
-static inline {
+
+inline {
         // PUBLIC
 
@@ -30 +28 @@
         }
 
-        // // wrappers to make Collection have T
-        // forall( dtype T ) {
-        //      T *& Next( T * n ) {
-        //              return (T *)Next( (Colable *)n );
-        //      }
-        // } // distribution
+        // wrappers to make Collection have T
+        forall( dtype T ) {
+                T *& Next( T * n ) {
+                        return (T *)Next( (Colable *)n );
+                }
+
+                bool listed( T * n ) {
+                        return Next( (Colable *)n ) != 0p;
+                }
+        } // distribution
 } // distribution
 
-forall( dtype T | { T *& Next ( T * ); } ) {
-        bool listed( T * n ) {
-                return Next( n ) != 0p;
-        }
-}
 
 struct Collection {
@@ -48 +45 @@
 };
 
-static inline {
+inline {
         // class invariant: root == 0 & empty() | *root in *this
         void ?{}( Collection &, const Collection & ) = void; // no copy
@@ -68 +65 @@
 
 struct ColIter {
-        void * curr;                                                                            // element returned by |
+        void * curr;                                                                            // element to be returned by >>
 };
 
-static inline {
+inline {
         void ?{}( ColIter & colIter ) with( colIter ) {
                 curr = 0p;
@@ -82 +79 @@
         } // distribution
 } // distribution
-#endif