Changeset 39eb23b0 for libcfa/src

Timestamp:

Jan 14, 2026, 9:21:02 PM (2 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

a2940184

Parents:

4904b05

Message:

for opening a file, change to default initialization of mode parameter from overloaded functions; fix fstream initialization bug by calling default constructor in other constructors

Location:

libcfa/src

Files:

• fstream.cfa (modified) (7 diffs)
• fstream.hfa (modified) (4 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 : Mon Apr 14 20:41:51 2025
-// Update Count     : 583
+// Last Modified On : Wed Jan 14 21:12:05 2026
+// Update Count     : 596
 //
 
@@ -63 +63 @@
 // public
 void ?{}( ofstream & os ) { os.file$ = 0p; }
-void ?{}( ofstream & os, const char name[], const char mode[] ) { open( os, name, mode ); }
-void ?{}( ofstream & os, const char name[] ) { open( os, name, "w" ); }
+void ?{}( ofstream & os, const char name[], const char mode[] ) { os{}; open( os, name, mode ); }
 void ^?{}( ofstream & os ) { close( os ); }
 
@@ -124 +123 @@
                 // abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
         } // if
-        (os){ file };                                                                           // initialize
+        os{ file };                                                                                     // initialize
 } // open
 
-void open( ofstream & os, const char name[] ) { open( os, name, "w" ); }
+//void open( ofstream & os, const char name[] ) { open( os, name, "w" ); }
 
 void close( ofstream & os ) with( os ) {
@@ -309 +308 @@
         ifstream_data.fail = fail;
         ifstream_data.open = (void(*)(ifstream &, const char *, const char *))open;
-        ifstream_data.open = (void(*)(ifstream &, const char *))open;
+//      ifstream_data.open = (void(*)(ifstream &, const char *))open;
         ifstream_data.close = close;
         ifstream_data.read = read;
@@ -324 +323 @@
 // public
 void ?{}( ifstream & is ) { is.file$ = 0p; }
-void ?{}( ifstream & is, const char name[], const char mode[] ) { open( is, name, mode ); }
-void ?{}( ifstream & is, const char name[] ) { open( is, name, "r" ); }
+void ?{}( ifstream & is, const char name[], const char mode[] ) { is{}; open( is, name, mode ); }
 void ^?{}( ifstream & is ) { close( is ); }
 
@@ -336 +334 @@
 bool eof( ifstream & is ) { return feof( (FILE *)(is.file$) ) != 0; }
 
-void open( ifstream & is, const char name[], const char mode[] ) {
+void open( ifstream & is, const char name[], const char mode[] = "r" ) {
         FILE * file;
     for ( cnt; 10 ) {
@@ -348 +346 @@
                 // abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
         } // if
-        (is){ file };                                                                           // initialize
+        is{ file };                                                                                     // initialize
 } // open
 
-void open( ifstream & is, const char name[] ) { open( is, name, "r" ); }
+//void open( ifstream & is, const char name[] ) { open( is, name, "r" ); }
 
 void close( ifstream & is ) with( is ) {

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr 14 20:42:01 2025
-// Update Count     : 276
+// Last Modified On : Wed Jan 14 21:11:16 2026
+// Update Count     : 280
 //
 
@@ -78 +78 @@
 void clearerr( ofstream & );
 int flush( ofstream & );
-void open( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
-void open( ofstream &, const char name[] );
+void open( ofstream &, const char name[], const char mode[] = "w" );
 void close( ofstream & );
 
@@ -85 +84 @@
 
 void ?{}( ofstream & );
-void ?{}( ofstream &, const char name[], const char mode[] ); // FIX ME: use default = "w"
-void ?{}( ofstream &, const char name[] );
+void ?{}( ofstream &, const char name[], const char mode[] = "w" );
 void ^?{}( ofstream & );
 
@@ -127 +125 @@
 bool fail( ifstream & is );
 void clearerr( ifstream & );
-void open( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
-void open( ifstream & is, const char name[] );
+void open( ifstream & is, const char name[], const char mode[] = "r" );
 void close( ifstream & is );
 ifstream & read( ifstream & is, char data[], size_t size );
 
 void ?{}( ifstream & is );
-void ?{}( ifstream & is, const char name[], const char mode[] ); // FIX ME: use default = "r"
-void ?{}( ifstream & is, const char name[] );
+void ?{}( ifstream & is, const char name[], const char mode[] = "r" );
 void ^?{}( ifstream & is );