Changeset 3db78b89 for libcfa/src

Timestamp:

Jan 24, 2024, 12:11:48 PM (22 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

64c4b4d

Parents:

8a33777

Message:

Fix string reading bug: Manipulator ignore should not write to its output argument.

The prior test expectation was wrong.
The test was not following its rule that it should expect
the CFA library to show scanf-analogous behaviour.

Note, the corresponding expectation in collections/string-istream-manip was already correct.

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