Changeset c8371b5

Timestamp:

Oct 10, 2021, 5:02:46 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

321a1b15

Parents:

fe8c31e

git-author:

Peter A. Buhr <pabuhr@…> (10/10/21 16:59:59)

git-committer:

Peter A. Buhr <pabuhr@…> (10/10/21 17:02:46)

Message:

change getANL to getANL$ (private)

Location:

libcfa/src

Files:

• fstream.cfa (modified) (3 diffs)
• fstream.hfa (modified) (5 diffs)
• iostream.cfa (modified) (2 diffs)
• iostream.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 : Wed Oct  6 18:39:13 2021
-// Update Count     : 508
+// Last Modified On : Sun Oct 10 11:23:05 2021
+// Update Count     : 512
 //
 
@@ -206 +206 @@
 } // ?{}
 
+bool getANL$( ifstream & os ) { return os.nlOnOff$; }
+
 inline void lock( ifstream & os ) with( os ) { lock( os.lock$ ); }
 inline void unlock( ifstream & os ) { unlock( os.lock$ ); }
@@ -215 +217 @@
 void ^?{}( ifstream & is ) { close( is ); }
 
+bool fail( ifstream & is ) { return is.file$ == 0p || ferror( (FILE *)(is.file$) ); }
+void clear( ifstream & is ) { clearerr( (FILE *)(is.file$) ); }
+
 void nlOn( ifstream & os ) { os.nlOnOff$ = true; }
 void nlOff( ifstream & os ) { os.nlOnOff$ = false; }
-bool getANL( ifstream & os ) { return os.nlOnOff$; }
-
-bool fail( ifstream & is ) { return is.file$ == 0p || ferror( (FILE *)(is.file$) ); }
-void clear( ifstream & is ) { clearerr( (FILE *)(is.file$) ); }
-
-void ends( ifstream & is ) {
-} // ends
-
-bool eof( ifstream & is ) { return feof( (FILE *)(is.file$) ); }
+
+void ends( ifstream & is ) {}
+
+bool eof( ifstream & is ) { return feof( (FILE *)(is.file$) ) != 0; }
 
 void open( ifstream & is, const char name[], const char mode[] ) {

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:45:49 2021
-// Update Count     : 240
+// Last Modified On : Sun Oct 10 09:37:32 2021
+// Update Count     : 243
 //
 
@@ -77 +77 @@
 void open( ofstream &, const char name[] );
 void close( ofstream & );
+
 ofstream & write( ofstream &, const char data[], size_t size );
 
@@ -105 +106 @@
 
 // private
+bool getANL$( ifstream & );
+
 void lock( ifstream & );
 void unlock( ifstream & );
@@ -111 +114 @@
 void nlOn( ifstream & );
 void nlOff( ifstream & );
-bool getANL( ifstream & );
 void ends( ifstream & );
 int fmt( ifstream &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));
@@ -121 +123 @@
 void open( ifstream & is, const char name[] );
 void close( ifstream & is );
+
 ifstream & read( ifstream & is, char data[], size_t size );
 ifstream & ungetc( ifstream & is, char c );

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:55:03 2021
-// Update Count     : 1344
+// Last Modified On : Sun Oct 10 09:28:17 2021
+// Update Count     : 1345
 //
 
@@ -822 +822 @@
                         fmt( is, "%c", &temp );                                         // must pass pointer through varg to fmt
                         // do not overwrite parameter with newline unless appropriate
-                        if ( temp != '\n' || getANL( is ) ) { c = temp; break; }
+                        if ( temp != '\n' || getANL$( is ) ) { c = temp; break; }
                         if ( eof( is ) ) break;
                 } // for

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Oct  6 18:54:59 2021
-// Update Count     : 404
+// Last Modified On : Sun Oct 10 10:02:07 2021
+// Update Count     : 407
 //
 
@@ -291 +291 @@
 
 trait basic_istream( istype & ) {
-        bool getANL( istype & );                                                        // get scan newline (on/off)
+        // private
+        bool getANL$( istype & );                                                       // get scan newline (on/off)
+        // public
         void nlOn( istype & );                                                          // read newline
         void nlOff( istype & );                                                         // scan newline
-
         void ends( istype & os );                                                       // end of output statement
         int fmt( istype &, const char format[], ... ) __attribute__(( format(scanf, 2, 3) ));