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

Timestamp:

Dec 17, 2020, 4:18:23 PM (5 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:

089b1a9a, 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/sequence.hfa (modified) (7 diffs)

libcfa/src/bits/sequence.hfa

@@ -2 +2 @@
 
 #include "bits/collection.hfa"
+#include "bits/defs.hfa"
 
 struct Seqable {
-        inline Colable;
-        Seqable * back;                                                                         // pointer to previous node in the list
+        __cfa_anonymous_object(Colable);
+        struct Seqable * back;                                                                          // pointer to previous node in the list
 };
 
-inline {
+#ifdef __cforall
+static inline {
         // PUBLIC
 
@@ -26 +28 @@
         }
 
-        // wrappers to make Collection have T
-        forall( dtype T ) {
-                T *& Back( T * n ) {
-                        return (T *)Back( (Seqable *)n );
-                }
-        } // distribution
+        // // wrappers to make Collection have T
+        // forall( dtype T ) {
+        //      T *& Back( T * n ) {
+        //              return (T *)Back( (Seqable *)n );
+        //      }
+        // } // distribution
 } // distribution
 
-forall( dtype T ) {
+forall( dtype T | { T *& Back ( T * ); T *& Next ( T * ); } ) {
         struct Sequence {
                 inline Collection;                                                              // Plan 9 inheritance
         };
 
-        inline {
+        static inline {
                 // wrappers to make Collection have T
                 T & head( Sequence(T) & s ) with( s ) {
@@ -184 +186 @@
                                 T * toEnd = Back( &head( s ) );
                                 T * fromEnd = Back( &head( from ) );
-                                Back( root ) = fromEnd;
+                                Back( (T *)root ) = fromEnd;
                                 Next( fromEnd ) = &head( s );
-                                Back( from.root ) = toEnd;
+                                Back( (T *)from.root ) = toEnd;
                                 Next( toEnd ) = &head( from );
                         } // if
@@ -214 +216 @@
 } // distribution
 
-forall( dtype T ) {
+forall( dtype T | { T *& Back ( T * ); T *& Next ( T * ); } ) {
         // SeqIter(T) is used to iterate over a Sequence(T) in head-to-tail order.
         struct SeqIter {
@@ -224 +226 @@
         };
 
-        inline {
+        static inline {
                 void ?{}( SeqIter(T) & si ) with( si ) {
                         ((ColIter &)si){};
@@ -265 +267 @@
         };
 
-        inline {
+        static inline {
                 void ?{}( SeqIterRev(T) & si ) with( si ) {     
                         ((ColIter &)si){};
@@ -298 +300 @@
         } // distribution
 } // distribution
+
+#endif