Changeset 92d8cda for tests/collections

Timestamp:

Sep 6, 2023, 11:49:02 AM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

4a40fca7, 79b05224, 9d47c1f

Parents:

1f10959 (diff), 1fc111c (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) (1 diff)
• .in/string-istream-manip.txt (modified) (1 diff)
• string-istream-manip.cfa (modified) (2 diffs)

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

@@ -12 +12 @@
 12 wwwwwwww
 13 wwwwwwww
+1 yyyyyyyyyyyyyyyyyyyy
+2 abcxxx
+3 abcxxx
+4 aaaaaaaa
+5 aaaaaaaa
+6 aabbccbb
+7 dddwww
+8 dddwww
+9 dddwww
+10 aaaaaaaa
+11 wwwwwwww
+12 wwwwwwww
+13 wwwwwwww

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

@@ -5 +5 @@
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
+abc 
+abc 
+xx
+abcxxx
+abcyyy
+aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww

tests/collections/string-istream-manip.cfa

@@ -2 +2 @@
 #include <fstream.hfa>
 #include <collections/string.hfa>
+#include <collections/string_res.hfa>
 
 int main() {
@@ -11 +12 @@
         sin | s;                                        sout | "2" | s;
         sin | ignore( s );                              sout | "3" | s;
-         sin | wdi( 8, s );                             sout | "4" | s;
+        sin | wdi( 8, s );                              sout | "4" | s;
+        sin | ignore( wdi( 8, s ) );                    sout | "5" | s;
+
+        sin | incl( "abc", s );                         sout | "6" | s;
+        sin | excl( "abc", s );                         sout | "7" | s;
+        sin | ignore( incl( "abc", s ) );               sout | "8" | s;
+        sin | ignore( excl( "abc", s ) );               sout | "9" | s;
+        sin | incl( "abc", wdi( 8, s ) );               sout | "10" | s;
+        sin | excl( "abc", wdi( 8, s ) );               sout | "11" | s;
+        sin | ignore( incl( "abc", wdi( 8, s ) ) );     sout | "12" | s;
+        sin | ignore( excl( "abc", wdi( 8, s ) ) );     sout | "13" | s;
+    }
+    {
+        string_res s = "yyyyyyyyyyyyyyyyyyyy";
+        char sk[] = "abc";
+        sin | "abc " | skip( sk ) | skip( 5 );          sout | "1" | s;
+        sin | s;                                        sout | "2" | s;
+        sin | ignore( s );                              sout | "3" | s;
+        sin | wdi( 8, s );                              sout | "4" | s;
         sin | ignore( wdi( 8, s ) );                    sout | "5" | s;