Changeset accc5dbb

Timestamp:

Dec 16, 2020, 4:01:15 PM (4 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

b3c8496

Parents:

8a81b09

Message:

updated other collections to match changes to sequence.hfa

Location:

libcfa/src/bits

Files:

• collection.hfa (modified) (1 diff)
• queue.hfa (modified) (3 diffs)
• stack.hfa (modified) (3 diffs)

libcfa/src/bits/collection.hfa

@@ -37 +37 @@
 
         //      bool listed( T * n ) {
-        //              fprintf(stderr, "inappropriate listed used");
         //              return Next( (Colable *)n ) != 0p;
         //      }

libcfa/src/bits/queue.hfa

@@ -3 +3 @@
 #include "bits/collection.hfa"
 
-forall( dtype T ) {
+forall( dtype T | { T *& Next ( T * ); bool listed ( T * ); } ) {
         struct Queue {
                 inline Collection;                                                              // Plan 9 inheritance
@@ -64 +64 @@
                         T & t = head( q );
                         if ( root ) {
-                                root = Next( root );
+                                root = Next( (T *)root );
                                 if ( &head( q ) == &t ) {
                                         root = last = 0p;                                       // only one element
@@ -142 +142 @@
 } // distribution
 
-forall( dtype T ) {
+forall( dtype T | { T *& Next ( T * ); bool listed ( T * ); } ) {
         struct QueueIter {
                 inline ColIter;                                                                 // Plan 9 inheritance

libcfa/src/bits/stack.hfa

@@ -3 +3 @@
 #include "bits/collection.hfa"
 
-forall( dtype T ) {
+forall( dtype T | { T *& Next ( T * ); bool listed ( T * ); } ) {
         struct Stack {
                 inline Collection;                                                              // Plan 9 inheritance
@@ -44 +44 @@
                         T & t = head( s );
                         if ( root ) {
-                                root = ( T *)Next( root );
+                                root = ( T *)Next( (T *)root );
                                 if ( &head( s ) == &t ) root = 0p;              // only one element ?
                                 Next( &t ) = 0p;
@@ -58 +58 @@
 
 
-forall( dtype T ) {
+forall( dtype T | { T *& Next ( T * ); bool listed ( T * ); } ) {
         struct StackIter {
                 inline ColIter;                                                                 // Plan 9 inheritance