Changeset bf1cbde for libcfa

Timestamp:

Oct 5, 2023, 1:50:35 PM (7 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.)

File:

• libcfa/src/iostream.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;