From c98e0b97e818fed26f8c75b0f1684172b17ef1cf Mon Sep 17 00:00:00 2001
From: Alexey <a.d.vasiliyev@outlook.com>
Date: Wed, 10 Nov 2021 10:24:17 +0300
Subject: [PATCH] Start convert from C# to C++. Issue:
 https://github.com/linksplatform/Converters/issues/48

---
 .../CachingConverterDecorator.h               | 26 +++++++++++----
 ...latform.Converters.TemplateLibrary.vcxproj | 14 +++++++-
 ...Converters.TemplateLibrary.vcxproj.filters | 33 +++++++++++++++++--
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/cpp/Platform.Converters/CachingConverterDecorator.h b/cpp/Platform.Converters/CachingConverterDecorator.h
index f8610a4..b58aad3 100644
--- a/cpp/Platform.Converters/CachingConverterDecorator.h
+++ b/cpp/Platform.Converters/CachingConverterDecorator.h
@@ -1,15 +1,29 @@
-namespace Platform::Converters
+#pragma once
+#include <map>
+#include <memory>
+
+namespace Platform::Converters
 {
+    using namespace Platform::Collections::Dictionaries;
+    using namespace Platform::Interfaces;
+
     template <typename ...> class CachingConverterDecorator;
     template <typename TSource, typename TTarget> class CachingConverterDecorator<TSource, TTarget> : public IConverter<TSource, TTarget>
     {
-        private: readonly IConverter<TSource, TTarget> *_baseConverter;
-        private: readonly IDictionary<TSource, TTarget> *_cache;
+        private: std::unique_ptr<IConverter<TSource, TTarget>> _baseConverter;
+        private: std::unique_ptr<IDictionary<TSource, TTarget>> _cache;
 
-        public: CachingConverterDecorator(IConverter<TSource, TTarget> &baseConverter, IDictionary<TSource, TTarget> &cache) { (_baseConverter, _cache) = (baseConverter, cache); }
+        public: CachingConverterDecorator(IConverter<TSource, TTarget>& baseConverter, IDictionary<TSource, TTarget>& cache)
+          : _baseConverter(baseConverter)
+          , _cache(cache)
+        {}
 
-        public: CachingConverterDecorator(IConverter<TSource, TTarget> &baseConverter) : this(baseConverter, Dictionary<TSource, TTarget>()) { }
+        public: CachingConverterDecorator(IConverter<TSource, TTarget> &baseConverter)
+          : _baseConverter(baseConverter)
+        {
+          _cache = std::make_unique<std::map<TSource, TTarget>>();
+        }
 
-        public: TTarget Convert(TSource source) { return _cache.GetOrAdd(source, _baseConverter.Convert); }
+        public: TTarget Convert(TSource source) { return GetOrAdd(_cache->get(), source, _baseConverter->Convert); }
     };
 }
\ No newline at end of file
diff --git a/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj b/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj
index 7522d6d..95727d5 100644
--- a/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj
+++ b/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj
@@ -99,6 +99,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -138,12 +139,23 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="CachingConverterDecorator.h" />
+    <ClInclude Include="CheckedConverter.h" />
     <ClInclude Include="Convert.h" />
     <ClInclude Include="Converter.h" />
+    <ClInclude Include="ConverterBase.h" />
+    <ClInclude Include="IConverter[TSource, TTarget].h" />
+    <ClInclude Include="IConverter[T].h" />
     <ClInclude Include="To.h" />
-    <ClInclude Include="is_detected.h" />
     <ClInclude Include="Platform.Converters.h" />
     <ClInclude Include="StringConverter.h" />
+    <ClInclude Include="UncheckedConverter.h" />
+    <ClInclude Include="UncheckedSignExtendingConverter.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Platform.Converters.Benchmarks\Int32ToUInt64ConverterBenchmarks.cpp" />
+    <ClCompile Include="..\Platform.Converters.Benchmarks\Program.cpp" />
+    <ClCompile Include="..\Platform.Converters.Benchmarks\UInt64ToUInt64ConverterBenchmarks.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj.filters b/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj.filters
index 57128ab..045230f 100644
--- a/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj.filters
+++ b/cpp/Platform.Converters/Platform.Converters.TemplateLibrary.vcxproj.filters
@@ -27,11 +27,40 @@
     <ClInclude Include="StringConverter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="is_detected.h">
+    <ClInclude Include="To.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="To.h">
+    <ClInclude Include="CachingConverterDecorator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CheckedConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ConverterBase.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IConverter[T].h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="IConverter[TSource, TTarget].h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UncheckedConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UncheckedSignExtendingConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Platform.Converters.Benchmarks\Int32ToUInt64ConverterBenchmarks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Platform.Converters.Benchmarks\Program.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Platform.Converters.Benchmarks\UInt64ToUInt64ConverterBenchmarks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file