Changeset 8e4aa05 for libcfa/src/bits/sequence.hfa

Timestamp:

Mar 4, 2021, 7:40:25 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:

77d601f

Parents:

342af53 (diff), a5040fe (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) (10 diffs)

libcfa/src/bits/sequence.hfa

@@ +1 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2021 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// bits/sequence.hfa -- PUBLIC
+// Intrusive doubly-linked list
+//
+// Author           : Colby Alexander Parsons & Peter A. Buhr
+// Created On       : Thu Jan 21 19:46:50 2021
+// Last Modified By :
+// Last Modified On :
+// Update Count     :
+//
+
 #pragma once
 
@@ -6 +22 @@
 struct Seqable {
         __cfa_anonymous_object(Colable);
-        struct Seqable * back;                                                                          // pointer to previous node in the list
+        // pointer to previous node in the list
+        struct Seqable * back;
 };
 
@@ -13 +30 @@
         // PUBLIC
 
-        void ?{}( Seqable & sq ) with( sq ) {
+        void ?{}( Seqable & sq ) {
                 ((Colable &)sq){};
-                back = 0p;
+                sq.back = 0p;
         } // post: ! listed()
 
@@ -27 +44 @@
                 return sq->back;
         }
-
-        // // wrappers to make Collection have T
-        // forall( dtype T ) {
-        //      T *& Back( T * n ) {
-        //              return (T *)Back( (Seqable *)n );
-        //      }
-        // } // distribution
 } // distribution
 
@@ -43 +53 @@
 // and the back field of the last node points at the first node (circular).
 
-forall( dtype T | { T *& Back ( T * ); T *& Next ( T * ); } ) {
+forall( T & ) {
         struct Sequence {
-                inline Collection;                                                              // Plan 9 inheritance
+                // Plan 9 inheritance
+                inline Collection;
         };
 
         static inline {
+                void ?{}( Sequence(T) &, const Sequence(T) & ) = void; // no copy
+                Sequence(T) & ?=?( const Sequence(T) & ) = void; // no assignment
+
+                void ?{}( Sequence(T) & s ) with( s ) {
+                        ((Collection &)s){};
+                }       // post: isEmpty()
+        }
+
+        static inline forall(| { T *& Back ( T * ); T *& Next ( T * ); }) {
                 // wrappers to make Collection have T
                 T & head( Sequence(T) & s ) with( s ) {
                         return *(T *)head( (Collection &)s );
                 } // post: empty() & head() == 0 | !empty() & head() in *s
-
-                void ?{}( Sequence(T) &, const Sequence(T) & ) = void; // no copy
-                Sequence(T) & ?=?( const Sequence(T) & ) = void; // no assignment
-
-                void ?{}( Sequence(T) & s ) with( s ) { 
-                        ((Collection &)s){};
-                }       // post: isEmpty()
 
                 // Return a pointer to the last sequence element, without removing it.
@@ -145 +158 @@
                         return n;
                 } // post: n->listed() & *n in *s & succ(n) == bef
-                
+
                 // pre: n->listed() & *n in *s
                 T & remove( Sequence(T) & s, T & n ) with( s ) { // O(1)
@@ -231 +244 @@
 } // distribution
 
-forall( dtype T | { T *& Back ( T * ); T *& Next ( T * ); } ) {
+forall( T & | { T *& Back ( T * ); T *& Next ( T * ); } ) {
         // SeqIter(T) is used to iterate over a Sequence(T) in head-to-tail order.
         struct SeqIter {
@@ -285 +298 @@
 
         static inline {
-                void ?{}( SeqIterRev(T) & si ) with( si ) {     
+                void ?{}( SeqIterRev(T) & si ) with( si ) {
                         ((ColIter &)si){};
                         seq = 0p;
@@ -291 +304 @@
 
                 // Create a iterator active in sequence s.
-                void ?{}( SeqIterRev(T) & si, Sequence(T) & s ) with( si ) {    
+                void ?{}( SeqIterRev(T) & si, Sequence(T) & s ) with( si ) {
                         ((ColIter &)si){};
                         seq = &s;
@@ -297 +310 @@
                 } // post: elts = null
 
-                void ?{}( SeqIterRev(T) & si, Sequence(T) & s, T & start ) with( si ) { 
+                void ?{}( SeqIterRev(T) & si, Sequence(T) & s, T & start ) with( si ) {
                         ((ColIter &)si){};
                         seq = &s;