Changeset f45772e for tests/io

Timestamp:

Oct 8, 2023, 9:14:31 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

92211d9

Parents:

2261bcc (diff), 9689e54 (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

Location:

tests/io

Files:

• .expect/manipulatorsInput.arm64.txt (modified) (3 diffs)
• .expect/manipulatorsInput.x64.txt (modified) (3 diffs)
• .expect/manipulatorsInput.x86.txt (modified) (3 diffs)
• .in/manipulatorsInput.txt (modified) (1 diff)
• manipulatorsInput.cfa (modified) (3 diffs)

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

@@ -1 +1 @@
 pre1 "123456", canary ok
-pre2a "1234567", exception occurred, canary ok
-pre2b "89", canary ok
+pre2 "1234567", canary ok
+pre3a "1234567", exception occurred, canary ok
+pre3b "8", canary ok
+pre4a "1234567", exception occurred, canary ok
+pre4b "89", canary ok
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -15 +18 @@
 12 wwwwwwww
 13 wwwwwwww
+14 rc=1, cccc
+15 rc=0, q
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -28 +33 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15
 a
 a

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

@@ -1 +1 @@
 pre1 "123456", canary ok
-pre2a "1234567", exception occurred, canary ok
-pre2b "89", canary ok
+pre2 "1234567", canary ok
+pre3a "1234567", exception occurred, canary ok
+pre3b "8", canary ok
+pre4a "1234567", exception occurred, canary ok
+pre4b "89", canary ok
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -15 +18 @@
 12 wwwwwwww
 13 wwwwwwww
+14 rc=1, cccc
+15 rc=0, q
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -28 +33 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15
 a
 a

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

@@ -1 +1 @@
 pre1 "123456", canary ok
-pre2a "1234567", exception occurred, canary ok
-pre2b "89", canary ok
+pre2 "1234567", canary ok
+pre3a "1234567", exception occurred, canary ok
+pre3b "8", canary ok
+pre4a "1234567", exception occurred, canary ok
+pre4b "89", canary ok
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -15 +18 @@
 12 wwwwwwww
 13 wwwwwwww
+14 rc=1, cccc
+15 rc=0, q
 1 yyyyyyyyyyyyyyyyyyyy
 2 abcxxx
@@ -28 +33 @@
 12 wwwwwwww
 13 wwwwwwww
+14 cccc
+15
 a
 a

tests/io/.in/manipulatorsInput.txt

@@ -1 +1 @@
 123456
+1234567
+12345678
 123456789
 abc 
-abc 
+cccccb 
 xx
 abcxxx
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
+uuuuuccccuuuuu
 abc 
-abc 
+cccccb 
 xx
 abcxxx
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
+uuuuuccccuuuuu
 ab
 0xff 017 15-15

tests/io/manipulatorsInput.cfa

@@ -45 +45 @@
                 }
 
-                rep("pre1");
-                rep("pre2a");
-                rep("pre2b");
+                rep("pre1");    // 123456     |  123456
+                rep("pre2");    // 1234567    |  1234567
+                rep("pre3a");   // 12345678   |  1234567
+                rep("pre3b");   //            |  8
+                rep("pre4a");   // 123456789  |  1234567
+                rep("pre4b");   //            |  89
+
                 scanf("\n");  // next test does not start with %s so does not tolerate leading whitespace
         }
         {
                 char s[] = "yyyyyyyyyyyyyyyyyyyy";
-                const char sk[] = "abc";
-                scanf( "abc " ); scanf( sk ); for ( 5 ) scanf( "%*c" ); printf( "1 %s\n", s );
+                const char sk_fmt[] = "%*[abc]";
+                scanf( "abc " ); scanf( sk_fmt ); for ( 5 ) scanf( "%*c" ); printf( "1 %s\n", s );
                 scanf( "%s", s );                                                               printf( "2 %s\n", s );
                 scanf( "%*s" );                                                                 printf( "3 %s\n", s );
@@ -67 +71 @@
                 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 +97 @@
                 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 */