Changeset 3eb55f98 for libcfa/src

Timestamp:

Apr 29, 2021, 4:26:37 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

34b2796, 63a4b92

Parents:

c993b15 (diff), 2d8a770 (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:

libcfa/src

Files:

• fstream.cfa (modified) (5 diffs)
• fstream.hfa (modified) (3 diffs)
• iostream.hfa (modified) (3 diffs)

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 27 22:08:57 2021
-// Update Count     : 442
+// Last Modified On : Wed Apr 28 20:37:53 2021
+// Update Count     : 445
 //
 
@@ -114 +114 @@
 } // fail
 
+void clear( ofstream & os ) {
+        clearerr( (FILE *)(os.file$) );
+} // clear
+
 int flush( ofstream & os ) {
         return fflush( (FILE *)(os.file$) );
@@ -207 +211 @@
 } // nl
 
+
 // *********************************** ifstream ***********************************
 
@@ -240 +245 @@
 } // fail
 
+void clear( ifstream & is ) {
+        clearerr( (FILE *)(is.file$) );
+} // clear
+
 void ends( ifstream & is ) {
         if ( is.acquired$ ) { is.acquired$ = false; release( is ); }
 } // ends
 
-int eof( ifstream & is ) {
+bool eof( ifstream & is ) {
         return feof( (FILE *)(is.file$) );
 } // eof
@@ -273 +282 @@
 } // close
 
-ifstream & read( ifstream & is, char * data, size_t size ) {
+ifstream & read( ifstream & is, char data[], size_t size ) {
         if ( fail( is ) ) {
                 abort | IO_MSG "attempt read I/O on failed stream";

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 27 22:00:30 2021
-// Update Count     : 226
+// Last Modified On : Wed Apr 28 20:37:57 2021
+// Update Count     : 230
 //
 
@@ -70 +70 @@
 
 bool fail( ofstream & );
+void clear( ofstream & );
 int flush( ofstream & );
 void open( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
@@ -119 +120 @@
 
 bool fail( ifstream & is );
-int eof( ifstream & is );
+void clear( ifstream & );
+bool eof( ifstream & is );
 void open( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
 void open( ifstream & is, const char name[] );
 void close( ifstream & is );
-ifstream & read( ifstream & is, char * data, size_t size );
+ifstream & read( ifstream & is, char data[], size_t size );
 ifstream & ungetc( ifstream & is, char c );
 

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 27 17:59:21 2021
-// Update Count     : 398
+// Last Modified On : Wed Apr 28 20:37:56 2021
+// Update Count     : 401
 //
 
@@ -52 +52 @@
         
 trait ostream( ostype & | basic_ostream( ostype ) ) {
+        bool fail( ostype & );                                                          // operation failed?
+        void clear( ostype & );
         int flush( ostype & );
-        bool fail( ostype & );                                                          // operation failed?
         void open( ostype &, const char name[], const char mode[] );
         void close( ostype & );
@@ -302 +303 @@
         int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
         istype & ungetc( istype &, char );
-        int eof( istype & );
+        bool eof( istype & );
 }; // basic_istream
 
 trait istream( istype & | basic_istream( istype ) ) {
         bool fail( istype & );
+        void clear( istype & );
         void open( istype & is, const char name[] );
         void close( istype & is );
-        istype & read( istype &, char *, size_t );
+        istype & read( istype &, char [], size_t );
         void acquire( istype & );                                                       // concurrent access
 }; // istream