Changeset bf1cbde

Timestamp:

Oct 5, 2023, 1:50:35 PM (14 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

8cffa4f

Parents:

04db9f6

Message:

Implement "scanset" semantics for manipulator skip, in place of exact-match.

That is, sin | skip("abc") now consumes all input before the "+" on input "cccccb+".

Exact-match semantics is available with just sin | "abc".

(Prior exact-match semantics was discovered by surprise, while debugging a test program for an upcoming commit.)

Files:

• libcfa/src/iostream.cfa (modified) (1 diff)
• tests/collections/.in/string-istream-manip.txt (modified) (2 diffs)
• tests/io/.in/manipulatorsInput.txt (modified) (2 diffs)
• tests/io/manipulatorsInput.cfa (modified) (1 diff)

libcfa/src/iostream.cfa

@@ -960 +960 @@
         istype & ?|?( istype & is, _Istream_Cskip f ) {
                 // printf( "skip %s %d\n", f.scanset, f.wd );
-                if ( f.scanset ) fmt( is, f.scanset, "" );              // no input arguments
+                if ( f.scanset ) {
+                        int nscanset = strlen(f.scanset);
+                        char fmtstr[ sizeof("%*[]") + nscanset ];
+                        int pos = 0;
+                        fmtstr[pos] = '%';                  pos += 1;
+                        fmtstr[pos] = '*';                  pos += 1;
+                        fmtstr[pos] = '[';                  pos += 1;
+                        strcpy( &fmtstr[pos], f.scanset );  pos += nscanset;
+                        fmtstr[pos] = ']';                  pos += 1;
+                        fmtstr[pos] = '\0';
+                        fmt( is, fmtstr, (void*)0 );  // last arg is dummy: suppress gcc warning
+                }
                 else for ( f.wd ) fmt( is, "%*c" );
                 return is;

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

@@ -1 +1 @@
 abc 
-abc 
+cccccb 
 xx
 abcxxx
@@ -6 +6 @@
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
 abc 
-abc 
+cccccb 
 xx
 abcxxx

tests/io/.in/manipulatorsInput.txt

@@ -2 +2 @@
 123456789
 abc 
-abc 
+cccccb 
 xx
 abcxxx
@@ -8 +8 @@
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
 abc 
-abc 
+cccccb 
 xx
 abcxxx

tests/io/manipulatorsInput.cfa

@@ -52 +52 @@
         {
                 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 );