Changeset f54e6ec

Timestamp:

Sep 5, 2023, 2:57:01 PM (15 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

3c7e3c4, aae9c17

Parents:

acafba4

Message:

Port basic input-manipulator test from cstring to string and fix resulting bug.

Bug was ignore(...s...) overwriting s with garbage.

Files:

• libcfa/src/collections/string.cfa (modified) (2 diffs)
• tests/collections/.expect/string-istream-manip.txt (added)
• tests/collections/.in/string-istream-manip.txt (added)
• tests/collections/string-istream-manip.cfa (added)
• tests/io/manipulatorsInput.cfa (modified) (1 diff)

libcfa/src/collections/string.cfa

@@ -149 +149 @@
                 cont = true;
         } finally {
-                f.s = cstr;                                                                             // ok to initialize string
+        if ( ! cf.flags.ignore ) f.s = cstr;                    // ok to initialize string
         } // try
         for ( ; cont; )  {                                                                      // overflow read ?
@@ -158 +158 @@
                         cont = true;                                                            // continue not allowed
                 } finally {
-                        f.s += cstr;                                                            // build string chunk at a time
+                        if ( ! cf.flags.ignore ) f.s += cstr;           // build string chunk at a time
                 } // try
         } // for

tests/io/manipulatorsInput.cfa

@@ -51 +51 @@
                 sin | ignore( excl( "abc", wdi( sizeof(s), 8, s ) ) ); sout | "13" | s;
         }
+    /* Keep harmonized with collections/string-istream-manip */
         {
                 char c;