Changeset 17a1b21

Timestamp:

Mar 5, 2019, 8:45:24 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

ca0f061f

Parents:

0050a5f

Message:

add printing and testing for zero_t and one_t

Files:

• libcfa/src/iostream.cfa (modified) (2 diffs)
• libcfa/src/iostream.hfa (modified) (2 diffs)
• tests/.expect/io1.txt (modified) (1 diff)
• tests/io1.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 ) );

libcfa/src/iostream.hfa

@@ -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     : 220
+// Last Modified On : Tue Feb 26 16:57:22 2019
+// Update Count     : 221
 //
 
@@ -62 +62 @@
 
 forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype &, zero_t );
+        void ?|?( ostype &, zero_t );
+        ostype & ?|?( ostype &, one_t );
+        void ?|?( ostype &, one_t );
+
         ostype & ?|?( ostype &, bool );
         void ?|?( ostype &, bool );

tests/.expect/io1.txt

@@ -1 +1 @@
 9 6 28 0 7 1 2
-1 2 3
-123
-123
+0 1 2 3
+0123
+0123
 
 opening delimiters

tests/io1.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 21 16:02:55 2018
-// Update Count     : 114
+// Last Modified On : Mon Mar  4 21:42:47 2019
+// Update Count     : 115
 //
 
@@ -19 +19 @@
         int x = 3, y = 5, z = 7;
         sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
-        sout | 1 | 2 | 3;
-        sout | '1' | '2' | '3';
-        sout | 1 | "" | 2 | "" | 3;
+        sout | 0 | 1 | 2 | 3;
+        sout | '0' | '1' | '2' | '3';
+        sout | 0 | "" | 1 | "" | 2 | "" | 3;
         sout | nl;