Changeset 0efb269

Timestamp:

Apr 20, 2019, 3:18:16 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

e7fdd76

Parents:

4e84ef7

Message:

add feature to input streams to read/not-read newline characters

Location:

libcfa/src

Files:

• fstream.cfa (modified) (4 diffs)
• fstream.hfa (modified) (2 diffs)
• iostream.cfa (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 : Thu Mar 28 17:39:53 2019
-// Update Count     : 307
+// Last Modified On : Sat Apr 20 12:03:43 2019
+// Update Count     : 311
 //
 
@@ -33 +33 @@
         os.nlOnOff = nlOnOff;
         os.prt = prt;
+        os.sawNL = false;
         sepSet( os, separator );
         sepSetCur( os, sepGet( os ) );
@@ -162 +163 @@
 void ?{}( ifstream & is, void * file ) {
         is.file = file;
+        is.nlOnOff = false;
 }
 
@@ -173 +175 @@
         open( is, name, "r" );
 }
+
+void nlOn( ifstream & os ) { os.nlOnOff = true; }
+void nlOff( ifstream & os ) { os.nlOnOff = false; }
+bool getANL( ifstream & os ) { return os.nlOnOff; }
 
 int fail( ifstream & 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 Dec 24 18:33:41 2018
-// Update Count     : 149
+// Last Modified On : Sat Apr 20 12:03:58 2019
+// Update Count     : 151
 //
 
@@ -73 +73 @@
 struct ifstream {
         void * file;
+        bool nlOnOff;
 }; // ifstream
 
 // public
+void nlOn( ifstream & );
+void nlOff( ifstream & );
+bool getANL( ifstream & );
 int fail( ifstream & is );
 int 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 Mar  4 20:57:24 2019
-// Update Count     : 593
+// Last Modified On : Sat Apr 20 14:02:43 2019
+// Update Count     : 617
 //
 
@@ -396 +396 @@
 
         istype & ?|?( istype & is, char & c ) {
-                fmt( is, "%c", &c );                                                    // must pass pointer through varg to fmt
+                char temp;
+                for () {
+                        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 ( eof( is ) ) break;
+                } // for
                 return is;
         } // ?|?
@@ -498 +504 @@
                 return is;
         } // nl
+
+        istype & nlOn( istype & is ) {
+                nlOn( is );                                                                             // call void returning
+                return is;
+        } // nlOn
+
+        istype & nlOff( istype & is ) {
+                nlOff( is );                                                                    // call void returning
+                return is;
+        } // nlOff
 } // distribution
 

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 Feb 26 16:57:22 2019
-// Update Count     : 221
+// Last Modified On : Sat Apr 20 12:04:07 2019
+// Update Count     : 226
 //
 
@@ -149 +149 @@
 
 trait istream( dtype istype ) {
+        void nlOn( istype & );                                                          // read newline
+        void nlOff( istype & );                                                         // scan newline
+        bool getANL( istype & );                                                        // get scan newline (on/off)
         int fail( istype & );
         int eof( istype & );
@@ -187 +190 @@
 
         // manipulators
+        istype & nlOn( istype & );
+        istype & nlOff( istype & );
         istype & ?|?( istype &, istype & (*)( istype & ) );
         istype & nl( istype & is );