Changeset 2b4daf2 for tests/collections/multi_list.cfa

Timestamp:

Jan 7, 2021, 5:06:22 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:

5ad381b

Parents:

42f6e07 (diff), 58fe85a (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:

• tests/collections/multi_list.cfa (moved) (moved from tests/multi_list.cfa ) (4 diffs)

tests/collections/multi_list.cfa

@@ -19 +19 @@
 }
 
+TaskDL *& Back( TaskDL * n ) {
+        return (TaskDL *)Back( (Seqable *)n );
+}
+
+TaskDL *& Next( TaskDL * n ) {
+        return (TaskDL *)Next( (Colable *)n );
+}
+
 struct TaskSL {
         inline Colable;
@@ -29 +37 @@
 Task & task( TaskSL & this ) with( this ) {                             // getter routine for containing node
         return node;
+}
+
+TaskSL *& Next( TaskSL * n ) {
+        return (TaskSL *)Next( (Colable *)n );
 }
 
@@ -61 +73 @@
 
         sout | nlOff;
-        for ( over( sqiter, clustList ); sqiter >> dl; ) {      // print lists
+        for ( over( sqiter, clustList ); sqiter | dl; ) {       // print lists
                 Task & tmp = task( dl ); sout | tmp.id;
                 // sout | task( dl ).id;
         }
         sout | nl;
-        for ( over( sqiter, readyList ); sqiter >> dl; ) {
+        for ( over( sqiter, readyList ); sqiter | dl; ) {
                 Task & tmp = task( dl ); sout | tmp.id;
                 // sout | task( dl ).id;
         }
         sout | nl;
-        for ( QueueIter(TaskSL) qiter = { mutexList }; qiter >> sl; ) { // print lists
+        for ( QueueIter(TaskSL) qiter = { mutexList }; qiter | sl; ) {  // print lists
                 Task & tmp = task( sl ); sout | tmp.id;
                 // sout | task( sl ).id;
@@ -91 +103 @@
                 push( mutexStack, task.clusterRef );                    // insert on lists in opposite directions
         }
-        for ( StackIter(TaskDL) stiter = { mutexStack }; stiter >> dl; ) {
+        for ( StackIter(TaskDL) stiter = { mutexStack }; stiter | dl; ) {
                 Task & tmp = task( dl ); sout | tmp.id;
                 // sout | task( dl ).id;