Changeset 8cffa4f for tests/io

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/io

Files:

• .expect/manipulatorsInput.arm64.txt (modified) (2 diffs)
• .expect/manipulatorsInput.x64.txt (modified) (2 diffs)
• .expect/manipulatorsInput.x86.txt (modified) (2 diffs)
• .in/manipulatorsInput.txt (modified) (2 diffs)
• manipulatorsInput.cfa (modified) (2 diffs)

tests/io/.expect/manipulatorsInput.arm64.txt

@@ -15 +15 @@
 12 wwwwwwww
 13 wwwwwwww
+14 rc=1, cccc
+15 rc=0, q
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -28 +30 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15
 a
 a

tests/io/.expect/manipulatorsInput.x64.txt

@@ -15 +15 @@
 12 wwwwwwww
 13 wwwwwwww
+14 rc=1, cccc
+15 rc=0, q
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -28 +30 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15
 a
 a

tests/io/.expect/manipulatorsInput.x86.txt

@@ -15 +15 @@
 12 wwwwwwww
 13 wwwwwwww
+14 rc=1, cccc
+15 rc=0, q
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -28 +30 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15
 a
 a

tests/io/.in/manipulatorsInput.txt

@@ -7 +7 @@
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
+uuuuuccccuuuuu
 abc 
 cccccb 
@@ -13 +14 @@
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
+uuuuuccccuuuuu
 ab
 0xff 017 15-15

tests/io/manipulatorsInput.cfa

@@ -67 +67 @@
                 scanf( "%*8[abc]" );                                                    printf( "12 %s\n", s );
                 scanf( "%*8[^abc]" );                                                   printf( "13 %s\n", s );
+
+                int rc;
+                s[0] = 'q'; s[1] = '\0'; rc = 99;
+                rc = scanf( "%[abc]", s );                                              printf( "14 rc=%d, %s\n", rc, s );
+                s[0] = 'q'; s[1] = '\0'; rc = 99;
+                rc = scanf( "%[^u]", s );                                               printf( "15 rc=%d, %s\n", rc, s );
+                scanf( "%*[u]" );
+                scanf("\n");
         }
         {
@@ -85 +93 @@
                 sin | ignore( incl( "abc", wdi( sizeof(s), 8, s ) ) ); sout | "12" | s;
                 sin | ignore( excl( "abc", wdi( sizeof(s), 8, s ) ) ); sout | "13" | s;
+
+                s[0] = 'q'; s[1] = '\0';
+                sin | incl( "abc", wdi( sizeof(s), s ) );               sout | "14" | s;
+                s[0] = 'q'; s[1] = '\0';
+                sin | excl( "u", wdi( sizeof(s), s ) );                 sout | "15" | s;
+                sin | skip( "u" );
+                sin | "\n";
         }
     /* Keep harmonized with collections/string-istream-manip */