benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TreeExplorer: consider refactoring of the functor adaptatiion mechanism

Browse source 
...and in preparation start with some renamings...


The overall goal is to simplify the type signatures and thereby
to make the generates pipelines more assignment compatible.

The debugging experience form the last days indicated that the
current design is not maintainable on the long run. Both the
template instantiation chains and the call stacks are way to
complicated and hard to understand and diagnose
This commit is contained in:
Fischlurch 2018-09-08 23:32:32 +02:00
parent e3ca8548a4
commit 5d4f1015aa
3 changed files with 145 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/iter-chain-search.hpp
View file

@ -95,7 +95,7 @@ namespace iter {
using Filter = decltype( buildSearchFilter(std::declval<SRC>()).asIterator() );
using StepFunctor = std::function<Filter(Filter const&)>;
using StepWrapper = typename iter_explorer::_BoundFunctor<Filter(Filter const&), Filter const&>::Functor;
using StepWrapper = typename iter_explorer::_FunTraits<Filter(Filter const&), Filter const&>::Functor;
// ^^^^^^^^^^^^^ used as argument on generic lambda
using Pipeline = decltype( buildExplorer (std::declval<SRC>(), std::declval<StepFunctor>()) );

26
src/lib/iter-tree-explorer.hpp
View file

@ -473,7 +473,7 @@ namespace lib {
* @tparam SRC the source iterator type to apply when attempting to use a generic lambda as functor
*/
template<class FUN, typename SRC>
struct _BoundFunctor
struct _FunTraits
{
/** handle all regular "function-like" entities */
template<typename F, typename SEL =void>
@ -500,7 +500,7 @@ namespace lib {
/** adapt to a functor, which accesses the source iterator or embedded "state core" */
template<class ARG, class SEL =void>
struct ArgAccessor
struct ArgAdapter
{
using FunArgType = remove_reference_t<Arg>;
static_assert (std::is_convertible<ARG, FunArgType>::value,
@ -511,7 +511,7 @@ namespace lib {
/** adapt to a functor, which accepts the value type of the source sequence ("monadic" usage pattern) */
template<class IT>
struct ArgAccessor<IT, enable_if<__and_<is_convertible<typename IT::value_type, Arg>
struct ArgAdapter<IT, enable_if<__and_<is_convertible<typename IT::value_type, Arg>
,__not_<is_convertible<IT, Arg>>>>> // need to exclude the latter, since IterableDecorator
{ // often seems to accept IT::value_type (while in fact it doesn't)
static auto build() { return [](auto& iter) { return *iter; }; }
@ -519,7 +519,7 @@ namespace lib {
/** adapt to a functor collaborating with an IterSource based iterator pipeline */
template<class IT>
struct ArgAccessor<IT, enable_if<__and_< is_base_of<IterSource<typename IT::value_type>, typename IT::Source>
struct ArgAdapter<IT, enable_if<__and_< is_base_of<IterSource<typename IT::value_type>, typename IT::Source>
, is_base_of<IterSource<typename IT::value_type>, remove_reference_t<Arg>>
> >>
{
@ -538,7 +538,7 @@ namespace lib {
Res
operator() (ARG& arg) const
{
auto accessArg = ArgAccessor<ARG>::build();
auto accessArg = ArgAdapter<ARG>::build();
return boundFunction (accessArg (arg));
}
@ -593,7 +593,7 @@ namespace lib {
* the source iterator wrapped by this decorator.
* @remark since we allow a lot of leeway regarding the actual form and definition of the
* _expansion functor_, there is a lot of minute technical details, mostly confined
* within the _BoundFunctor traits.
* within the _FunTraits traits.
* @tparam SRC the wrapped source iterator, typically a TreeExplorer or nested decorator.
* @tparam FUN the concrete type of the functor passed. Will be dissected to find the signature
*/
@ -602,7 +602,7 @@ namespace lib {
: public SRC
{
static_assert(can_IterForEach<SRC>::value, "Lumiera Iterator required as source");
using _Traits = _BoundFunctor<FUN,SRC>;
using _Traits = _FunTraits<FUN,SRC>;
using ExpandFunctor = typename _Traits::Functor;
using ResIter = typename _DecoratorTraits<typename _Traits::Res>::SrcIter;
@ -782,7 +782,7 @@ namespace lib {
: public SRC
{
static_assert(can_IterForEach<SRC>::value, "Lumiera Iterator required as source");
using _Traits = _BoundFunctor<FUN,SRC>;
using _Traits = _FunTraits<FUN,SRC>;
using Res = typename _Traits::Res;
using TransformFunctor = typename _Traits::Functor;
@ -869,7 +869,7 @@ namespace lib {
: public SRC
{
static_assert(can_IterForEach<SRC>::value, "Lumiera Iterator required as source");
using _Traits = _BoundFunctor<FUN,SRC>;
using _Traits = _FunTraits<FUN,SRC>;
using Res = typename _Traits::Res;
static_assert(std::is_constructible<bool, Res>::value, "Functor must be a predicate");
@ -967,7 +967,7 @@ namespace lib {
* be mixed and combined. To allow for this flexibility, we need to drive the _base class_
* with the most general form of a predicate functor, corresponding to `bool<SRC&>`.
* Hereby we exploit the fact that the _wrapped filter,_ i.e. the Functor type constructed
* in the _BoundFunctor traits, boils down to that most generic form, adapting the arguments
* in the _FunTraits traits, boils down to that most generic form, adapting the arguments
* automatically. Thus the initial functor, the one passed to the ctor of this class, is
* effectively wrapped twice, so it can be combined later on with any other form and
* shape of functor. And since everything is inline, the compiler will remove any
@ -975,9 +975,9 @@ namespace lib {
*/
template<class SRC, class FUN>
class MutableFilter
: public Filter<SRC, typename _BoundFunctor<FUN,SRC>::Functor>
: public Filter<SRC, typename _FunTraits<FUN,SRC>::Functor>
{
using _Traits = _BoundFunctor<FUN,SRC>;
using _Traits = _FunTraits<FUN,SRC>;
using FilterPredicate = typename _Traits::Functor;
using _Base = Filter<SRC,FilterPredicate>;
@ -1119,7 +1119,7 @@ namespace lib {
void
remouldFilter (COND&& additionalClause, COMB buildCombinedClause)
{
using _ChainTraits = _BoundFunctor<COND,SRC>;
using _ChainTraits = _FunTraits<COND,SRC>;
using Res = typename _ChainTraits::Res;
static_assert(std::is_constructible<bool, Res>::value, "Chained Functor must be a predicate");

131
wiki/thinkPad.ichthyo.mm
View file

@ -25129,6 +25129,56 @@
<arrowlink COLOR="#cc3e57" DESTINATION="ID_1665477644" ENDARROW="Default" ENDINCLINATION="-4110;-2852;" ID="Arrow_ID_1163013232" STARTARROW="None" STARTINCLINATION="1631;0;"/>
<icon BUILTIN="pencil"/>
</node>
<node CREATED="1536441983485" ID="ID_330124350" MODIFIED="1536442038343" TEXT="Warnung: anonymous namespace">
<richcontent TYPE="NOTE"><html>
<head>
</head>
<body>
<p>
...ist mir nicht v&#246;llig klar, warum das bei einigen Includes auftritt,
</p>
<p>
und bei anderen nicht. Beispiel
</p>
<p>
</p>
<p>
In file included from src/lib/diff/test-mutation-target.hpp:55:0,
</p>
<p>
&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;from tests/library/diff/diff-complex-application-test.cpp:35:
</p>
<p>
src/lib/test/event-log.hpp:96:9: warning: 'lib::test::EventMatch' has a field 'lib::test::EventMatch::solution_' whose type uses the anonymous namespace [-Wsubobject-linkage]
</p>
<p>
&#160;&#160;&#160;class EventMatch
</p>
<p>
&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;^~~~~~~~~~
</p>
<p>
In file included from src/lib/diff/test-mutation-target.hpp:55:0,
</p>
<p>
&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;from tests/library/diff/tree-mutator-binding-test.cpp:32:
</p>
<p>
src/lib/test/event-log.hpp:96:9: warning: 'lib::test::EventMatch' has a field 'lib::test::EventMatch::solution_' whose type uses the anonymous namespace [-Wsubobject-linkage]
</p>
<p>
&#160;&#160;&#160;class EventMatch
</p>
<p>
&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;^~~~~~~~~~
</p>
</body>
</html>
</richcontent>
<icon BUILTIN="messagebox_warning"/>
</node>
</node>
</node>
</node>
@ -31176,6 +31226,87 @@
<node CREATED="1536409761248" ID="ID_753549743" MODIFIED="1536409843345" TEXT="Quelle == Basis-Typ"/>
<node CREATED="1536409788637" ID="ID_87247261" MODIFIED="1536409835506" TEXT="bei Transofmation: neuer value_type"/>
</node>
<node CREATED="1536420551954" ID="ID_1265946119" MODIFIED="1536420561095" TEXT="Rolle der Traits">
<node CREATED="1536420562706" ID="ID_1510273577" MODIFIED="1536420573085" TEXT="Baumuster erkennen">
<node CREATED="1536420576968" ID="ID_1438017036" MODIFIED="1536420618407" TEXT="monadisch: res(val)"/>
<node CREATED="1536420581231" ID="ID_790634219" MODIFIED="1536420608360" TEXT="imperativ: res(SRC&amp;)"/>
</node>
<node CREATED="1536420632457" ID="ID_1027876524" MODIFIED="1536420638164" TEXT="Signatur abnehmen"/>
<node CREATED="1536420639016" ID="ID_221776251" MODIFIED="1536420654441" TEXT="Funktor(Holder)-Typ konstruieren"/>
<node CREATED="1536420659869" ID="ID_176968684" MODIFIED="1536420669838" TEXT="Resultat">
<icon BUILTIN="idea"/>
<node CREATED="1536420671212" ID="ID_1077375672" MODIFIED="1536420678038" TEXT="Funktor(Holder)-Typ"/>
<node CREATED="1536420678842" ID="ID_1524886712" MODIFIED="1536420681830" TEXT="Ergebnis-Typ"/>
</node>
</node>
<node CREATED="1536420803778" ID="ID_1315131204" MODIFIED="1536420809629" TEXT="Funktions-Signatur verbergen">
<node CREATED="1536420811265" ID="ID_1167994865" MODIFIED="1536420823683" TEXT="reduzieren auf res(SRC)"/>
<node CREATED="1536420824983" ID="ID_784540518" MODIFIED="1536420836185" TEXT="konkrete Funktion in Adapter setzen"/>
<node CREATED="1536420932944" ID="ID_512498364" MODIFIED="1536420940219" TEXT="ArgAccessor beim Aufruf">
<node CREATED="1536420941519" ID="ID_1927165900" MODIFIED="1536420945112" TEXT="kann wegfallen">
<icon BUILTIN="button_cancel"/>
</node>
<node CREATED="1536420945998" ID="ID_582317324" MODIFIED="1536420989876" TEXT="trotzdem notwendig">
<icon BUILTIN="help"/>
<node CREATED="1536420950054" ID="ID_1462776992" MODIFIED="1536420952593" TEXT="wegen Expander">
<node CREATED="1536421001935" ID="ID_1416192275" MODIFIED="1536421016769" TEXT="unterschiedliche Iter-Typen m&#xf6;glich"/>
<node CREATED="1536421023732" ID="ID_293881968" MODIFIED="1536421035374" TEXT="in beiden Baumuster-F&#xe4;llen"/>
</node>
<node CREATED="1536421204268" ID="ID_1225988621" MODIFIED="1536421235479">
<richcontent TYPE="NODE"><html>
<head>
</head>
<body>
<p>
Konsequenz: brauche <b>Template</b>&#160;Funktions-Operator
</p>
</body>
</html>
</richcontent>
</node>
</node>
</node>
</node>
</node>
<node CREATED="1536441211468" ID="ID_435661366" MODIFIED="1536441216296" TEXT="L&#xf6;sungs-Idee">
<node CREATED="1536441217427" ID="ID_1508660342" MODIFIED="1536441270931" TEXT="die Signatur im Builder konstruieren. Traits nur noch auf Signatur abst&#xfc;tzen">
<icon BUILTIN="full-1"/>
</node>
<node CREATED="1536441337478" ID="ID_1343620192" MODIFIED="1536441363753" TEXT="Traits bieten nun einen Funktor-Konstruktur">
<icon BUILTIN="full-2"/>
<node CREATED="1536441426912" ID="ID_1985454424" MODIFIED="1536441520374">
<richcontent TYPE="NODE"><html>
<head>
</head>
<body>
<p>
der Funktor f&#252;r den Expander wird <i>explizit als Sonderfall</i>&#160; aufgefa&#223;t
</p>
</body>
</html>
</richcontent>
<richcontent TYPE="NOTE"><html>
<head>
</head>
<body>
<p>
das <i>eigentliche Problem </i>mit der bestehenden L&#246;sung ist,
</p>
<p>
da&#223; ich ausgerechnet mit diesem Sonderfall angefangen habe.
</p>
<p>
Daher ist jetzt das gesamte Design &quot;anders herum&quot;
</p>
</body>
</html>
</richcontent>
</node>
<node CREATED="1536441367354" ID="ID_1778093460" MODIFIED="1536441424596" TEXT="welcher eine gegebene Funktion in eine vorgegebene function&lt;SIG&gt; einpasst"/>
</node>
</node>
</node>
</node>