From acc77654d1c592aca2083eb564f1a406b7c3a207 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 7 Jun 2025 01:07:36 +0200 Subject: [PATCH] clean-up: can now switch remaining downstream usages after all the relevant library components do support both kinds of type sequences transparently, any usages in core code can now be switched over to the new, variadic type sequences. --- src/lib/diff/gen-node.hpp | 2 +- src/lib/meta/tuple-helper.hpp | 2 +- src/lib/time/formats.hpp | 4 +-- src/lib/variant.hpp | 6 ++-- src/lib/visitor.hpp | 2 +- src/lib/wrapperptr.hpp | 7 ++-- src/stage/model/element-access.hpp | 4 +-- src/steam/config-resolver.hpp | 13 ++++--- src/steam/control/command-def.hpp | 1 - src/steam/control/command-signature.hpp | 8 ++--- src/steam/control/command.hpp | 2 +- .../applicable-builder-target-types.hpp | 15 ++++---- src/steam/mobject/builder/buildertool.hpp | 2 +- src/steam/mobject/output-designation.hpp | 2 +- src/steam/mobject/session/session-impl.hpp | 20 +++++------ .../mobject/session/session-services.hpp | 2 +- tests/basics/time/format-support-test.cpp | 4 +-- tests/basics/time/time-control-test.cpp | 14 ++++---- tests/basics/visitingtool-extended-test.cpp | 4 +-- tests/basics/visitingtool-test.cpp | 2 +- .../control/command-clone-builder-test.cpp | 2 +- .../steam/control/command-equality-test.cpp | 2 +- .../steam/control/command-mutation-test.cpp | 4 +-- .../steam/control/command-registry-test.cpp | 2 +- .../control/handling-pattern-basics-test.cpp | 4 +-- .../mobject/builder/builder-tool-test.cpp | 2 +- .../session/session-service-access-test.cpp | 10 +++--- tests/library/meta/generator-test.cpp | 14 ++++---- tests/library/meta/meta-utils-test.cpp | 12 +++---- tests/library/variant-test.cpp | 4 +-- wiki/thinkPad.ichthyo.mm | 36 +++++++++---------- 31 files changed, 101 insertions(+), 107 deletions(-) diff --git a/src/lib/diff/gen-node.hpp b/src/lib/diff/gen-node.hpp index 3bc1cb464..5311650b5 100644 --- a/src/lib/diff/gen-node.hpp +++ b/src/lib/diff/gen-node.hpp @@ -132,7 +132,7 @@ namespace diff{ using Rec = Record; using RecRef = RecordRef; using MakeRec = Rec::Mutator; - using DataValues = meta::TyOLD const& tuple) { - using BuildAccessor = BuildTupleAccessor>; + using BuildAccessor = BuildTupleAccessor>; using Displayer = typename BuildAccessor::Product ; return static_cast (tuple) diff --git a/src/lib/time/formats.hpp b/src/lib/time/formats.hpp index c26b84518..2edd02e83 100644 --- a/src/lib/time/formats.hpp +++ b/src/lib/time/formats.hpp @@ -166,7 +166,7 @@ namespace time { /* == Descriptor to define Support for specific formats == */ - using lib::meta::TyOLD; + using lib::meta::TySeq; using lib::meta::Node; using lib::meta::Nil; @@ -238,7 +238,7 @@ namespace time { : Supported { SupportStandardTimecode() - : Supported(formats< TyOLD >()) + : Supported(formats< TySeq >()) { } }; diff --git a/src/lib/variant.hpp b/src/lib/variant.hpp index 308f27956..05aada5c3 100644 --- a/src/lib/variant.hpp +++ b/src/lib/variant.hpp @@ -98,7 +98,7 @@ namespace lib { namespace variant { // implementation metaprogramming helpers using std::remove_reference; - using meta::TyOLD; + using meta::TySeq; using meta::Node; using meta::Nil; @@ -159,8 +159,8 @@ namespace lib { }; template class _P_> - struct FirstMatchingType, _P_> - : FirstMatchingType::List, _P_> + struct FirstMatchingType, _P_> + : FirstMatchingType::List, _P_> { }; template class _P_> diff --git a/src/lib/visitor.hpp b/src/lib/visitor.hpp index 5a5dac9bb..1494e2570 100644 --- a/src/lib/visitor.hpp +++ b/src/lib/visitor.hpp @@ -171,7 +171,7 @@ namespace visitor { } }; - using typelist::TyOLD; // convenience for the user of "Applicable" + using typelist::TySeq; // convenience for the user of "Applicable" diff --git a/src/lib/wrapperptr.hpp b/src/lib/wrapperptr.hpp index b72fd3e17..d7d1828ab 100644 --- a/src/lib/wrapperptr.hpp +++ b/src/lib/wrapperptr.hpp @@ -36,10 +36,9 @@ namespace steam { namespace mobject { class MObject; } - typedef lib::meta::TyOLD < mobject::Placement* - , lib::P* - > ::List - WrapperTypes; + using WrapperTypes = lib::meta::TySeq< mobject::Placement* + , lib::P* + > ::List; } namespace lumiera { diff --git a/src/stage/model/element-access.hpp b/src/stage/model/element-access.hpp index 0cdcae68f..af13a2bc2 100644 --- a/src/stage/model/element-access.hpp +++ b/src/stage/model/element-access.hpp @@ -63,7 +63,7 @@ namespace model { namespace error = lumiera::error; using interact::UICoord; - using lib::meta::TyOLD; + using lib::meta::TySeq; using std::string; class Tangible; @@ -91,7 +91,7 @@ namespace model { protected: - using RawResult = lib::Variant>; + using RawResult = lib::Variant>; /** @internal drill down according to coordinates, maybe create element */ virtual RawResult performAccessTo (UICoord::Builder &, size_t limitCreation) =0; diff --git a/src/steam/config-resolver.hpp b/src/steam/config-resolver.hpp index 0b7279969..32084b363 100644 --- a/src/steam/config-resolver.hpp +++ b/src/steam/config-resolver.hpp @@ -61,13 +61,12 @@ namespace steam { * the list of all concrete types participating in the * rule based config query system */ - typedef lib::meta::TyOLD < steam::mobject::session::Fork - , steam::asset::Pipe - , const steam::asset::ProcPatt - , steam::asset::Timeline - , steam::asset::Sequence - > ::List - InterfaceTypes; + using InterfaceTypes = lib::meta::TySeq < steam::mobject::session::Fork + , steam::asset::Pipe + , const steam::asset::ProcPatt + , steam::asset::Timeline + , steam::asset::Sequence + > ::List; /** * user-visible Interface to the ConfigRules subsystem. diff --git a/src/steam/control/command-def.hpp b/src/steam/control/command-def.hpp index 420338706..d93cea8b5 100644 --- a/src/steam/control/command-def.hpp +++ b/src/steam/control/command-def.hpp @@ -77,7 +77,6 @@ namespace control { using lib::Symbol; using lib::meta::_Fun; - using lib::meta::TyOLD; using lib::meta::Tuple; diff --git a/src/steam/control/command-signature.hpp b/src/steam/control/command-signature.hpp index 58727e0c0..d1505ae12 100644 --- a/src/steam/control/command-signature.hpp +++ b/src/steam/control/command-signature.hpp @@ -59,7 +59,7 @@ namespace control { using lib::meta::BuildFunType; using lib::meta::_Fun; - using lib::meta::TyOLD; + using lib::meta::TySeq; using lib::meta::Append; using lib::meta::PickLast; @@ -77,7 +77,7 @@ namespace control { using Args = typename _Fun::Args; using ArgList = typename Args::List; using ExtendedArglist = typename Append::List; - using ExtendedArgs = typename TyOLD::Seq; + using ExtendedArgs = typename TySeq::Seq; public: using OperateSig = typename BuildFunType::Sig; @@ -118,7 +118,7 @@ namespace control { using Memento = RET; using ExtendedArglist = typename Append::List; - using ExtendedArgs = typename TyOLD::Seq; + using ExtendedArgs = typename TySeq::Seq; using OperateSig = typename BuildFunType::Sig; using CaptureSig = typename BuildFunType::Sig; @@ -132,7 +132,7 @@ namespace control { using Memento = typename PickLast::Type; using OperationArglist = typename PickLast::List; - using OperationArgs = typename TyOLD::Seq; + using OperationArgs = typename TySeq::Seq; using OperateSig = typename BuildFunType::Sig; using CaptureSig = typename BuildFunType::Sig; diff --git a/src/steam/control/command.hpp b/src/steam/control/command.hpp index fb631f317..af52eeb5a 100644 --- a/src/steam/control/command.hpp +++ b/src/steam/control/command.hpp @@ -88,7 +88,7 @@ namespace control { using lib::Symbol; using std::shared_ptr; using lib::meta::Tuple; - using lib::meta::TyOLD; + using lib::meta::TySeq; using FuncPtr = void*; diff --git a/src/steam/mobject/builder/applicable-builder-target-types.hpp b/src/steam/mobject/builder/applicable-builder-target-types.hpp index 0dc994839..c61261e7c 100644 --- a/src/steam/mobject/builder/applicable-builder-target-types.hpp +++ b/src/steam/mobject/builder/applicable-builder-target-types.hpp @@ -54,17 +54,16 @@ /////////////////////////////////TICKET #414 -namespace steam { +namespace steam { namespace mobject { namespace builder { - typedef TyOLD< session::Root, - session::Clip, - session::Effect, - session::Binding, - session::AbstractMO - > ::List - BuilderTargetTypes; + using BuilderTargetTypes = TySeq< session::Root + , session::Clip + , session::Effect + , session::Binding + , session::AbstractMO + > ::List ; /////////////////////////////////TICKET #414 diff --git a/src/steam/mobject/builder/buildertool.hpp b/src/steam/mobject/builder/buildertool.hpp index 18329be45..410415e0b 100644 --- a/src/steam/mobject/builder/buildertool.hpp +++ b/src/steam/mobject/builder/buildertool.hpp @@ -159,7 +159,7 @@ namespace mobject { { } ; - using lib::meta::TyOLD; // convenience for the users of "Applicable" + using lib::meta::TySeq; // convenience for the users of "Applicable" }// namespace mobject::builder diff --git a/src/steam/mobject/output-designation.hpp b/src/steam/mobject/output-designation.hpp index 93953fa62..e12daa277 100644 --- a/src/steam/mobject/output-designation.hpp +++ b/src/steam/mobject/output-designation.hpp @@ -113,7 +113,7 @@ namespace mobject { { VTABLE = sizeof(size_t) , SPEC_SIZ = VTABLE + mp::maxSize< - mp::TyOLD< PID, lumiera_uid, uint>::List>() + mp::TySeq< PID, lumiera_uid, uint>::List>() }; typedef lib::OpaqueHolder SpecBuff; diff --git a/src/steam/mobject/session/session-impl.hpp b/src/steam/mobject/session/session-impl.hpp index 4b668839e..92f7504d4 100644 --- a/src/steam/mobject/session/session-impl.hpp +++ b/src/steam/mobject/session/session-impl.hpp @@ -268,17 +268,15 @@ namespace session { * to create "the session" instance and expose it through the * global Session PImpl */ - typedef SessionServices< TyOLD< SessionServiceFetch - , SessionServiceMutate - , SessionServiceExploreScope - , SessionServiceMockIndex - , SessionServiceDefaults - > // List of the APIs to provide - , SessManagerImpl // frontend for access - , SessionImpl // implementation base class - > // - SessionImplAPI; - + using SessionImplAPI = SessionServices< TySeq< SessionServiceFetch + , SessionServiceMutate + , SessionServiceExploreScope + , SessionServiceMockIndex + , SessionServiceDefaults + > // List of the APIs to provide + , SessManagerImpl // frontend for access + , SessionImpl // implementation base class + >; // diff --git a/src/steam/mobject/session/session-services.hpp b/src/steam/mobject/session/session-services.hpp index 0874857e4..471fff9be 100644 --- a/src/steam/mobject/session/session-services.hpp +++ b/src/steam/mobject/session/session-services.hpp @@ -78,7 +78,7 @@ namespace mobject { namespace session { using lib::meta::InstantiateChained; - using lib::meta::TyOLD; + using lib::meta::TySeq; /** diff --git a/tests/basics/time/format-support-test.cpp b/tests/basics/time/format-support-test.cpp index 1e79453b4..c7bbd31a9 100644 --- a/tests/basics/time/format-support-test.cpp +++ b/tests/basics/time/format-support-test.cpp @@ -39,8 +39,8 @@ namespace test { run (Arg) { SupportStandardTimecode just_fine; - Supported just_smpte = Supported::formats< TyOLD >(); - Supported just_simple = Supported::formats< TyOLD >(); + Supported just_smpte = Supported::formats< TySeq >(); + Supported just_simple = Supported::formats< TySeq >(); Supported& support1 (just_fine); Supported& support2 (just_smpte); diff --git a/tests/basics/time/time-control-test.cpp b/tests/basics/time/time-control-test.cpp index 32e57c305..75ff63f31 100644 --- a/tests/basics/time/time-control-test.cpp +++ b/tests/basics/time/time-control-test.cpp @@ -46,7 +46,7 @@ namespace test{ using lib::wrapper::ItemWrapper; using steam::asset::meta::TimeGrid; - using lib::meta::TyOLD; + using lib::meta::TySeq; using lib::meta::InstantiateChainedCombinations; using LERR_(UNCONNECTED); @@ -475,12 +475,12 @@ namespace test{ void TimeControl_test::verifyMatrix_of_MutationCases (TimeValue const& origVal, TimeValue const& change) { - typedef TyOLD KindsOfTarget; // time entities to receive value changes - typedef TyOLD KindsOfSource; // time entities to be used as change values - typedef InstantiateChainedCombinations< KindsOfTarget - , KindsOfSource - , TestCase // template to be instantiated for each type - , IterationEnd > TestMatrix; + using KindsOfTarget = TySeq ; // time entities to receive value changes + using KindsOfSource = TySeq; // time entities to be used as change values + using TestMatrix = InstantiateChainedCombinations< KindsOfTarget + , KindsOfSource + , TestCase // template to be instantiated for each type + , IterationEnd >; TestMatrix().performTestSequence(origVal, change); } diff --git a/tests/basics/visitingtool-extended-test.cpp b/tests/basics/visitingtool-extended-test.cpp index a95925b3a..9d526e77f 100644 --- a/tests/basics/visitingtool-extended-test.cpp +++ b/tests/basics/visitingtool-extended-test.cpp @@ -65,7 +65,7 @@ namespace test2 { class Babbler : public Applicable< Babbler, - TyOLD::List, // treat this types + TySeq::List, // treat this types VerboseVisitor // intermediary base class > { @@ -114,7 +114,7 @@ namespace test2 { */ class Blatherer : public Applicable< Blatherer, - TyOLD::List, // get calls to Visionary dispatched + TySeq::List, // get calls to Visionary dispatched VerboseVisitor // note: different tool base class > { diff --git a/tests/basics/visitingtool-test.cpp b/tests/basics/visitingtool-test.cpp index d5ea32698..03a12d763 100644 --- a/tests/basics/visitingtool-test.cpp +++ b/tests/basics/visitingtool-test.cpp @@ -74,7 +74,7 @@ namespace test1 { class Babbler : public Applicable< Babbler - , TyOLD::List // dispatch calls to this types + , TySeq::List // dispatch calls to this types , VerboseVisitor > { diff --git a/tests/core/steam/control/command-clone-builder-test.cpp b/tests/core/steam/control/command-clone-builder-test.cpp index cbb72c968..71c89814d 100644 --- a/tests/core/steam/control/command-clone-builder-test.cpp +++ b/tests/core/steam/control/command-clone-builder-test.cpp @@ -111,7 +111,7 @@ namespace test { void bindRandArgument (CommandImpl& cmd) { - typedef TyOLD ArgType; + using ArgType = TySeq; TypedArguments> arg (std::make_tuple (rani (10000))); cmd.setArguments (arg); CHECK (cmd.canExec()); diff --git a/tests/core/steam/control/command-equality-test.cpp b/tests/core/steam/control/command-equality-test.cpp index e56415fae..4c2e4ff41 100644 --- a/tests/core/steam/control/command-equality-test.cpp +++ b/tests/core/steam/control/command-equality-test.cpp @@ -79,7 +79,7 @@ namespace test { typedef function Fun_c; typedef function Fun_u; - using ArgTuple = Tuple>; + using ArgTuple = Tuple>; using ArgHolder = OpClosure; using MemHolder = MementoTie; using Closure = SimpleClosure; diff --git a/tests/core/steam/control/command-mutation-test.cpp b/tests/core/steam/control/command-mutation-test.cpp index 990a6a0a7..a241c3e79 100644 --- a/tests/core/steam/control/command-mutation-test.cpp +++ b/tests/core/steam/control/command-mutation-test.cpp @@ -107,7 +107,7 @@ namespace test { VERIFY_ERROR (UNBOUND_ARGUMENTS, functor(nullClosure) ); // now create a real closure.... - Tuple> param = std::make_tuple (23); + Tuple> param = std::make_tuple (23); SimpleClosure closed_over{param}; CmdClosure& closure (closed_over); @@ -154,7 +154,7 @@ namespace test { VERIFY_ERROR (UNBOUND_ARGUMENTS, undoFunctor(nullClosure) ); VERIFY_ERROR (UNBOUND_ARGUMENTS, undoFunctor.captureState(nullClosure) ); - Tuple > param; + Tuple> param; SimpleClosure clo{param}; CHECK (!mementoHolder); diff --git a/tests/core/steam/control/command-registry-test.cpp b/tests/core/steam/control/command-registry-test.cpp index 06ab6f8f4..eb65da2c3 100644 --- a/tests/core/steam/control/command-registry-test.cpp +++ b/tests/core/steam/control/command-registry-test.cpp @@ -210,7 +210,7 @@ namespace test { CHECK (!isSameObject (*pImpl, *clone)); CHECK (!pImpl->canExec()); - typedef TyOLD ArgType; + using ArgType = TySeq; TypedArguments> arg{Tuple(98765)}; pImpl->setArguments(arg); CHECK (pImpl->canExec()); diff --git a/tests/core/steam/control/handling-pattern-basics-test.cpp b/tests/core/steam/control/handling-pattern-basics-test.cpp index 83602140c..4412f29ba 100644 --- a/tests/core/steam/control/handling-pattern-basics-test.cpp +++ b/tests/core/steam/control/handling-pattern-basics-test.cpp @@ -166,9 +166,9 @@ namespace test { checkExec (PCommandImpl com) { CHECK (com); - CHECK (!com->canExec()); + CHECK (not com->canExec()); - typedef TyOLD ArgType; + using ArgType = TySeq; const int ARGR{1 + rani (1000)}; Tuple tuple(ARGR); TypedArguments> arg(tuple); diff --git a/tests/core/steam/mobject/builder/builder-tool-test.cpp b/tests/core/steam/mobject/builder/builder-tool-test.cpp index 0052d6687..f4af38b3a 100644 --- a/tests/core/steam/mobject/builder/builder-tool-test.cpp +++ b/tests/core/steam/mobject/builder/builder-tool-test.cpp @@ -59,7 +59,7 @@ namespace test { * so it will call the \c onUnknown(Buildable&) instead */ class TestTool - : public Applicable::List> + : public Applicable::List> { public: string log_; diff --git a/tests/core/steam/mobject/session/session-service-access-test.cpp b/tests/core/steam/mobject/session/session-service-access-test.cpp index 725f29243..a2765dedd 100644 --- a/tests/core/steam/mobject/session/session-service-access-test.cpp +++ b/tests/core/steam/mobject/session/session-service-access-test.cpp @@ -41,7 +41,7 @@ namespace test { namespace { // what follows is a simulated (simplified) version // of the complete Session + SessionManager setup..... - using lib::meta::TyOLD; + using lib::meta::TySeq; using lib::meta::InstantiateChained; @@ -161,10 +161,10 @@ namespace test { struct TSessManagerImpl; - typedef TSessionServices< TyOLD - , TSessManagerImpl - , TSessionImpl - > SessionImplAPI; + using SessionImplAPI = TSessionServices< TySeq + , TSessManagerImpl + , TSessionImpl + >; diff --git a/tests/library/meta/generator-test.cpp b/tests/library/meta/generator-test.cpp index ccb487e16..1896a160f 100644 --- a/tests/library/meta/generator-test.cpp +++ b/tests/library/meta/generator-test.cpp @@ -88,13 +88,13 @@ namespace test { using BASE::eat; // prevent shadowing }; - typedef TyOLD< Block<1> - , Block<2> - , Block<3> - , Block<5> - , Block<8> - , Block<13> - >::List TheTypes; + using TheTypes = TySeq< Block<1> + , Block<2> + , Block<3> + , Block<5> + , Block<8> + , Block<13> + >::List; typedef InstantiateForEach TheInterface; diff --git a/tests/library/meta/meta-utils-test.cpp b/tests/library/meta/meta-utils-test.cpp index 602de7d13..1515259f0 100644 --- a/tests/library/meta/meta-utils-test.cpp +++ b/tests/library/meta/meta-utils-test.cpp @@ -203,13 +203,13 @@ namespace test { //-------------------------------------------------TEST-types-- - typedef TyOLD< int - , uint - , int64_t - , uint64_t - >::List TheList; + using TheList = TySeq::List; - typedef TyOLD< >::List EmptyList; + using EmptyList = Nil; //-------------------------------------------------TEST-types-- diff --git a/tests/library/variant-test.cpp b/tests/library/variant-test.cpp index 54a91d5aa..f0ce113fa 100644 --- a/tests/library/variant-test.cpp +++ b/tests/library/variant-test.cpp @@ -31,7 +31,7 @@ namespace lib { namespace test{ using ::Test; - using meta::TyOLD; + using meta::TySeq; using lib::time::Time; using lib::time::TimeVar; @@ -43,7 +43,7 @@ namespace test{ // Test fixture... - typedef Variant> TestVariant; + using TestVariant = Variant>; diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index b20242566..8fcc57810 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -164482,7 +164482,7 @@ Since then others have made contributions, see the log for the history. - + @@ -164848,10 +164848,10 @@ Since then others have made contributions, see the log for the history. - + - - + + @@ -165007,7 +165007,7 @@ Since then others have made contributions, see the log for the history. - + @@ -165214,15 +165214,15 @@ Since then others have made contributions, see the log for the history. - - - + + + - + - + @@ -165258,8 +165258,8 @@ Since then others have made contributions, see the log for the history. - - + + @@ -165327,7 +165327,7 @@ Since then others have made contributions, see the log for the history. - + @@ -165366,11 +165366,11 @@ Since then others have made contributions, see the log for the history. - - - - - + + + + +