Changeset feacef9


Ignore:
Timestamp:
Feb 16, 2021, 1:32:52 PM (7 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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:
7 added
3 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/bits/containers.hfa

    rf6664bf2 rfeacef9  
    151151                }
    152152
    153                 void append( __queue(T) & this, T * val ) with( this ) {
     153                void append( __queue(T) & this, T * val ) with(this) {
    154154                        verify(this.tail != 0p);
    155155                        verify(*this.tail == 1p);
     
    161161                T * peek( __queue(T) & this ) {
    162162                        verify(*this.tail == 1p);
    163                         T * front = this.head;
    164                         if( front != 1p ) {
     163                        T * frontnode = this.head;
     164                        if( frontnode != 1p ) {
    165165                                verify(*this.tail == 1p);
    166                                 return front;
     166                                return frontnode;
    167167                        }
    168168                        verify(*this.tail == 1p);
  • libcfa/src/bits/sequence.hfa

    rf6664bf2 rfeacef9  
    3030        // PUBLIC
    3131
    32         void ?{}( Seqable & sq ) with( sq ) {
     32        void ?{}( Seqable & sq ) {
    3333                ((Colable &)sq){};
    34                 back = 0p;
     34                sq.back = 0p;
    3535        } // post: ! listed()
    3636
  • libcfa/src/fstream.hfa

    rf6664bf2 rfeacef9  
    1616#pragma once
    1717
     18#include "bits/weakso_locks.hfa"
    1819#include "iostream.hfa"
    1920#include <exception.hfa>
     
    3435        char $separator[sepSize];
    3536        char $tupleSeparator[sepSize];
     37//      multiple_acquisition_lock lock;
    3638}; // ofstream
    3739
Note: See TracChangeset for help on using the changeset viewer.