add break to foreach

7bitcoder · 7bitcoder · commit 749704f9b4a3 · 2024-04-24T23:19:53.000+02:00
diff --git a/Include/SevenBit/DI/Details/Core/Impl/ServiceAliasesCreator.hpp b/Include/SevenBit/DI/Details/Core/Impl/ServiceAliasesCreator.hpp
@@ -27,17 +27,16 @@ namespace sb::di::details
 
     INLINE void ServiceAliasesCreator::tryCreateAll(ServiceInstanceList &instances, const ServiceDescriptor &descriptor,
                                                     const OneOrList<ServiceInstance> *originals,
-                                                    const size_t skipLast) const
+                                                    const std::size_t skipLast) const
     {
         if (originals)
         {
-            const auto take = originals->size() - skipLast;
-            instances.reserve(instances.size() + take);
-            originals->forEach([&](const ServiceInstance &instance, const size_t index) {
-                if (index < take)
-                {
-                    instances.add(create(descriptor, instance));
-                }
+            const auto size = originals->size();
+            instances.reserve(size);
+            auto take = size - skipLast;
+            originals->forEach([&](const ServiceInstance &instance) {
+                instances.add(create(descriptor, instance));
+                return --take;
             });
         }
     }
diff --git a/Include/SevenBit/DI/Details/Core/Impl/ServiceInstanceProvider.hpp b/Include/SevenBit/DI/Details/Core/Impl/ServiceInstanceProvider.hpp
@@ -186,7 +186,7 @@ namespace sb::di::details
     }
 
     INLINE ServiceInstanceList ServiceInstanceProvider::tryCreateInstances(const ServiceDescriptorList &descriptors,
-                                                                           const size_t skipLast)
+                                                                           const std::size_t skipLast)
     {
         const auto &descriptor = descriptors.last();
         if (descriptor.isAlias())
diff --git a/Include/SevenBit/DI/Details/Core/Impl/ServiceInstancesCreator.hpp b/Include/SevenBit/DI/Details/Core/Impl/ServiceInstancesCreator.hpp
@@ -18,7 +18,7 @@ namespace sb::di::details
     }
 
     INLINE ServiceInstanceList ServiceInstancesCreator::createAll(const ServiceDescriptorList &descriptors,
-                                                                  const size_t skipLast)
+                                                                  const std::size_t skipLast)
     {
         return createAll(descriptors, false, skipLast);
     }
@@ -29,22 +29,21 @@ namespace sb::di::details
     }
 
     INLINE ServiceInstanceList ServiceInstancesCreator::createAllInPlace(const ServiceDescriptorList &descriptors,
-                                                                         const size_t skipLast)
+                                                                         const std::size_t skipLast)
     {
         return createAll(descriptors, true, skipLast);
     }
 
     INLINE ServiceInstanceList ServiceInstancesCreator::createAll(const ServiceDescriptorList &descriptors,
-                                                                  const bool inPlaceRequest, const size_t skipLast)
+                                                                  const bool inPlaceRequest, const std::size_t skipLast)
     {
         ServiceInstanceList instances;
-        const auto take = descriptors.size() - skipLast;
-        instances.reserve(take);
-        descriptors.forEach([&](const ServiceDescriptor &descriptor, const size_t index) {
-            if (index < take)
-            {
-                instances.add(create(descriptor, inPlaceRequest));
-            }
+        const auto size = descriptors.size();
+        instances.reserve(size);
+        auto take = size - skipLast;
+        descriptors.forEach([&](const ServiceDescriptor &descriptor) {
+            instances.add(create(descriptor, inPlaceRequest));
+            return --take;
         });
         return instances;
     }
diff --git a/Include/SevenBit/DI/Details/Core/ServiceAliasesCreator.hpp b/Include/SevenBit/DI/Details/Core/ServiceAliasesCreator.hpp
@@ -13,33 +13,33 @@ namespace sb::di::details
         ServiceInstance tryCreate(const ServiceDescriptor &descriptor, const ServiceInstance *original) const;
 
         template <class TResolver>
-        ServiceInstanceList tryCreateAll(const ServiceDescriptorList &descriptors, TResolver originalResolver,
-                                         const size_t skipLast = 0) const
+        ServiceInstanceList tryCreateAll(const ServiceDescriptorList &descriptors, TResolver originalsResolver,
+                                         const std::size_t skipLast = 0) const
         {
             ServiceInstanceList instances;
             const auto size = descriptors.size();
-            descriptors.forEach([&](const ServiceDescriptor &aliasDescriptor, const size_t index) {
+            descriptors.forEach([&](const ServiceDescriptor &aliasDescriptor, const std::size_t index) {
                 const auto lastDescriptorSkip = index + 1 == size ? skipLast : 0;
-                tryCreateAll(instances, aliasDescriptor, originalResolver(aliasDescriptor), lastDescriptorSkip);
+                tryCreateAll(instances, aliasDescriptor, originalsResolver(aliasDescriptor), lastDescriptorSkip);
             });
             return instances;
         }
 
         ServiceInstance tryMap(const ServiceDescriptor &descriptor, ServiceInstance &&original) const;
 
         template <class TResolver>
-        ServiceInstanceList tryMapAll(const ServiceDescriptorList &descriptors, TResolver originalResolver) const
+        ServiceInstanceList tryMapAll(const ServiceDescriptorList &descriptors, TResolver originalsResolver) const
         {
             ServiceInstanceList instances;
             descriptors.forEach([&](const ServiceDescriptor &aliasDescriptor) {
-                tryMapAll(instances, aliasDescriptor, originalResolver(aliasDescriptor));
+                tryMapAll(instances, aliasDescriptor, originalsResolver(aliasDescriptor));
             });
             return instances;
         }
 
       private:
         void tryCreateAll(ServiceInstanceList &instances, const ServiceDescriptor &descriptor,
-                          const OneOrList<ServiceInstance> *originals, size_t skipLast = 0) const;
+                          const OneOrList<ServiceInstance> *originals, std::size_t skipLast = 0) const;
 
         void tryMapAll(ServiceInstanceList &instances, const ServiceDescriptor &descriptor,
                        OneOrList<ServiceInstance> &&originals) const;
diff --git a/Include/SevenBit/DI/Details/Core/ServiceInstanceProvider.hpp b/Include/SevenBit/DI/Details/Core/ServiceInstanceProvider.hpp
@@ -137,7 +137,7 @@ namespace sb::di::details
         ServiceInstancesMap &getInstancesMap(ServiceLifeTime lifetime);
 
         ServiceInstance tryCreateInstance(const ServiceDescriptor &descriptor);
-        ServiceInstanceList tryCreateInstances(const ServiceDescriptorList &descriptors, size_t skipLast = 0);
+        ServiceInstanceList tryCreateInstances(const ServiceDescriptorList &descriptors, std::size_t skipLast = 0);
 
         ServiceInstance tryCreateTransientInstance(const ServiceDescriptor &descriptor);
         ServiceInstanceList tryCreateTransientInstances(const ServiceDescriptorList &descriptors);
diff --git a/Include/SevenBit/DI/Details/Core/ServiceInstancesCreator.hpp b/Include/SevenBit/DI/Details/Core/ServiceInstancesCreator.hpp
@@ -17,14 +17,15 @@ namespace sb::di::details
         void setServiceProvider(ServiceProvider &serviceProvider) { _serviceProvider = &serviceProvider; }
 
         ServiceInstance create(const ServiceDescriptor &descriptor);
-        ServiceInstanceList createAll(const ServiceDescriptorList &descriptors, size_t skipLast = 0);
+        ServiceInstanceList createAll(const ServiceDescriptorList &descriptors, std::size_t skipLast = 0);
 
         ServiceInstance createInPlace(const ServiceDescriptor &descriptor);
-        ServiceInstanceList createAllInPlace(const ServiceDescriptorList &descriptors, size_t skipLast = 0);
+        ServiceInstanceList createAllInPlace(const ServiceDescriptorList &descriptors, std::size_t skipLast = 0);
 
       private:
         ServiceInstance create(const ServiceDescriptor &descriptor, bool inPlaceRequest);
-        ServiceInstanceList createAll(const ServiceDescriptorList &descriptors, bool inPlaceRequest, size_t skipLast);
+        ServiceInstanceList createAll(const ServiceDescriptorList &descriptors, bool inPlaceRequest,
+                                      std::size_t skipLast);
     };
 } // namespace sb::di::details
 
diff --git a/Include/SevenBit/DI/OneOrList.hpp b/Include/SevenBit/DI/OneOrList.hpp
@@ -176,11 +176,7 @@ namespace sb::di
             }
             else if (auto list = tryGetAsList())
             {
-                std::size_t index = 0;
-                for (auto &instance : *list)
-                {
-                    callFcn(fcn, instance, index++);
-                }
+                listForEach(*list, fcn);
             }
         }
 
@@ -192,11 +188,7 @@ namespace sb::di
             }
             else if (auto list = tryGetAsList())
             {
-                std::size_t index = 0;
-                for (const auto &instance : *list)
-                {
-                    callFcn(fcn, instance, index++);
-                }
+                listForEach(*list, fcn);
             }
         }
 
@@ -234,6 +226,26 @@ namespace sb::di
             }
         }
 
+        template <class TList, class TFunc> static void listForEach(TList &list, TFunc &fcn)
+        {
+            std::size_t index = 0;
+            for (auto &instance : list)
+            {
+                using Ret = decltype(callFcn(fcn, instance, 0));
+                if constexpr (std::is_integral_v<Ret>)
+                {
+                    if (!callFcn(fcn, instance, index++))
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    callFcn(fcn, instance, index++);
+                }
+            }
+        }
+
         template <class TFunc, class TItem> static auto callFcn(TFunc &fcn, TItem &item, std::size_t index)
         {
             if constexpr (std::is_invocable_v<TFunc, TItem &>)

Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,16 @@ namespace sb::di::details`
`27`	`27`
`28`	`28`	`INLINE void ServiceAliasesCreator::tryCreateAll(ServiceInstanceList &instances, const ServiceDescriptor &descriptor,`
`29`	`29`	`const OneOrList<ServiceInstance> *originals,`
`30`		`- const size_t skipLast) const`
	`30`	`+ const std::size_t skipLast) const`
`31`	`31`	`{`
`32`	`32`	`if (originals)`
`33`	`33`	`{`
`34`		`- const auto take = originals->size() - skipLast;`
`35`		`- instances.reserve(instances.size() + take);`
`36`		`- originals->forEach([&](const ServiceInstance &instance, const size_t index) {`
`37`		`- if (index < take)`
`38`		`- {`
`39`		`- instances.add(create(descriptor, instance));`
`40`		`- }`
	`34`	`+ const auto size = originals->size();`
	`35`	`+ instances.reserve(size);`
	`36`	`+ auto take = size - skipLast;`
	`37`	`+ originals->forEach([&](const ServiceInstance &instance) {`
	`38`	`+ instances.add(create(descriptor, instance));`
	`39`	`+ return --take;`
`41`	`40`	`});`
`42`	`41`	`}`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ namespace sb::di::details`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`INLINE ServiceInstanceList ServiceInstanceProvider::tryCreateInstances(const ServiceDescriptorList &descriptors,`
`189`		`- const size_t skipLast)`
	`189`	`+ const std::size_t skipLast)`
`190`	`190`	`{`
`191`	`191`	`const auto &descriptor = descriptors.last();`
`192`	`192`	`if (descriptor.isAlias())`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace sb::di::details`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`INLINE ServiceInstanceList ServiceInstancesCreator::createAll(const ServiceDescriptorList &descriptors,`
`21`		`- const size_t skipLast)`
	`21`	`+ const std::size_t skipLast)`
`22`	`22`	`{`
`23`	`23`	`return createAll(descriptors, false, skipLast);`
`24`	`24`	`}`
`@@ -29,22 +29,21 @@ namespace sb::di::details`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`INLINE ServiceInstanceList ServiceInstancesCreator::createAllInPlace(const ServiceDescriptorList &descriptors,`
`32`		`- const size_t skipLast)`
	`32`	`+ const std::size_t skipLast)`
`33`	`33`	`{`
`34`	`34`	`return createAll(descriptors, true, skipLast);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`INLINE ServiceInstanceList ServiceInstancesCreator::createAll(const ServiceDescriptorList &descriptors,`
`38`		`- const bool inPlaceRequest, const size_t skipLast)`
	`38`	`+ const bool inPlaceRequest, const std::size_t skipLast)`
`39`	`39`	`{`
`40`	`40`	`ServiceInstanceList instances;`
`41`		`- const auto take = descriptors.size() - skipLast;`
`42`		`- instances.reserve(take);`
`43`		`- descriptors.forEach([&](const ServiceDescriptor &descriptor, const size_t index) {`
`44`		`- if (index < take)`
`45`		`- {`
`46`		`- instances.add(create(descriptor, inPlaceRequest));`
`47`		`- }`
	`41`	`+ const auto size = descriptors.size();`
	`42`	`+ instances.reserve(size);`
	`43`	`+ auto take = size - skipLast;`
	`44`	`+ descriptors.forEach([&](const ServiceDescriptor &descriptor) {`
	`45`	`+ instances.add(create(descriptor, inPlaceRequest));`
	`46`	`+ return --take;`
`48`	`47`	`});`
`49`	`48`	`return instances;`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,11 +176,7 @@ namespace sb::di`
`176`	`176`	`}`
`177`	`177`	`else if (auto list = tryGetAsList())`
`178`	`178`	`{`
`179`		`- std::size_t index = 0;`
`180`		`- for (auto &instance : *list)`
`181`		`- {`
`182`		`- callFcn(fcn, instance, index++);`
`183`		`- }`
	`179`	`+ listForEach(*list, fcn);`
`184`	`180`	`}`
`185`	`181`	`}`
`186`	`182`
`@@ -192,11 +188,7 @@ namespace sb::di`
`192`	`188`	`}`
`193`	`189`	`else if (auto list = tryGetAsList())`
`194`	`190`	`{`
`195`		`- std::size_t index = 0;`
`196`		`- for (const auto &instance : *list)`
`197`		`- {`
`198`		`- callFcn(fcn, instance, index++);`
`199`		`- }`
	`191`	`+ listForEach(*list, fcn);`
`200`	`192`	`}`
`201`	`193`	`}`
`202`	`194`
`@@ -234,6 +226,26 @@ namespace sb::di`
`234`	`226`	`}`
`235`	`227`	`}`
`236`	`228`
	`229`	`+ template <class TList, class TFunc> static void listForEach(TList &list, TFunc &fcn)`
	`230`	`+ {`
	`231`	`+ std::size_t index = 0;`
	`232`	`+ for (auto &instance : list)`
	`233`	`+ {`
	`234`	`+ using Ret = decltype(callFcn(fcn, instance, 0));`
	`235`	`+ if constexpr (std::is_integral_v<Ret>)`
	`236`	`+ {`
	`237`	`+ if (!callFcn(fcn, instance, index++))`
	`238`	`+ {`
	`239`	`+ break;`
	`240`	`+ }`
	`241`	`+ }`
	`242`	`+ else`
	`243`	`+ {`
	`244`	`+ callFcn(fcn, instance, index++);`
	`245`	`+ }`
	`246`	`+ }`
	`247`	`+ }`
	`248`	`+`
`237`	`249`	`template <class TFunc, class TItem> static auto callFcn(TFunc &fcn, TItem &item, std::size_t index)`
`238`	`250`	`{`
`239`	`251`	`if constexpr (std::is_invocable_v<TFunc, TItem &>)`