Changeset 64c4b4d for libcfa

Timestamp:

Jan 24, 2024, 1:39:37 PM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

5764204

Parents:

221c542e (diff), 3db78b89 (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) (2 diffs)

libcfa/src/iostream.cfa

@@ -1076 +1076 @@
                         } // 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
+                        if ( ! f.flags.ignore && rwd > 0 && args == 0 ) f.s[0]= '\0';   // read failed => no pattern match => set string to null
                 } else {
                         if ( f.flags.delimiter ) {                                      // getline
@@ -1114 +1114 @@
                                 } // if
                         } // if
-                        if ( rwd > 0 && args == 0 ) f.s[0]= '\0';       // read failed => no pattern match => set string to null
+                        if ( ! f.flags.ignore && 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