Index: tests/list/.expect/dlist2-insert-remove.txt =================================================================== --- tests/list/.expect/dlist2-insert-remove.txt (revision 3151bc098c7455c35a93a8f6de9f47dc4f0a07eb) +++ tests/list/.expect/dlist2-insert-remove.txt (revision 3151bc098c7455c35a93a8f6de9f47dc4f0a07eb) @@ -0,0 +1,1 @@ +dlist-insert-remove.txt Index: tests/list/dlist-insert-remove.cfa =================================================================== --- tests/list/dlist-insert-remove.cfa (revision eb0d9b7d937213cd3bc39235c18121a496cbb52f) +++ tests/list/dlist-insert-remove.cfa (revision 3151bc098c7455c35a93a8f6de9f47dc4f0a07eb) @@ -1,7 +1,15 @@ +#ifdef __TEMP_DLIST_V2__ +#include +#else #include -#include +#endif #include - -// Section 1: replaced by above include list.hfa +// NO including fstream.hfa (use printf, not sout) +// Because fstream depends on threading library, which depends on list. +// This test must stay runnable after changing lists, +// before fixing any threading library dependencies on the prior list implementation. + + +// Former Section 1: replaced by above include list.hfa @@ -58,5 +66,5 @@ with( DLINK_VIA( fred, fred.mine ) ) do { - sout | f.adatum; + printf( "%g\n", f.adatum ); } while (advance( f )); } @@ -65,5 +73,5 @@ with( DLINK_VIA( fred, fred.mine ) ) do { - sout | f.adatum; + printf( "%g\n", f.adatum ); } while (recede( f )); } @@ -72,19 +80,19 @@ void printMyFreddies(fred &f1, fred &f2, int isBefore) { if (isBefore) { - sout | "==== fred by MINE before "; + printf( "==== fred by MINE before \n" ); } else { - sout | "==== fred by MINE after "; + printf( "==== fred by MINE after \n" ); } if (&f1) { - printMyFredsFwd(f1); sout | '-'; - printMyFredsRev(f1); sout | '-'; + printMyFredsFwd(f1); printf( "-\n" ); + printMyFredsRev(f1); printf( "-\n" ); } else { - sout | '-'; sout | '-'; + printf( "-\n" ); printf( "-\n" ); } if (&f2) { - printMyFredsFwd(f2); sout | '-'; - printMyFredsRev(f2); sout | '-'; + printMyFredsFwd(f2); printf( "-\n" ); + printMyFredsRev(f2); printf( "-\n" ); } else { - sout | '-'; sout | '-'; + printf( "-\n" ); printf( "-\n" ); } } @@ -93,5 +101,5 @@ with( DLINK_VIA( fred, fred.yours ) ) do { - sout | f.adatum; + printf( "%g\n", f.adatum ); } while (advance( f )); } @@ -100,5 +108,5 @@ with( DLINK_VIA( fred, fred.yours ) ) do { - sout | f.adatum; + printf( "%g\n", f.adatum ); } while (recede( f )); } @@ -106,19 +114,19 @@ void printYourFreddies(fred &f1, fred &f2, int isBefore) { if (isBefore) { - sout | "==== fred by YOURS before "; + printf( "==== fred by YOURS before \n" ); } else { - sout | "==== fred by YOURS after "; + printf( "==== fred by YOURS after \n" ); } if (&f1) { - printYourFredsFwd(f1); sout | '-'; - printYourFredsRev(f1); sout | '-'; + printYourFredsFwd(f1); printf( "-\n" ); + printYourFredsRev(f1); printf( "-\n" ); } else { - sout | '-'; sout | '-'; + printf( "-\n" ); printf( "-\n" ); } if (&f2) { - printYourFredsFwd(f2); sout | '-'; - printYourFredsRev(f2); sout | '-'; + printYourFredsFwd(f2); printf( "-\n" ); + printYourFredsRev(f2); printf( "-\n" ); } else { - sout | '-'; sout | '-'; + printf( "-\n" ); printf( "-\n" ); } } @@ -126,5 +134,5 @@ void printMariesFwd(mary &m) { do { - sout | m.anotherdatum; + printf( "%g\n", m.anotherdatum ); } while (advance( m )); } @@ -132,5 +140,5 @@ void printMariesRev(mary &m) { do { - sout | m.anotherdatum; + printf( "%g\n", m.anotherdatum ); } while (recede( m )); } @@ -138,19 +146,19 @@ void printMariatheotokos(mary &m1, mary &m2, int isBefore) { if (isBefore) { - sout | "==== mary before "; + printf( "==== mary before \n" ); } else { - sout | "==== mary after "; + printf( "==== mary after \n" ); } if (&m1) { - printMariesFwd(m1); sout | '-'; - printMariesRev(m1); sout | '-'; + printMariesFwd(m1); printf( "-\n" ); + printMariesRev(m1); printf( "-\n" ); } else { - sout | '-'; sout | '-'; + printf( "-\n" ); printf( "-\n" ); } if (&m2) { - printMariesFwd(m2); sout | '-'; - printMariesRev(m2); sout | '-'; + printMariesFwd(m2); printf( "-\n" ); + printMariesRev(m2); printf( "-\n" ); } else { - sout | '-'; sout | '-'; + printf( "-\n" ); printf( "-\n" ); } } @@ -1636,287 +1644,287 @@ int main() { #if 0 - sout | "~~~~~~~~~~~~~~~~~ Headless List Tests - insert_after ~~~~~~~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 1-i: Modifying Freds on MINE "; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~ Headless List Tests - insert_after ~~~~~~~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 1-i: Modifying Freds on MINE \n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertafter_singleton_on_singleton__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 2-i. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 2-i. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertafter_singleton_on_singleton__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 3-i. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 3-i. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertafter_singleton_on_singleton__mary(); - sout | ""; - sout | "~~~~~~~~~~~~~~~~ Headless List Tests - insert_before ~~~~~~~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 1-ii: Modifying Freds on MINE "; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~~~~~~~ Headless List Tests - insert_before ~~~~~~~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 1-ii: Modifying Freds on MINE \n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertbefore_singleton_on_singleton__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 2-ii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 2-ii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertbefore_singleton_on_singleton__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 3-ii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 3-ii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertbefore_singleton_on_singleton__mary(); #endif - sout | ""; - sout | "~~~~~~~~~~~~~~~~~ Headed List Tests - insert_first ~~~~~~~~~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 4-i: Modifying Freds on MINE "; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~~~~~~~~ Headed List Tests - insert_first ~~~~~~~~~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 4-i: Modifying Freds on MINE \n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertfirst_two_on_empty__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 5-i: Modifying Freds on YOURS "; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 5-i: Modifying Freds on YOURS \n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertfirst_two_on_empty__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 6-i. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 6-i. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertfirst_two_on_empty__mary(); - sout | ""; - sout | "~~~~~~~~~~~~~~~~~ Headed List Tests - insert_last ~~~~~~~~~~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 4-ii: Modifying Freds on MINE "; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~~~~~~~~ Headed List Tests - insert_last ~~~~~~~~~~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 4-ii: Modifying Freds on MINE \n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertlast_two_on_empty__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 5-ii: Modifying Freds on YOURS "; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 5-ii: Modifying Freds on YOURS \n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertlast_two_on_empty__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 6-ii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 6-ii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertlast_two_on_empty__mary(); - sout | ""; - sout | "~~~~~~~~~~~ Element ops on Headed List Tests: after, last ~~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 7-i. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~~ Element ops on Headed List Tests: after, last ~~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 7-i. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertafter_after_last__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 8-i. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 8-i. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertafter_after_last__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 9-i. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 9-i. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertafter_after_last__mary(); - sout | ""; - sout | "~~~~~~~~~~ Element ops on Headed List Tests: before, first ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 7-ii. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ Element ops on Headed List Tests: before, first ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 7-ii. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertbefore_before_first__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 8-ii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 8-ii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertbefore_before_first__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 9-ii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 9-ii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__insertbefore_before_first__mary(); #if 0 - sout | ""; - sout | "~~~~~~~~~~ Element removal tests on Headless List: mid ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 10-i. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ Element removal tests on Headless List: mid ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 10-i. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_mid__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 11-i. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 11-i. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_mid__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 12-i. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 12-i. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_mid__mary(); - sout | ""; - sout | "~~~~~~~~~~ Element removal tests on Headless List: at first ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 10-ii. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ Element removal tests on Headless List: at first ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 10-ii. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_first__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 11-ii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 11-ii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_first__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 12-ii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 12-ii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_first__mary(); - sout | ""; - sout | "~~~~~~~~~~ Element removal tests on Headless List: at last ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 10-iii. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ Element removal tests on Headless List: at last ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 10-iii. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_last__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 11-iii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 11-iii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_last__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 12-iii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 12-iii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_last__mary(); #endif - sout | ""; - sout | "~~~~~~~~~~ Element removal tests on Headed List: at first ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 13-i. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ Element removal tests on Headed List: at first ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 13-i. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_head__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 14-i. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 14-i. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_head__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 15-i. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 15-i. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_head__mary(); - sout | ""; - sout | "~~~~~~~~~~ Element removal tests on Headed List: at last ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 13-ii. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ Element removal tests on Headed List: at last ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 13-ii. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_tail__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 14-ii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 14-ii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_tail__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 15-ii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 15-ii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_at_tail__mary(); - sout | ""; - sout | "~~~~~~~~~~ Element removal tests on Headed List: of sole ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 13-iii. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ Element removal tests on Headed List: of sole ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 13-iii. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_of_sole__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 14-iii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 14-iii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_of_sole__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 15-iii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 15-iii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__remove_of_sole__mary(); - sout | ""; - sout | "~~~~~~~~~~ End removal tests on Headed List: First ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 16-i. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ End removal tests on Headed List: First ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 16-i. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__pop_first__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 16-ii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 16-ii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__pop_first__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 16-iii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 16-iii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__pop_first__maries(); - sout | ""; - sout | "~~~~~~~~~~ End removal tests on Headed List: Last ~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 17-i. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~ End removal tests on Headed List: Last ~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 17-i. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__pop_last__fred_mine(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 17-ii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 17-ii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__pop_last__fred_yours(); - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 17-iii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 17-iii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__pop_last__maries(); - sout | ""; - sout | "~~~~~~~~~~~~~~~~~~~ Ease-of-access cases ~~~~~~~~~~~~~~~~~~"; - sout | ""; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 18-i. Modifying Freds on MINE"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Not implmented"; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 18-ii. Modifying Freds on YOURS"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Not implmented"; - - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; - sout | "Test 18-iii. Modifying Maries"; - sout | "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; + printf( "\n" ); + printf( "~~~~~~~~~~~~~~~~~~~ Ease-of-access cases ~~~~~~~~~~~~~~~~~~\n" ); + printf( "\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 18-i. Modifying Freds on MINE\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Not implmented\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 18-ii. Modifying Freds on YOURS\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Not implmented\n" ); + + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); + printf( "Test 18-iii. Modifying Maries\n" ); + printf( "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" ); test__accessor_cases__mary(); Index: tests/list/dlist2-insert-remove.cfa =================================================================== --- tests/list/dlist2-insert-remove.cfa (revision 3151bc098c7455c35a93a8f6de9f47dc4f0a07eb) +++ tests/list/dlist2-insert-remove.cfa (revision 3151bc098c7455c35a93a8f6de9f47dc4f0a07eb) @@ -0,0 +1,2 @@ +#define __TEMP_DLIST_V2__ +#include "dlist-insert-remove.cfa"