Index: tests/collections/.expect/string-istream-manip.txt =================================================================== --- tests/collections/.expect/string-istream-manip.txt (revision 8cffa4f21ad8d447fa5f37d523e6acfb4906f3d0) +++ tests/collections/.expect/string-istream-manip.txt (revision 0860d9c0c788c565776cbf08f223cede6a4d6ebc) @@ -1,2 +1,58 @@ +preS1 0123456 +preS1 x +preS2 01234567 +preS2 x +preS3 012345678 +preS3 x +preS4 0123456789 +preS4 x +preSMN1 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456 +preSMN1 x +preSMN2 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567 +preSMN2 x +preSMN3 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678 +preSMN3 x +preSMN4 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789 +preSMN4 x +preRMN1 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456 +preRMN1 x +preRMN2 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567 +preRMN2 x +preRMN3 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678 +preRMN3 x +preRMN4 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789 +preRMN4 x +preSMI1 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSMI1 "x" +preSMI2 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSMI2 "x" +preSMI3 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSMI3 "x" +preSMI4 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSMI4 "x" +preSME1 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSME1 "x" +preSME2 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSME2 "x" +preSME3 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSME3 "x" +preSME4 "...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... " +preSME4 "x" +preSMG1 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456 +preSMG1 x +preSMG2 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567 +preSMG2 x +preSMG3 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678 +preSMG3 x +preSMG4 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789 +preSMG4 x +preSMD1 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456 +preSMD1 x +preSMD2 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567 +preSMD2 x +preSMD3 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678 +preSMD3 x +preSMD4 ...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789 +preSMD4 x 1 yyyyyyyyyyyyyyyyyyyy 2 abcxxx Index: tests/collections/.in/string-istream-manip.txt =================================================================== --- tests/collections/.in/string-istream-manip.txt (revision 8cffa4f21ad8d447fa5f37d523e6acfb4906f3d0) +++ tests/collections/.in/string-istream-manip.txt (revision 0860d9c0c788c565776cbf08f223cede6a4d6ebc) @@ -1,2 +1,34 @@ +0123456 x +01234567 x +012345678 x +0123456789 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789 x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:... -x- +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456 +x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567 +x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678 +x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789 +x +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456@x@ +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...01234567@x@ +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...012345678@x@ +...:...:...:...|...:...:...:...|...:...:...:...|...:...:...:...#...:...:...:...|...:...:...:...|...:...:...:...|...:...0123456789@x@ abc cccccb Index: tests/collections/string-istream-manip.cfa =================================================================== --- tests/collections/string-istream-manip.cfa (revision 8cffa4f21ad8d447fa5f37d523e6acfb4906f3d0) +++ tests/collections/string-istream-manip.cfa (revision 0860d9c0c788c565776cbf08f223cede6a4d6ebc) @@ -3,6 +3,139 @@ #include #include +#include + +// No-op manipulators. +// Temporary hack while there are two code paths in the string implementation. +// (One for reading plain strings, the other for reading via a manipulator.) +// The test cases that use plainjane(-) are exercising the via-manipulator code path, +// just with trivial manipulation. +static _Istream_Sstr plainjane( string & s ) { return (_Istream_Sstr)@{ s, {{0p}, -1, {.flags.rwd : false}} }; } +static _Istream_Rstr plainjane( string_res & s ) { return (_Istream_Rstr)@{ &s, {{0p}, -1, {.flags.rwd : false}} }; } + +static void forceStringHeapFreeSpaceTo(int desiredSize) { + for (1_000_000) { + string x = "a"; + (void)x; + if (desiredSize == DEBUG_string_bytes_avail_until_gc(DEBUG_string_heap())) return; + } + sout | "Unable to force size" | desiredSize | "in 1,000,000 tries"; +} int main() { + // These "pre" cases deal with issues analogous to the "pre" cases of io/manipulatorsInput. + // The acceptance criterion is simpler but driving the cases is harder. + // The tests just read strings and echo what they read; acceptance of simple echoing assures + // no spurious splitting merging. + // The lengths of the strings are chosen to match white-box knowledge of when the string layer + // has tor drive the cstring layer through a second iteration: + // - for no-manip, lengths are near the room at end of string heap + // (chosen target size of 9 showed the original bug on preS2, aligned with the other cases) + // - for manip, lengths are near the auxiliary buffer size of 128 + // Only first case repeats for string_res; rest run only from the passthru string layer. + // Similarly, the manipulator breadth isn't checked at the cstring layer either. + { + // S: string, no manipulator + void echoTillX(const char * casename) { + string s; + do { + forceStringHeapFreeSpaceTo(9); + sin | s; + sout | casename | s; + } while ( size(s) > 0 && s[size(s)-1] != 'x' ); + } + echoTillX("preS1"); + echoTillX("preS2"); + echoTillX("preS3"); + echoTillX("preS4"); + } + { + // SMN: string, manipulator for no-op + void echoTillX(const char * casename) { + string s; + do { + sin | plainjane( s ); + sout | casename | s; + } while ( size(s) > 0 && s[size(s)-1] != 'x' ); + } + echoTillX("preSMN1"); + echoTillX("preSMN2"); + echoTillX("preSMN3"); + echoTillX("preSMN4"); + } + { + // RMN: string_res, manipulator for no-op + void echoTillX(const char * casename) { + string_res s; + do { + sin | plainjane( s ); + sout | casename | s; + } while ( size(s) > 0 && s[size(s)-1] != 'x' ); + } + echoTillX("preRMN1"); + echoTillX("preRMN2"); + echoTillX("preRMN3"); + echoTillX("preRMN4"); + } + { + // SMI: string, manipulator `incl` + void echoTillX(const char * casename) { + string s; + do { + sin | skip("-\n"); + sin | incl( ".:|# x", s ); + sout | casename | " \"" | s | "\""; + } while ( size(s) > 0 && s[size(s)-1] != 'x' ); + } + echoTillX("preSMI1"); + echoTillX("preSMI2"); + echoTillX("preSMI3"); + echoTillX("preSMI4"); + } + { + // SME: string, manipulator `excl` + void echoTillX(const char * casename) { + string s; + do { + sin | skip("-\n"); + sin | excl( "-\n", s ); + sout | casename | " \"" | s | "\""; + } while ( size(s) > 0 && s[size(s)-1] != 'x' ); + } + echoTillX("preSME1"); + echoTillX("preSME2"); + echoTillX("preSME3"); + echoTillX("preSME4"); + } + sin | skip("-\n"); + { + // SMG: string, manipulator `getline` + void echoTillX(const char * casename) { + string s; + do { + sin | getline( s ); + sout | casename | s; + } while ( size(s) > 0 && s[size(s)-1] != 'x' ); + } + echoTillX("preSMG1"); + echoTillX("preSMG2"); + echoTillX("preSMG3"); + echoTillX("preSMG4"); + } + { + // SMD: string, manipulator (`getline` with custom) delimiter + void echoTillX(const char * casename) { + string s; + do { + sin | getline( s, '@' ); + sout | casename | s; + } while ( size(s) > 0 && s[size(s)-1] != 'x' ); + sin | skip(" \n"); + } + echoTillX("preSMD1"); + echoTillX("preSMD2"); + echoTillX("preSMD3"); + echoTillX("preSMD4"); + } + /* Keep harmonized with io/manipulatorsInput */ { @@ -31,4 +164,5 @@ sin | "\n"; } + // Full repeat on string_res layer assures the full manipulator vocabulary is supported there. { string_res s = "yyyyyyyyyyyyyyyyyyyy";