Changeset cdbab55 for libcfa/src/iostream.cfa

Timestamp:

Aug 21, 2018, 2:24:29 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6af (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:/u/cforall/software/cfa/cfa-cc

File:

• libcfa/src/iostream.cfa (moved) (moved from src/libcfa/iostream.c ) (4 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 : Sat Jun  2 08:24:56 2018
-// Update Count     : 471
+// Last Modified On : Sat Aug 11 13:56:43 2018
+// Update Count     : 473
 //
 
-#include "iostream"
+#include "iostream.hfa"
 
 extern "C" {
@@ -27 +27 @@
 
 forall( dtype ostype | ostream( ostype ) ) {
-        ostype & ?|?( ostype & os, _Bool b ) {
+        ostype & ?|?( ostype & os, bool b ) {
                 if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
                 fmt( os, "%s", b ? "true" : "false" );
@@ -275 +275 @@
 
 forall( dtype istype | istream( istype ) ) {
-        istype & ?|?( istype & is, _Bool & b ) {
+        istype & ?|?( istype & is, bool & b ) {
                 char val[6];
                 fmt( is, "%5s", val );
@@ -281 +281 @@
                 else if ( strcmp( val, "false" ) == 0 ) b = false;
                 else {
-                        fprintf( stderr, "invalid _Bool constant\n" );
+                        fprintf( stderr, "invalid Boolean constant\n" );
                         abort();
                 } // if