diff --git a/src/lib/iter-tree-explorer.hpp b/src/lib/iter-tree-explorer.hpp index 870747646..650db48cc 100644 --- a/src/lib/iter-tree-explorer.hpp +++ b/src/lib/iter-tree-explorer.hpp @@ -885,8 +885,8 @@ namespace lib { void expandChildren() { - pullFilter(); SRC::expandChildren(); + pullFilter(); } public: /* === Iteration control API for IterableDecorator === */ diff --git a/tests/library/iter-tree-explorer-test.cpp b/tests/library/iter-tree-explorer-test.cpp index 02c5d4021..39e9e08d3 100644 --- a/tests/library/iter-tree-explorer-test.cpp +++ b/tests/library/iter-tree-explorer-test.cpp @@ -785,13 +785,15 @@ namespace test{ // contrived example to verify interplay of filtering and child expansion; // especially note that the filter is re-evaluated after expansion happened. - cout << "VERIFY->" - < 10-9-8-7-6-5-4-3-2-1-3-2-1-7-6-5-4-3-2-1-3-2-1 + .filter([](uint i){ return i%2 == 0; }) + .expandAll() // Note: sends the expandChildren down through the filter + ) + == "10-8-6-4-2-2-6-4-2-2"); + + // another convoluted example to demonstrate // - a filter predicate with side-effect diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 172ad8055..c4a24a536 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -30745,8 +30745,8 @@ - - + + @@ -30780,8 +30780,8 @@ - - + +