Changeset 41cde266 for libcfa/src/bits/collection.hfa

Timestamp:

Dec 17, 2020, 4:18:23 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

089b1a9, f4f79dd

Parents:

c5a98f3 (diff), 68a867ee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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 {
-        Colable * next;                                                                         // next node in the list
+        struct Colable * next;                                                                          // next node in the list
         // invariant: (next != 0) <=> listed()
 };
-
-inline {
+#ifdef __cforall
+static inline {
         // PUBLIC
 
@@ -28 +30 @@
         }
 
-        // 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
+        // // wrappers to make Collection have T
+        // forall( dtype T ) {
+        //      T *& Next( T * n ) {
+        //              return (T *)Next( (Colable *)n );
+        //      }
+        // } // distribution
 } // distribution
 
+forall( dtype T | { T *& Next ( T * ); } ) {
+        bool listed( T * n ) {
+                return Next( n ) != 0p;
+        }
+}
 
 struct Collection {
@@ -45 +48 @@
 };
 
-inline {
+static inline {
         // class invariant: root == 0 & empty() | *root in *this
         void ?{}( Collection &, const Collection & ) = void; // no copy
@@ -68 +71 @@
 };
 
-inline {
+static inline {
         void ?{}( ColIter & colIter ) with( colIter ) {
                 curr = 0p;
@@ -79 +82 @@
         } // distribution
 } // distribution
+#endif