Index: libcfa/src/iostream.cfa =================================================================== --- libcfa/src/iostream.cfa (revision 23edb610217d4c402e15ba1bbed250849c7da9f1) +++ libcfa/src/iostream.cfa (revision 9ff71ffc2d8f037adfbd872a7671d1dd4be17691) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Aug 7 08:59:29 2023 -// Update Count : 1407 +// Last Modified On : Wed Aug 9 10:10:56 2023 +// Update Count : 1432 // @@ -271,5 +271,5 @@ OSTYPE_VOID_IMPL( const char * ) -// ostype & ?|?( ostype & os, const char16_t * s ) { +// ostype & ?|?( ostype & os, const char16_t s[] ) { // if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) ); // fmt( os, "%ls", s ); @@ -278,5 +278,5 @@ // #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous -// ostype & ?|?( ostype & os, const char32_t * s ) { +// ostype & ?|?( ostype & os, const char32_t s[] ) { // if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) ); // fmt( os, "%ls", s ); @@ -285,5 +285,5 @@ // #endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) -// ostype & ?|?( ostype & os, const wchar_t * s ) { +// ostype & ?|?( ostype & os, const wchar_t s[] ) { // if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) ); // fmt( os, "%ls", s ); @@ -917,9 +917,9 @@ // } // ?|? - istype & ?|?( istype & is, char s[] ) { - fmt( is, "%s", s ); - return is; - } // ?|? - ISTYPE_VOID_IMPL( char * ) + // istype & ?|?( istype & is, char s[] ) { + // fmt( is, "%s", s ); + // return is; + // } // ?|? + // ISTYPE_VOID_IMPL( char * ) // manipulators @@ -934,4 +934,5 @@ istype & nl( istype & is ) { fmt( is, "%*[^\n]" ); // ignore characters to newline + if ( ! eof( is ) && getANL$( is ) ) fmt( is, "%*c" ); // read newline return is; } // nl @@ -952,11 +953,22 @@ forall( istype & | basic_istream( istype ) ) { istype & ?|?( istype & is, _Istream_Cstr f ) { - // skip xxx + // skip if ( ! f.s ) { // printf( "skip %s %d\n", f.scanset, f.wd ); - if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments + if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments else for ( f.wd ) fmt( is, "%*c" ); return is; } // if + + // getline + if ( f.flags.delimit ) { + char fmtstr[] = "%[^ ]s"; // delimit inserted into space + fmtstr[3] = f.delimit; + fmt( is, fmtstr, f.s ); // read upto delimiter + fmt( is, "%*c" ); // ignore delimiter + return is; + } // if + + // incl/excl size_t len = 0; if ( f.scanset ) len = strlen( f.scanset ); @@ -977,5 +989,5 @@ fmtstr[start] = '['; start += 1; if ( f.flags.inex ) { fmtstr[start] = '^'; start += 1; } - strcpy( &fmtstr[start], f.scanset ); // copy includes '\0' + strcpy( &fmtstr[start], f.scanset ); // copy includes '\0' len += start; fmtstr[len] = ']'; fmtstr[len + 1] = '\0'; @@ -987,5 +999,5 @@ istype & ?|?( istype & is, _Istream_Char f ) { - fmt( is, "%*c" ); // argument variable unused + fmt( is, "%*c" ); // argument variable unused return is; } // ?|? Index: libcfa/src/iostream.hfa =================================================================== --- libcfa/src/iostream.hfa (revision 23edb610217d4c402e15ba1bbed250849c7da9f1) +++ libcfa/src/iostream.hfa (revision 9ff71ffc2d8f037adfbd872a7671d1dd4be17691) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jul 19 14:25:52 2023 -// Update Count : 463 +// Last Modified On : Wed Aug 9 16:47:05 2023 +// Update Count : 500 // @@ -130,9 +130,9 @@ ostype & ?|?( ostype &, const char [] ); OSTYPE_VOID( const char [] ); - // ostype & ?|?( ostype &, const char16_t * ); + // ostype & ?|?( ostype &, const char16_t [] ); #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous - // ostype & ?|?( ostype &, const char32_t * ); + // ostype & ?|?( ostype &, const char32_t [] ); #endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) - // ostype & ?|?( ostype &, const wchar_t * ); + // ostype & ?|?( ostype &, const wchar_t [] ); ostype & ?|?( ostype &, const void * ); OSTYPE_VOID( const void * ); @@ -390,6 +390,6 @@ // istype & ?|?( istype &, const char [] ); - istype & ?|?( istype &, char [] ); - ISTYPE_VOID( char * ); +// istype & ?|?( istype &, char [] ); +// ISTYPE_VOID( char [] ); // manipulators @@ -405,5 +405,8 @@ struct _Istream_Cstr { char * s; - const char * scanset; + union { + const char * scanset; + char delimit; + }; int wd; // width union { @@ -412,4 +415,5 @@ unsigned char ignore:1; // do not change input argument unsigned char inex:1; // include/exclude characters in scanset + unsigned char delimit:1; // delimit character } flags; }; @@ -417,14 +421,18 @@ static inline { - _Istream_Cstr skip( const char scanset[] ) { return (_Istream_Cstr){ 0p, scanset, -1, { .all : 0 } }; } - _Istream_Cstr skip( unsigned int n ) { return (_Istream_Cstr){ 0p, 0p, n, { .all : 0 } }; } - _Istream_Cstr incl( const char scanset[], char * s ) { return (_Istream_Cstr){ s, scanset, -1, { .flags.inex : false } }; } + _Istream_Cstr skip( const char scanset[] ) { return (_Istream_Cstr){ 0p, {scanset}, -1, {.all : 0} }; } + _Istream_Cstr skip( unsigned int wd ) { return (_Istream_Cstr){ 0p, {0p}, wd, {.all : 0} }; } + _Istream_Cstr & getline( _Istream_Cstr & fmt ) { fmt.delimit = '\n'; fmt.flags.delimit = true; return fmt; } + _Istream_Cstr & getline( const char delimit, _Istream_Cstr & fmt ) { fmt.delimit = delimit; fmt.flags.delimit = true; return fmt; } +// _Istream_Cstr incl( const char scanset[], char s[] ) { return (_Istream_Cstr){ s, {scanset}, -1, { .flags.inex : false } }; } +// _Istream_Cstr incl( const char scanset[], unsigned int wd, char s[] ) { return (_Istream_Cstr){ s, {scanset}, wd, {.flags.inex : false} }; } _Istream_Cstr & incl( const char scanset[], _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = false; return fmt; } - _Istream_Cstr excl( const char scanset[], char * s ) { return (_Istream_Cstr){ s, scanset, -1, { .flags.inex : true } }; } +// _Istream_Cstr excl( const char scanset[], char s[] ) { return (_Istream_Cstr){ s, {scanset}, -1, { .flags.inex : true } }; } +// _Istream_Cstr excl( const char scanset[], unsigned int wd, char s[] ) { return (_Istream_Cstr){ s, {scanset}, wd, {.flags.inex : true} }; } _Istream_Cstr & excl( const char scanset[], _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = true; return fmt; } - _Istream_Cstr ignore( char s[] ) { return (_Istream_Cstr)@{ s, 0p, -1, { .flags.ignore : true } }; } + _Istream_Cstr ignore( char s[] ) { return (_Istream_Cstr)@{ s, {0p}, -1, {.flags.ignore : true} }; } _Istream_Cstr & ignore( _Istream_Cstr & fmt ) { fmt.flags.ignore = true; return fmt; } - _Istream_Cstr wdi( unsigned int w, char s[] ) { return (_Istream_Cstr)@{ s, 0p, w, { .all : 0 } }; } - _Istream_Cstr & wdi( unsigned int w, _Istream_Cstr & fmt ) { fmt.wd = w; return fmt; } + _Istream_Cstr wdi( unsigned int wd, char s[] ) { return (_Istream_Cstr)@{ s, {0p}, wd, {.all : 0} }; } +// _Istream_Cstr & wdi( unsigned int wd, _Istream_Cstr & fmt ) { fmt.wd = wd; return fmt; } } // distribution forall( istype & | basic_istream( istype ) ) { @@ -457,6 +465,6 @@ _Istream_Manip(T) ignore( const T & val ) { return (_Istream_Manip(T))@{ (T &)val, -1, true }; } \ _Istream_Manip(T) & ignore( _Istream_Manip(T) & fmt ) { fmt.ignore = true; return fmt; } \ - _Istream_Manip(T) wdi( unsigned int w, T & val ) { return (_Istream_Manip(T))@{ val, w, false }; } \ - _Istream_Manip(T) & wdi( unsigned int w, _Istream_Manip(T) & fmt ) { fmt.wd = w; return fmt; } \ + _Istream_Manip(T) wdi( unsigned int wd, T & val ) { return (_Istream_Manip(T))@{ val, wd, false }; } \ + _Istream_Manip(T) & wdi( unsigned int wd, _Istream_Manip(T) & fmt ) { fmt.wd = wd; return fmt; } \ } /* distribution */ \ forall( istype & | basic_istream( istype ) ) { \ Index: libcfa/src/parseconfig.cfa =================================================================== --- libcfa/src/parseconfig.cfa (revision 23edb610217d4c402e15ba1bbed250849c7da9f1) +++ libcfa/src/parseconfig.cfa (revision 9ff71ffc2d8f037adfbd872a7671d1dd4be17691) @@ -112,7 +112,7 @@ -static [ bool ] comments( & ifstream in, [] char name ) { +static [ bool ] comments( & ifstream in, size_t size, [] char name ) { while () { - in | name; + in | wdi( size, name ); if ( eof( in ) ) return true; if ( name[0] != '#' ) return false; @@ -136,6 +136,6 @@ // NOTE: Must add check to see if already read in value for this key, // once we switch to using hash table as intermediate storage - if ( comments( in, key ) ) break; // eof ? - in | value; + if ( comments( in, 64, key ) ) break; // eof ? + in | wdi( 256, value ); add_kv_pair( *kv_pairs, key, value ); Index: tests/io/io.cfa =================================================================== --- tests/io/io.cfa (revision 23edb610217d4c402e15ba1bbed250849c7da9f1) +++ tests/io/io.cfa (revision 9ff71ffc2d8f037adfbd872a7671d1dd4be17691) @@ -10,6 +10,6 @@ // Created On : Wed Mar 2 16:56:02 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jun 29 10:19:31 2023 -// Update Count : 126 +// Last Modified On : Tue Aug 8 23:18:32 2023 +// Update Count : 128 // @@ -104,5 +104,5 @@ in | f | d | ld; // floating point in | fc | dc | ldc; // floating-point complex - in | s1 | wdi( size, s2 ); // C string, length unchecked and checked + in | wdi(size, s1) | wdi( size, s2 ); // C string, length unchecked and checked sout | nl; Index: tests/io/manipulatorsInput.cfa =================================================================== --- tests/io/manipulatorsInput.cfa (revision 23edb610217d4c402e15ba1bbed250849c7da9f1) +++ tests/io/manipulatorsInput.cfa (revision 9ff71ffc2d8f037adfbd872a7671d1dd4be17691) @@ -7,6 +7,6 @@ // Created On : Sat Jun 8 17:58:54 2019 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jun 17 07:56:02 2023 -// Update Count : 48 +// Last Modified On : Wed Aug 9 17:23:21 2023 +// Update Count : 59 // @@ -19,17 +19,17 @@ const char sk[] = "abc"; scanf( "abc " ); scanf( sk ); for ( 5 ) scanf( "%*c" ); printf( "1 %s\n", s ); - scanf( "%s", s ); printf( "2 %s\n", s ); - scanf( "%*s" ); printf( "3 %s\n", s ); - scanf( "%8s", s ); printf( "4 %s\n", s ); - scanf( "%*8s" ); printf( "5 %s\n", s ); + scanf( "%s", s ); printf( "2 %s\n", s ); + scanf( "%*s" ); printf( "3 %s\n", s ); + scanf( "%8s", s ); printf( "4 %s\n", s ); + scanf( "%*8s" ); printf( "5 %s\n", s ); - scanf( "%[abc]", s ); printf( "6 %s\n", s ); - scanf( "%[^abc]", s ); printf( "7 %s\n", s ); - scanf( "%*[abc]" ); printf( "8 %s\n", s ); - scanf( "%*[^abc]" ); printf( "9 %s\n", s ); - scanf( "%8[abc]", s ); printf( "10 %s\n", s ); - scanf( "%8[^abc]", s ); printf( "11 %s\n", s ); - scanf( "%*8[abc]" ); printf( "12 %s\n", s ); - scanf( "%*8[^abc]" ); printf( "13 %s\n", s ); + scanf( "%[abc]", s ); printf( "6 %s\n", s ); + scanf( "%[^abc]", s ); printf( "7 %s\n", s ); + scanf( "%*[abc]" ); printf( "8 %s\n", s ); + scanf( "%*[^abc]" ); printf( "9 %s\n", s ); + scanf( "%8[abc]", s ); printf( "10 %s\n", s ); + scanf( "%8[^abc]", s ); printf( "11 %s\n", s ); + scanf( "%*8[abc]" ); printf( "12 %s\n", s ); + scanf( "%*8[^abc]" ); printf( "13 %s\n", s ); } { @@ -37,118 +37,118 @@ 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; + sin | wdi( sizeof(s), 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; - 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 | wdi( 8, incl( "abc", s ) ); sout | "10" | s; - sin | wdi( 8, excl( "abc", s ) ); sout | "11" | s; - sin | ignore( wdi( 8, incl( "abc", s ) ) ); sout | "12" | s; - sin | ignore( wdi( 8, excl( "abc", s ) ) ); sout | "13" | s; + sin | incl( "abc", wdi( sizeof(s), s ) ); sout | "6" | s; + sin | excl( "abc", wdi( sizeof(s), s ) ); sout | "7" | s; + sin | ignore( incl( "abc", wdi( sizeof(s), s ) ) ); sout | "8" | s; + sin | ignore( excl( "abc", wdi( sizeof(s), 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; } { char c; - sin | c; sout | c; - sin | ignore( c ); sout | c; + sin | c; sout | c; + sin | ignore( c ); sout | c; signed char sc; - sin | sc; sout | sc; - sin | wdi( 3, sc ); sout | sc; - sin | ignore( sc ); sout | sc; - sin | ignore( wdi( 3, sc ) ); sout | sc; + sin | sc; sout | sc; + sin | wdi( 3, sc ); sout | sc; + sin | ignore( sc ); sout | sc; + sin | ignore( wdi( 3, sc ) ); sout | sc; unsigned char usc; - sin | usc; sout | usc; - sin | wdi( 3, usc ); sout | usc; - sin | ignore( usc ); sout | usc; - sin | ignore( wdi( 3, usc ) ); sout | usc; + sin | usc; sout | usc; + sin | wdi( 3, usc ); sout | usc; + sin | ignore( usc ); sout | usc; + sin | ignore( wdi( 3, usc ) ); sout | usc; signed short int ssi; - sin | ssi; sout | ssi; - sin | wdi( 3, ssi ); sout | ssi; - sin | ignore( ssi ); sout | ssi; - sin | ignore( wdi( 3, ssi ) ); sout | ssi; + sin | ssi; sout | ssi; + sin | wdi( 3, ssi ); sout | ssi; + sin | ignore( ssi ); sout | ssi; + sin | ignore( wdi( 3, ssi ) ); sout | ssi; unsigned short int usi; - sin | usi; sout | usi; - sin | wdi( 3, usi ); sout | usi; - sin | ignore( usi ); sout | usi; - sin | ignore( wdi( 3, usi ) ); sout | usi; + sin | usi; sout | usi; + sin | wdi( 3, usi ); sout | usi; + sin | ignore( usi ); sout | usi; + sin | ignore( wdi( 3, usi ) ); sout | usi; signed int si; - sin | si; sout | si; - sin | wdi( 3, si ); sout | si; - sin | ignore( si ); sout | si; - sin | ignore( wdi( 3, si ) ); sout | si; + sin | si; sout | si; + sin | wdi( 3, si ); sout | si; + sin | ignore( si ); sout | si; + sin | ignore( wdi( 3, si ) ); sout | si; unsigned int ui; - sin | ui; sout | ui; - sin | wdi( 3, ui ); sout | ui; - sin | ignore( ui ); sout | ui; - sin | ignore( wdi( 3, ui ) ); sout | ui; + sin | ui; sout | ui; + sin | wdi( 3, ui ); sout | ui; + sin | ignore( ui ); sout | ui; + sin | ignore( wdi( 3, ui ) ); sout | ui; signed long int sli; - sin | sli; sout | sli; - sin | wdi( 3, sli ); sout | sli; - sin | ignore( sli ); sout | sli; - sin | ignore( wdi( 3, sli ) ); sout | sli; + sin | sli; sout | sli; + sin | wdi( 3, sli ); sout | sli; + sin | ignore( sli ); sout | sli; + sin | ignore( wdi( 3, sli ) ); sout | sli; unsigned long int uli; - sin | uli; sout | uli; - sin | wdi( 3, uli ); sout | uli; - sin | ignore( uli ); sout | uli; - sin | ignore( wdi( 3, uli ) ); sout | uli; + sin | uli; sout | uli; + sin | wdi( 3, uli ); sout | uli; + sin | ignore( uli ); sout | uli; + sin | ignore( wdi( 3, uli ) ); sout | uli; signed long long int slli; - sin | slli; sout | slli; - sin | wdi( 3, slli ); sout | slli; - sin | ignore( slli ); sout | slli; - sin | ignore( wdi( 3, slli ) ); sout | slli; + sin | slli; sout | slli; + sin | wdi( 3, slli ); sout | slli; + sin | ignore( slli ); sout | slli; + sin | ignore( wdi( 3, slli ) ); sout | slli; unsigned long long int ulli; - sin | ulli; sout | ulli; - sin | wdi( 3, ulli ); sout | ulli; - sin | ignore( ulli ); sout | ulli; - sin | ignore( wdi( 3, ulli ) ); sout | ulli; + sin | ulli; sout | ulli; + sin | wdi( 3, ulli ); sout | ulli; + sin | ignore( ulli ); sout | ulli; + sin | ignore( wdi( 3, ulli ) ); sout | ulli; float f; - sin | f; sout | f; - sin | wdi( 8, f ); sout | f; - sin | ignore( f ); sout | f; - sin | ignore( wdi( 8, f ) ); sout | f; + sin | f; sout | f; + sin | wdi( 8, f ); sout | f; + sin | ignore( f ); sout | f; + sin | ignore( wdi( 8, f ) ); sout | f; double d; - sin | d; sout | d; - sin | wdi( 8, d ); sout | d; - sin | ignore( d ); sout | d; - sin | ignore( wdi( 8, d ) ); sout | d; + sin | d; sout | d; + sin | wdi( 8, d ); sout | d; + sin | ignore( d ); sout | d; + sin | ignore( wdi( 8, d ) ); sout | d; long double ld; - sin | ld; sout | ld; - sin | wdi( 8, ld ); sout | ld; - sin | ignore( ld ); sout | ld; - sin | ignore( wdi( 8, ld ) ); sout | ld; + sin | ld; sout | ld; + sin | wdi( 8, ld ); sout | ld; + sin | ignore( ld ); sout | ld; + sin | ignore( wdi( 8, ld ) ); sout | ld; float _Complex fc; - sin | fc; sout | fc; - sin | wdi( 8, fc ); sout | fc; - sin | ignore( fc ); sout | fc; - sin | ignore( wdi( 8, fc ) ); sout | fc; + sin | fc; sout | fc; + sin | wdi( 8, fc ); sout | fc; + sin | ignore( fc ); sout | fc; + sin | ignore( wdi( 8, fc ) ); sout | fc; double _Complex dc; - sin | dc; sout | dc; - sin | wdi( 8, dc ); sout | dc; - sin | ignore( dc ); sout | dc; - sin | ignore( wdi( 8, dc ) ); sout | dc; + sin | dc; sout | dc; + sin | wdi( 8, dc ); sout | dc; + sin | ignore( dc ); sout | dc; + sin | ignore( wdi( 8, dc ) ); sout | dc; long double _Complex ldc; - sin | ldc; sout | ldc; - sin | wdi( 8, ldc ); sout | ldc; - sin | ignore( ldc ); sout | ldc; - sin | ignore( wdi( 8, ldc ) ); sout | ldc; + sin | ldc; sout | ldc; + sin | wdi( 8, ldc ); sout | ldc; + sin | ignore( ldc ); sout | ldc; + sin | ignore( wdi( 8, ldc ) ); sout | ldc; } #if defined( __SIZEOF_INT128__ )