Changeset 8cffa4f for tests/collections

Timestamp:

Oct 5, 2023, 2:30:54 PM (15 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

b67b632

Parents:

bf1cbde

Message:

Support match-failure reporting for string input.

On failed match, assign the empty-string value to the target.
Prior handling did not modify the target,
which in context like char s[10]; sin | exclude("\n", s);,
left s uninitialized, and invalid for strlen, when the input's next character is a newline.
In this case, scanf offers the return value, the count of output arguments written,
to say, "I did not write to your buffer," a feature lost in the pipe abstraction.

Add tests to exercise such cases.

(Prior "leave uninitialized" treatment was discovered by surprise, while debugging a test program for an upcoming commit.)

Location:

tests/collections

Files:

• .expect/string-istream-manip.txt (modified) (2 diffs)
• .in/string-istream-manip.txt (modified) (2 diffs)
• string-istream-manip.cfa (modified) (2 diffs)

tests/collections/.expect/string-istream-manip.txt

@@ -12 +12 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15 
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -25 +27 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15 

tests/collections/.in/string-istream-manip.txt

@@ -5 +5 @@
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
+uuuuuccccuuuuu
 abc 
 cccccb 
@@ -11 +12 @@
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
+uuuuuccccuuuuu

tests/collections/string-istream-manip.cfa

@@ -23 +23 @@
         sin | ignore( incl( "abc", wdi( 8, s ) ) );     sout | "12" | s;
         sin | ignore( excl( "abc", wdi( 8, s ) ) );     sout | "13" | s;
-    }
+
+                s = "q";
+                sin | incl( "abc", s );                         sout | "14" | s;
+                s = "q";
+                sin | excl( "u", s );                           sout | "15" | s;
+                sin | skip( "u" );
+                sin | "\n";
+        }
     {
         string_res s = "yyyyyyyyyyyyyyyyyyyy";
@@ -41 +48 @@
         sin | ignore( incl( "abc", wdi( 8, s ) ) );     sout | "12" | s;
         sin | ignore( excl( "abc", wdi( 8, s ) ) );     sout | "13" | s;
+
+                s = "q";
+                sin | incl( "abc", s );                         sout | "14" | s;
+                s = "q";
+                sin | excl( "u", s );                           sout | "15" | s;
+                sin | skip( "u" );
+                sin | "\n";
     }
 }