Skip to content

Commit 4fa8eb6

Browse files
7bitcoder7bitcoder
committed
update creators tests and change include brackets
1 parent 749704f commit 4fa8eb6

File tree

71 files changed

+424
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+424
-288
lines changed

‎Include/SevenBit/DI.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <SevenBit/DI/LibraryConfig.hpp>
3+
#include "SevenBit/DI/LibraryConfig.hpp"
44

5-
#include <SevenBit/DI/ServiceCollection.hpp>
6-
#include <SevenBit/DI/Utils/Injected.hpp>
5+
#include "SevenBit/DI/ServiceCollection.hpp"
6+
#include "SevenBit/DI/Utils/Injected.hpp"

‎Include/SevenBit/DI/Details/Containers/Impl/ServiceDescriptorList.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <SevenBit/DI/LibraryConfig.hpp>
3+
#include "SevenBit/DI/LibraryConfig.hpp"
44

5-
#include <SevenBit/DI/Details/Containers/ServiceDescriptorList.hpp>
6-
#include <SevenBit/DI/Exceptions.hpp>
5+
#include "SevenBit/DI/Details/Containers/ServiceDescriptorList.hpp"
6+
#include "SevenBit/DI/Exceptions.hpp"
77

88
namespace sb::di::details
99
{

‎Include/SevenBit/DI/Details/Containers/Impl/ServiceDescriptorsMap.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <SevenBit/DI/LibraryConfig.hpp>
3+
#include "SevenBit/DI/LibraryConfig.hpp"
44

5-
#include <SevenBit/DI/Details/Containers/ServiceDescriptorsMap.hpp>
6-
#include <SevenBit/DI/Exceptions.hpp>
5+
#include "SevenBit/DI/Details/Containers/ServiceDescriptorsMap.hpp"
6+
#include "SevenBit/DI/Exceptions.hpp"
77

88
namespace sb::di::details
99
{

‎Include/SevenBit/DI/Details/Containers/Impl/ServiceInstancesMap.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include <SevenBit/DI/LibraryConfig.hpp>
3+
#include "SevenBit/DI/LibraryConfig.hpp"
44

5-
#include <SevenBit/DI/Details/Containers/ServiceInstancesMap.hpp>
5+
#include "SevenBit/DI/Details/Containers/ServiceInstancesMap.hpp"
66

77
namespace sb::di::details
88
{

‎Include/SevenBit/DI/Details/Containers/ServiceDescriptorList.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include <SevenBit/DI/LibraryConfig.hpp>
3+
#include "SevenBit/DI/LibraryConfig.hpp"
44

5-
#include <SevenBit/DI/OneOrList.hpp>
6-
#include <SevenBit/DI/ServiceDescriptor.hpp>
7-
#include <SevenBit/DI/ServiceLifeTime.hpp>
8-
#include <SevenBit/DI/TypeId.hpp>
5+
#include "SevenBit/DI/OneOrList.hpp"
6+
#include "SevenBit/DI/ServiceDescriptor.hpp"
7+
#include "SevenBit/DI/ServiceLifeTime.hpp"
8+
#include "SevenBit/DI/TypeId.hpp"
99

1010
namespace sb::di::details
1111
{
@@ -40,5 +40,5 @@ namespace sb::di::details
4040
} // namespace sb::di::details
4141

4242
#ifdef _7BIT_DI_ADD_IMPL
43-
#include <SevenBit/DI/Details/Containers/Impl/ServiceDescriptorList.hpp>
43+
#include "SevenBit/DI/Details/Containers/Impl/ServiceDescriptorList.hpp"
4444
#endif

‎Include/SevenBit/DI/Details/Containers/ServiceDescriptorsMap.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#include <unordered_map>
55
#include <unordered_set>
66

7-
#include <SevenBit/DI/LibraryConfig.hpp>
7+
#include "SevenBit/DI/LibraryConfig.hpp"
88

9-
#include <SevenBit/DI/Details/Containers/ServiceDescriptorList.hpp>
10-
#include <SevenBit/DI/Details/Models/ServiceId.hpp>
11-
#include <SevenBit/DI/ServiceDescriptor.hpp>
9+
#include "SevenBit/DI/Details/Containers/ServiceDescriptorList.hpp"
10+
#include "SevenBit/DI/Details/Models/ServiceId.hpp"
11+
#include "SevenBit/DI/ServiceDescriptor.hpp"
1212

1313
namespace sb::di::details
1414
{
@@ -54,5 +54,5 @@ namespace sb::di::details
5454
} // namespace sb::di::details
5555

5656
#ifdef _7BIT_DI_ADD_IMPL
57-
#include <SevenBit/DI/Details/Containers/Impl/ServiceDescriptorsMap.hpp>
57+
#include "SevenBit/DI/Details/Containers/Impl/ServiceDescriptorsMap.hpp"
5858
#endif

‎Include/SevenBit/DI/Details/Containers/ServiceInstanceList.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <SevenBit/DI/LibraryConfig.hpp>
3+
#include "SevenBit/DI/LibraryConfig.hpp"
44

5-
#include <SevenBit/DI/OneOrList.hpp>
6-
#include <SevenBit/DI/ServiceInstance.hpp>
5+
#include "SevenBit/DI/OneOrList.hpp"
6+
#include "SevenBit/DI/ServiceInstance.hpp"
77

88
namespace sb::di::details
99
{

‎Include/SevenBit/DI/Details/Containers/ServiceInstancesMap.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include <unordered_map>
55
#include <vector>
66

7-
#include <SevenBit/DI/LibraryConfig.hpp>
7+
#include "SevenBit/DI/LibraryConfig.hpp"
88

9-
#include <SevenBit/DI/Details/Containers/ServiceInstanceList.hpp>
10-
#include <SevenBit/DI/Details/Models/ServiceId.hpp>
9+
#include "SevenBit/DI/Details/Containers/ServiceInstanceList.hpp"
10+
#include "SevenBit/DI/Details/Models/ServiceId.hpp"
1111

1212
namespace sb::di::details
1313
{
@@ -46,5 +46,5 @@ namespace sb::di::details
4646
} // namespace sb::di::details
4747

4848
#ifdef _7BIT_DI_ADD_IMPL
49-
#include <SevenBit/DI/Details/Containers/Impl/ServiceInstancesMap.hpp>
49+
#include "SevenBit/DI/Details/Containers/Impl/ServiceInstancesMap.hpp"
5050
#endif

‎Include/SevenBit/DI/Details/Core/IServiceInstanceProviderRoot.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include <SevenBit/DI/LibraryConfig.hpp>
3+
#include "SevenBit/DI/LibraryConfig.hpp"
44

5-
#include <SevenBit/DI/Details/Containers/ServiceDescriptorsMap.hpp>
6-
#include <SevenBit/DI/Details/Containers/ServiceInstancesMap.hpp>
7-
#include <SevenBit/DI/Details/Core/ServiceInstancesCreator.hpp>
5+
#include "SevenBit/DI/Details/Containers/ServiceDescriptorsMap.hpp"
6+
#include "SevenBit/DI/Details/Containers/ServiceInstancesMap.hpp"
7+
#include "SevenBit/DI/Details/Core/ServiceInstancesCreator.hpp"
88

99
namespace sb::di::details
1010
{

‎Include/SevenBit/DI/Details/Core/Impl/ServiceAliasesCreator.hpp‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include <memory>
44
#include <utility>
55

6-
#include <SevenBit/DI/LibraryConfig.hpp>
6+
#include "SevenBit/DI/LibraryConfig.hpp"
77

8-
#include <SevenBit/DI/Details/Core/ServiceAliasesCreator.hpp>
9-
#include <SevenBit/DI/Details/Services/AliasService.hpp>
10-
#include <SevenBit/DI/Details/Utils/RequireDescriptor.hpp>
11-
#include <SevenBit/DI/Details/Utils/RequireInstance.hpp>
8+
#include "SevenBit/DI/Details/Core/ServiceAliasesCreator.hpp"
9+
#include "SevenBit/DI/Details/Services/AliasService.hpp"
10+
#include "SevenBit/DI/Details/Utils/RequireDescriptor.hpp"
11+
#include "SevenBit/DI/Details/Utils/RequireInstance.hpp"
1212

1313
namespace sb::di::details
1414
{
@@ -32,11 +32,13 @@ namespace sb::di::details
3232
if (originals)
3333
{
3434
const auto size = originals->size();
35+
const auto take = skipLast <= size ? size - skipLast : 0;
3536
instances.reserve(size);
36-
auto take = size - skipLast;
37-
originals->forEach([&](const ServiceInstance &instance) {
38-
instances.add(create(descriptor, instance));
39-
return --take;
37+
originals->forEach([&](const ServiceInstance &instance, const std::size_t index) {
38+
if (index < take)
39+
{
40+
instances.add(create(descriptor, instance));
41+
}
4042
});
4143
}
4244
}
@@ -51,7 +53,7 @@ namespace sb::di::details
5153
originals.forEach(
5254
[&](ServiceInstance &instance) { instance.addCastOffset(descriptor.getCastOffset()); });
5355
}
54-
instances.add(std::move(originals));
56+
instances.addList(std::move(originals));
5557
}
5658
}
5759

0 commit comments

Comments
 (0)