Changeset feacef9

Timestamp:

Feb 16, 2021, 1:32:52 PM (4 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:

5407cdc

Parents:

f6664bf2 (diff), d0502a3 (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

Files:

• libcfa/src/bits/containers.hfa (modified) (2 diffs)
• libcfa/src/bits/sequence.hfa (modified) (1 diff)
• libcfa/src/fstream.hfa (modified) (2 diffs)
• tests/includes/.expect/vector-containers.txt (added)
• tests/includes/.expect/vector-fstream.txt (added)
• tests/includes/.expect/vector-sequence.txt (added)
• tests/includes/about.txt (added)
• tests/includes/vector-containers.cfa (added)
• tests/includes/vector-fstream.cfa (added)
• tests/includes/vector-sequence.cfa (added)

libcfa/src/bits/containers.hfa

@@ -151 +151 @@
                 }
 
-                void append( __queue(T) & this, T * val ) with( this ) {
+                void append( __queue(T) & this, T * val ) with(this) {
                         verify(this.tail != 0p);
                         verify(*this.tail == 1p);
@@ -161 +161 @@
                 T * peek( __queue(T) & this ) {
                         verify(*this.tail == 1p);
-                        T * front = this.head;
-                        if( front != 1p ) {
+                        T * frontnode = this.head;
+                        if( frontnode != 1p ) {
                                 verify(*this.tail == 1p);
-                                return front;
+                                return frontnode;
                         }
                         verify(*this.tail == 1p);

libcfa/src/bits/sequence.hfa

@@ -30 +30 @@
         // PUBLIC
 
-        void ?{}( Seqable & sq ) with( sq ) {
+        void ?{}( Seqable & sq ) {
                 ((Colable &)sq){};
-                back = 0p;
+                sq.back = 0p;
         } // post: ! listed()
 

libcfa/src/fstream.hfa

@@ -16 +16 @@
 #pragma once
 
+#include "bits/weakso_locks.hfa"
 #include "iostream.hfa"
 #include <exception.hfa>
@@ -34 +35 @@
         char $separator[sepSize];
         char $tupleSeparator[sepSize];
+//      multiple_acquisition_lock lock;
 }; // ofstream