Changeset 64c4b4d for tests/collections

Timestamp:

Jan 24, 2024, 1:39:37 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

5764204

Parents:

221c542e (diff), 3db78b89 (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/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

@@ -68 +68 @@
 12 wwwwwwww
 13 wwwwwwww
-14 cccc
+14 
 15 
 1 yyyyyyyyyyyyyyyyyyyy
@@ -83 +83 @@
 12 wwwwwwww
 13 wwwwwwww
-14 cccc
+14 
 15 

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

@@ -36 +36 @@
 abcxxx
 abcyyy
-aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
-uuuuuccccuuuuu
+aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwwwaaaaaaaawwwwwwww
+uuuuu
 abc 
 cccccb 
@@ -43 +43 @@
 abcxxx
 abcyyy
-aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
-uuuuuccccuuuuu
+aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwwwaaaaaaaawwwwwwww
+uuuuu

tests/collections/string-istream-manip.cfa

@@ -165 +165 @@
         sin | ignore( incl( "abc", wdi( 8, s ) ) );     sout | "12" | s;
         sin | ignore( excl( "abc", wdi( 8, s ) ) );     sout | "13" | s;
+                sin | "\n";
 
                 s = "q";
@@ -191 +192 @@
         sin | ignore( incl( "abc", wdi( 8, s ) ) );     sout | "12" | s;
         sin | ignore( excl( "abc", wdi( 8, s ) ) );     sout | "13" | s;
+                sin | "\n";
 
                 s = "q";