Changeset 972540e for libcfa/src/iostream.cfa

Timestamp:

Mar 5, 2019, 3:08:55 PM (5 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

61dbb54, b38433b

Parents:

c884f2d (diff), 97a1544 (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/iostream.cfa (modified) (2 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 24 18:33:40 2018
-// Update Count     : 589
+// Last Modified On : Mon Mar  4 20:57:24 2019
+// Update Count     : 593
 //
 
@@ -27 +27 @@
 
 forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, zero_t ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%d", 0n );
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, zero_t z ) {
+                (ostype &)(os | z); nl( os );
+        } // ?|?
+
+        ostype & ?|?( ostype & os, one_t ) {
+                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                fmt( os, "%d", 1n );
+                return os;
+        } // ?|?
+        void ?|?( ostype & os, one_t o ) {
+                (ostype &)(os | o); nl( os );
+        } // ?|?
+
         ostype & ?|?( ostype & os, bool b ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );