Changeset 5a95560

Timestamp:

Jan 19, 2026, 11:24:34 AM (2 weeks ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

9d3dc40

Parents:

fb7c9168 (diff), a2940184 (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 remote-tracking branch 'refs/remotes/origin/master'

Location:

libcfa/src

Files:

• fstream.cfa (modified) (7 diffs)
• fstream.hfa (modified) (4 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 : 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 );
 

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Sep 13 16:10:27 2025
-// Update Count     : 771
+// Last Modified On : Wed Jan 14 21:23:53 2026
+// Update Count     : 772
 //
 
@@ -27 +27 @@
         void (*sepReset$)( ostype & );                                                  // set separator state to default state
         void (*sepReset$)( ostype &, bool );                                    // set separator and default state
-        const char * (*sepGetCur$)( ostype & );                         // get current separator string
+        const char * (*sepGetCur$)( ostype & );                                 // get current separator string
         void (*sepSetCur$)( ostype &, const char [] );                  // set current separator string
-        bool (*getNL$)( ostype & );                                                     // get newline
+        bool (*getNL$)( ostype & );                                                             // get newline
         bool (*setNL$)( ostype &, bool );                                               // set newline
         bool (*getANL$)( ostype & );                                                    // get auto newline (on/off)
@@ -42 +42 @@
         void (*nosep)( ostype & );                                                              // turn separator state off
         bool (*sepOn)( ostype & );                                                              // set default state to on, and return previous state
-        bool (*sepOff)( ostype & );                                                     // set default state to off, and return previous state
-        const char * (*sepGet)( ostype & );                                     // get separator string
+        bool (*sepOff)( ostype & );                                                             // set default state to off, and return previous state
+        const char * (*sepGet)( ostype & );                                             // get separator string
         void (*sepSet)( ostype &, const char [] );                              // set separator to string (15 character maximum)
         const char * (*sepGetTuple)( ostype & );                                // get tuple separator string
-        void (*sepSetTuple)( ostype &, const char [] );         // set tuple separator to string (15 character maximum)
+        void (*sepSetTuple)( ostype &, const char [] );                 // set tuple separator to string (15 character maximum)
 
         void (*ends)( ostype & );                                                               // end of output statement