Changeset a1a1f37d for libcfa/src

Timestamp:

Jul 14, 2024, 6:00:32 PM (5 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

d796be70, eb5dbfd

Parents:

2e6b2a0

Message:

change order of ungetc parameters to harmonize with C ungetc

Location:

libcfa/src

Files:

• fstream.cfa (modified) (2 diffs)
• fstream.hfa (modified) (2 diffs)
• iostream.cfa (modified) (5 diffs)
• iostream.hfa (modified) (2 diffs)
• strstream.cfa (modified) (2 diffs)
• strstream.hfa (modified) (2 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 : Sun Feb 11 20:55:45 2024
-// Update Count     : 580
+// Last Modified On : Fri Jul 12 05:45:49 2024
+// Update Count     : 581
 //
 
@@ -280 +280 @@
 } // read
 
-ifstream &ungetc( ifstream & is, char c ) {
+ifstream &ungetc( char c, ifstream & is ) {
         if ( fail( is ) ) {
                 abort | IO_MSG "attempt ungetc 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 : Sun Feb 11 20:35:00 2024
-// Update Count     : 274
+// Last Modified On : Fri Jul 12 05:45:50 2024
+// Update Count     : 275
 //
 
@@ -118 +118 @@
 void nlOff( ifstream & );
 int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
-ifstream & ungetc( ifstream & is, char c );
+ifstream & ungetc( char c, ifstream & is );
 bool eof( ifstream & is );
 

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  8 23:45:06 2024
-// Update Count     : 2018
+// Last Modified On : Fri Jul 12 05:45:45 2024
+// Update Count     : 2019
 //
 
@@ -891 +891 @@
                         } // for
                         if ( sign ) ullli = -ullli;
-                } else if ( sign ) ungetc( is, '-' );                   // return minus when no digits
+                } else if ( sign ) ungetc( '-', is );                   // return minus when no digits
                 return is;
         } // ?|?
@@ -1069 +1069 @@
                                 // fprintf( stderr, "peek %d '%c'\n", args, peek );
                                 if ( ! eof( is ) ) {                                    // can only fail at eof
-                                        ungetc( is, peek );
+                                        ungetc( peek, is );
                                         if ( ! isspace( peek ) ) throwResume ExceptionInst( cstring_length );
                                 } // if
@@ -1092 +1092 @@
                                         if ( ! eof( is ) ) {
                                                 if ( peek != delimiters[0] ) {
-                                                        ungetc( is, peek );
+                                                        ungetc( peek, is );
                                                         throwResume ExceptionInst( cstring_length );
                                                 } // if
@@ -1112 +1112 @@
                                         // fprintf( stderr, "peek %d '%c'\n", args, peek );
                                         if ( ! eof( is ) ) {
-                                                ungetc( is, peek );
+                                                ungetc( peek, is );
                                                 if ( flags.inex ^ strchr( scanset, peek ) != 0p ) throwResume ExceptionInst( cstring_length );
                                         } // if

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 Jul  6 11:33:31 2024
-// Update Count     : 758
+// Last Modified On : Fri Jul 12 05:45:48 2024
+// Update Count     : 759
 //
 
@@ -312 +312 @@
         void nlOff( istype & );                                                         // scan newline
         int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
-        istype & ungetc( istype &, char );
+        istype & ungetc( char, istype & );
         bool eof( istype & );
         void clear( istype & );

libcfa/src/strstream.cfa

@@ -10 +10 @@
 // Created On       : Thu Apr 22 22:24:35 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 18 10:42:49 2023
-// Update Count     : 112
+// Last Modified On : Fri Jul 12 05:45:47 2024
+// Update Count     : 113
 //
 
@@ -166 +166 @@
 } // fmt
 
-istrstream &ungetc( istrstream & is, char c ) {
+istrstream &ungetc( char c, istrstream & is ) {
         // if ( ungetc( c, (FILE *)(is.file$) ) == EOF ) {
         //      abort | IO_MSG "ungetc" | nl | strerror( errno );

libcfa/src/strstream.hfa

@@ -10 +10 @@
 // Created On       : Thu Apr 22 22:20:59 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 18 10:41:14 2023
-// Update Count     : 55
+// Last Modified On : Fri Jul 12 05:45:48 2024
+// Update Count     : 56
 // 
 
@@ -96 +96 @@
 
 int fmt( istrstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
-istrstream & ungetc( istrstream &, char );
+istrstream & ungetc( char, istrstream & );
 bool eof( istrstream & );