Changeset fe1b6a4 for src/libcfa

Timestamp:

Mar 23, 2017, 5:20:33 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

231f01c, f20dffa

Parents:

1ca52db (diff), 578b637 (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

Location:

src/libcfa

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• fstream.c (modified) (4 diffs)
• iostream.c (modified) (3 diffs)

src/libcfa/Makefile.am

@@ -35 +35 @@
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
 
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 
 AM_CCASFLAGS = @CFA_FLAGS@

src/libcfa/Makefile.in

@@ -305 +305 @@
 AUTOMAKE_OPTIONS = subdir-objects
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
-EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = limits stdlib math iostream fstream iterator rational assert \

src/libcfa/fstream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 16:17:21 2017
-// Update Count     : 221
+// Last Modified On : Thu Mar 23 08:20:41 2017
+// Update Count     : 226
 //
 
@@ -29 +29 @@
 #define IO_MSG "I/O error: "
 
+void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
+        this->file = file;
+        this->sepDefault = sepDefault;
+        this->sepOnOff = sepOnOff;
+        sepSet( this, separator );
+        sepSetCur( this, sepGet( this ) );
+        sepSetTuple( this, tupleSeparator );
+}
+
 _Bool sepPrt( ofstream * os ) { return os->sepOnOff; }
 void sepOn( ofstream * os ) { os->sepOnOff = 1; }
@@ -83 +92 @@
                 exit( EXIT_FAILURE );
         } // if
-        os->file = file;
-        sepOff( os );
-        sepSet( os, " " );
+        ?{}( os, file, 1, 0, " ", ", " );
 } // open
 
@@ -125 +132 @@
 } // fmt
 
-void ?{}( ofstream * this, void * file, _Bool sepDefault, _Bool sepOnOff, const char * separator, const char * tupleSeparator ) {
-        this->file = file;
-        this->sepDefault = sepDefault;
-        this->sepOnOff = sepOnOff;
-        sepSet( this, separator );
-        sepSetCur( this, sepGet( this ) );
-        sepSetTuple( this, tupleSeparator );
-}
-
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_), 1, 0, " ", ", " };
 ofstream *sout = &soutFile;

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 22 17:46:06 2017
-// Update Count     : 359
+// Last Modified On : Thu Mar 23 08:20:40 2017
+// Update Count     : 367
 //
 
@@ -201 +201 @@
 forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
 ostype * ?|?( ostype * os, T arg, Params rest ) {
-        forall( ttype Params ) ostype * prtTuple( T arg, Params rest ) {
-                os | arg;                                                                               // print first argument
-                os | rest;                                                                              // print remaining arguments
-                return os;
-        } // prtTuple
         sepSetCur( os, sepGetTuple( os ) );                                     // switch to tuple separator
-        prtTuple( arg, rest );                                                          // recursively print tuple
+        os | arg;                                                                                       // print first argument
+        os | rest;                                                                                      // print remaining arguments
         sepSetCur( os, sepGet( os ) );                                          // switch to regular separator
         return os;
@@ -223 +219 @@
         os | '\n';
         flush( os );
-        sepOff( os );
+        sepOff( os );                                                                           // prepare for next line
         return os;
 } // endl