Changeset 8d182b1 for libcfa

Timestamp:

Nov 14, 2023, 12:19:09 PM (6 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/iostream.cfa (modified) (3 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Oct 19 21:10:10 2023
-// Update Count     : 1801
+// Last Modified On : Sat Nov 11 07:06:27 2023
+// Update Count     : 1803
 //
 
@@ -1001 +1001 @@
                                 } // if
                         } // if
+                        // FIX ME: CFA strings need to be modified to NOT change the argument for this case, then this can be removed.
+                        if ( rwd > 0 && args == 0 ) f.s[0]= '\0';       // read failed => no pattern match => set string to null
                 } else {
                         if ( f.flags.delimiter ) {                                      // getline
@@ -1041 +1043 @@
                                 } // if
                         } // if
+                        if ( rwd > 0 && args == 0 ) f.s[0]= '\0';       // read failed => no pattern match => set string to null
                 } // if
                 if ( args == 1 && eof( is ) ) {                                 // data but scan ended at EOF