update string utils

7bitcoder · 7bitcoder · commit 2ecd0baf1a07 · 2024-07-25T22:57:33.000+02:00
diff --git a/Include/SevenBit/DI/Details/Helpers/Formatter.hpp b/Include/SevenBit/DI/Details/Helpers/Formatter.hpp
@@ -5,7 +5,7 @@
 
 #include "SevenBit/DI/LibraryConfig.hpp"
 
-#include "SevenBit/DI/Details/Utils/String.hpp"
+#include "SevenBit/DI/Details/Utils/StringUtils.hpp"
 
 namespace sb::di::details
 {
@@ -16,7 +16,7 @@ namespace sb::di::details
         std::string result;
 
       public:
-        explicit Formatter(std::string_view formatString) : formatString(formatString)
+        explicit Formatter(const std::string_view formatString) : formatString(formatString)
         {
             result.reserve(formatString.size());
         }
@@ -41,7 +41,7 @@ namespace sb::di::details
                 {
                     throw std::runtime_error("Invalid format string '{' should end with '}'");
                 }
-                result += String::toString(std::forward<Arg>(arg), formatString.substr(start, end - start));
+                result += StringUtils::toString(std::forward<Arg>(arg), formatString.substr(start, end - start));
                 current = end + 1;
                 return true;
             }
diff --git a/Include/SevenBit/DI/Details/Utils/ContainerUtils.hpp b/Include/SevenBit/DI/Details/Utils/ContainerUtils.hpp
@@ -6,7 +6,7 @@
 
 namespace sb::di::details
 {
-    struct Container
+    struct ContainerUtils
     {
         template <class ForwardIt, class UnaryPredicate>
         static ForwardIt removeIf(ForwardIt first, ForwardIt last, UnaryPredicate &&p)
diff --git a/Include/SevenBit/DI/Details/Utils/Format.hpp b/Include/SevenBit/DI/Details/Utils/Format.hpp
@@ -5,14 +5,13 @@
 
 #include "SevenBit/DI/LibraryConfig.hpp"
 
-#include "SevenBit/DI/Details/Utils/Formatter.hpp"
+#include "SevenBit/DI/Details/Helpers/Formatter.hpp"
 
 namespace sb::di::details
 {
-    class Format
+    struct Format
     {
-      public:
-        template <class... Args> static std::string fmt(std::string_view formatString, Args &&...args)
+        template <class... Args> static std::string fmt(const std::string_view formatString, Args &&...args)
         {
             Formatter formatter{formatString};
             formatter.format(args...);
diff --git a/Include/SevenBit/DI/Details/Utils/Impl/String.hpp b/Include/SevenBit/DI/Details/Utils/Impl/String.hpp
diff --git a/Include/SevenBit/DI/Details/Utils/Impl/StringUtils.hpp b/Include/SevenBit/DI/Details/Utils/Impl/StringUtils.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "SevenBit/DI/LibraryConfig.hpp"
+
+#include "SevenBit/DI/Details/Utils/StringUtils.hpp"
+
+namespace sb::di::details
+{
+    INLINE std::string StringUtils::toString(const char *arg, std::string_view fmt)
+    {
+        if (!fmt.empty())
+        {
+            const auto format = makeArgFmt(fmt, "s");
+            return dataToString(format.c_str(), const_cast<char *>(arg));
+        }
+        return std::string(arg);
+    }
+
+    INLINE std::string StringUtils::toString(const std::string &arg, std::string_view fmt)
+    {
+        if (!fmt.empty())
+        {
+            const auto format = makeArgFmt(fmt, "s");
+            return dataToString(format.c_str(), const_cast<std::string &>(arg).c_str());
+        }
+        return arg;
+    }
+
+    INLINE std::string StringUtils::toString(std::string &&arg, std::string_view fmt)
+    {
+        if (!fmt.empty())
+        {
+            const auto format = makeArgFmt(fmt, "s");
+            return dataToString(format.c_str(), arg.c_str());
+        }
+        return std::move(arg);
+    }
+
+    INLINE std::string StringUtils::toString(std::string_view arg, std::string_view fmt)
+    {
+        std::string strArg{arg};
+        if (!fmt.empty())
+        {
+            const auto format = makeArgFmt(fmt, "s");
+            return dataToString(format.c_str(), strArg.c_str());
+        }
+        return strArg;
+    }
+
+    INLINE std::string StringUtils::toString(int arg, std::string_view fmt) { return toString(arg, fmt, "d"); }
+    INLINE std::string StringUtils::toString(long arg, std::string_view fmt) { return toString(arg, fmt, "ld"); }
+    INLINE std::string StringUtils::toString(long long arg, std::string_view fmt) { return toString(arg, fmt, "lld"); }
+    INLINE std::string StringUtils::toString(unsigned arg, std::string_view fmt) { return toString(arg, fmt, "u"); }
+    INLINE std::string StringUtils::toString(unsigned long arg, std::string_view fmt) { return toString(arg, fmt, "lu"); }
+    INLINE std::string StringUtils::toString(unsigned long long arg, std::string_view fmt)
+    {
+        return toString(arg, fmt, "llu");
+    }
+    INLINE std::string StringUtils::toString(float arg, std::string_view fmt) { return toString(arg, fmt, "f"); }
+    INLINE std::string StringUtils::toString(double arg, std::string_view fmt) { return toString(arg, fmt, "f"); }
+    INLINE std::string StringUtils::toString(long double arg, std::string_view fmt) { return toString(arg, fmt, "Lf"); }
+
+    INLINE std::string StringUtils::makeArgFmt(std::string_view fmt, std::string_view type)
+    {
+        return "%" + std::string{fmt} + std::string{type};
+    }
+} // namespace sb::di::details
diff --git a/Include/SevenBit/DI/Details/Utils/StringUtils.hpp b/Include/SevenBit/DI/Details/Utils/StringUtils.hpp
@@ -7,9 +7,8 @@
 
 namespace sb::di::details
 {
-    class EXPORT String
+    struct EXPORT StringUtils
     {
-      public:
         static std::string toString(const char *arg, std::string_view fmt = "");
         static std::string toString(const std::string &arg, std::string_view fmt = "");
         static std::string toString(std::string &&arg, std::string_view fmt = "");
@@ -32,11 +31,11 @@ namespace sb::di::details
             return std::string(buffer, size);
         }
 
-        template <class Number> static std::string toString(Number arg, std::string_view fmt, std::string_view type)
+        template <class Number> static std::string toString(Number arg, const std::string_view fmt, const std::string_view type)
         {
             if (!fmt.empty())
             {
-                auto format = makeArgFmt(fmt, type);
+                const auto format = makeArgFmt(fmt, type);
                 return dataToString(format.c_str(), arg);
             }
             return std::to_string(arg);
@@ -47,5 +46,5 @@ namespace sb::di::details
 } // namespace sb::di::details
 
 #ifdef _7BIT_DI_ADD_IMPL
-#include "SevenBit/DI/Details/Utils/Impl/String.hpp"
+#include "SevenBit/DI/Details/Utils/Impl/StringUtils.hpp"
 #endif
diff --git a/Include/SevenBit/DI/Exceptions.hpp b/Include/SevenBit/DI/Exceptions.hpp
@@ -40,27 +40,27 @@ namespace sb::di
 
     struct EXPORT ServiceNotFoundException : InjectorException
     {
-        ServiceNotFoundException(TypeId typeIndex, const std::string &reason);
+        ServiceNotFoundException(TypeId typeId, const std::string &reason);
     };
 
     struct EXPORT ServiceAlreadyRegisteredException : InjectorException
     {
-        explicit ServiceAlreadyRegisteredException(TypeId typeIndex);
+        explicit ServiceAlreadyRegisteredException(TypeId typeId);
     };
 
     struct EXPORT ServiceLifeTimeMismatchException : InjectorException
     {
-        ServiceLifeTimeMismatchException(TypeId typeIndex, TypeId interface);
+        ServiceLifeTimeMismatchException(TypeId typeId, TypeId interface);
     };
 
     struct EXPORT ServiceAliasMismatchException : InjectorException
     {
-        ServiceAliasMismatchException(TypeId typeIndex, TypeId interface, bool shouldBeAlias);
+        ServiceAliasMismatchException(TypeId typeId, TypeId interface, bool shouldBeAlias);
     };
 
     struct EXPORT CircularDependencyException : InjectorException
     {
-        explicit CircularDependencyException(TypeId typeIndex);
+        explicit CircularDependencyException(TypeId typeId);
     };
 } // namespace sb::di
 
diff --git a/Include/SevenBit/DI/ServiceCollection.hpp b/Include/SevenBit/DI/ServiceCollection.hpp
@@ -7,7 +7,7 @@
 
 #include "SevenBit/DI/LibraryConfig.hpp"
 
-#include "SevenBit/DI/Details/Utils/Container.hpp"
+#include "SevenBit/DI/Details/Utils/ContainerUtils.hpp"
 #include "SevenBit/DI/ServiceDescriber.hpp"
 #include "SevenBit/DI/ServiceLifeTimes.hpp"
 #include "SevenBit/DI/ServiceProvider.hpp"
@@ -348,7 +348,7 @@ namespace sb::di
          */
         template <class TPred> std::size_t removeIf(TPred pred)
         {
-            auto it = details::Container::removeIf(begin(), end(), std::move(pred));
+            auto it = details::ContainerUtils::removeIf(begin(), end(), std::move(pred));
             auto r = std::distance(it, end());
             removeRange(it, end());
             return r;
diff --git a/Source/Source.cpp b/Source/Source.cpp
@@ -12,5 +12,6 @@
 #include <SevenBit/DI/Details/Helpers/Impl/ScopedGuard.hpp>
 #include <SevenBit/DI/Details/Utils/Impl/RequireDescriptor.hpp>
 #include <SevenBit/DI/Details/Utils/Impl/RequireInstance.hpp>
+#include <SevenBit/DI/Details/Utils/Impl/StringUtils.hpp>
 #include <SevenBit/DI/Impl/Exceptions.hpp>
 #include <SevenBit/DI/Impl/ServiceCollection.hpp>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include "SevenBit/DI/LibraryConfig.hpp"`
`7`	`7`
`8`		`-#include "SevenBit/DI/Details/Utils/String.hpp"`
	`8`	`+#include "SevenBit/DI/Details/Utils/StringUtils.hpp"`
`9`	`9`
`10`	`10`	`namespace sb::di::details`
`11`	`11`	`{`
`@@ -16,7 +16,7 @@ namespace sb::di::details`
`16`	`16`	`std::string result;`
`17`	`17`
`18`	`18`	`public:`
`19`		`- explicit Formatter(std::string_view formatString) : formatString(formatString)`
	`19`	`+ explicit Formatter(const std::string_view formatString) : formatString(formatString)`
`20`	`20`	`{`
`21`	`21`	`result.reserve(formatString.size());`
`22`	`22`	`}`
`@@ -41,7 +41,7 @@ namespace sb::di::details`
`41`	`41`	`{`
`42`	`42`	`throw std::runtime_error("Invalid format string '{' should end with '}'");`
`43`	`43`	`}`
`44`		`- result += String::toString(std::forward<Arg>(arg), formatString.substr(start, end - start));`
	`44`	`+ result += StringUtils::toString(std::forward<Arg>(arg), formatString.substr(start, end - start));`
`45`	`45`	`current = end + 1;`
`46`	`46`	`return true;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace sb::di::details`
`8`	`8`	`{`
`9`		`- struct Container`
	`9`	`+ struct ContainerUtils`
`10`	`10`	`{`
`11`	`11`	`template <class ForwardIt, class UnaryPredicate>`
`12`	`12`	`static ForwardIt removeIf(ForwardIt first, ForwardIt last, UnaryPredicate &&p)`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,13 @@`
`5`	`5`
`6`	`6`	`#include "SevenBit/DI/LibraryConfig.hpp"`
`7`	`7`
`8`		`-#include "SevenBit/DI/Details/Utils/Formatter.hpp"`
	`8`	`+#include "SevenBit/DI/Details/Helpers/Formatter.hpp"`
`9`	`9`
`10`	`10`	`namespace sb::di::details`
`11`	`11`	`{`
`12`		`- class Format`
	`12`	`+ struct Format`
`13`	`13`	`{`
`14`		`- public:`
`15`		`- template <class... Args> static std::string fmt(std::string_view formatString, Args &&...args)`
	`14`	`+ template <class... Args> static std::string fmt(const std::string_view formatString, Args &&...args)`
`16`	`15`	`{`
`17`	`16`	`Formatter formatter{formatString};`
`18`	`17`	`formatter.format(args...);`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,8 @@`
`7`	`7`
`8`	`8`	`namespace sb::di::details`
`9`	`9`	`{`
`10`		`- class EXPORT String`
	`10`	`+ struct EXPORT StringUtils`
`11`	`11`	`{`
`12`		`- public:`
`13`	`12`	`static std::string toString(const char *arg, std::string_view fmt = "");`
`14`	`13`	`static std::string toString(const std::string &arg, std::string_view fmt = "");`
`15`	`14`	`static std::string toString(std::string &&arg, std::string_view fmt = "");`
`@@ -32,11 +31,11 @@ namespace sb::di::details`
`32`	`31`	`return std::string(buffer, size);`
`33`	`32`	`}`
`34`	`33`
`35`		`- template <class Number> static std::string toString(Number arg, std::string_view fmt, std::string_view type)`
	`34`	`+ template <class Number> static std::string toString(Number arg, const std::string_view fmt, const std::string_view type)`
`36`	`35`	`{`
`37`	`36`	`if (!fmt.empty())`
`38`	`37`	`{`
`39`		`- auto format = makeArgFmt(fmt, type);`
	`38`	`+ const auto format = makeArgFmt(fmt, type);`
`40`	`39`	`return dataToString(format.c_str(), arg);`
`41`	`40`	`}`
`42`	`41`	`return std::to_string(arg);`
`@@ -47,5 +46,5 @@ namespace sb::di::details`
`47`	`46`	`} // namespace sb::di::details`
`48`	`47`
`49`	`48`	`#ifdef _7BIT_DI_ADD_IMPL`
`50`		`-#include "SevenBit/DI/Details/Utils/Impl/String.hpp"`
	`49`	`+#include "SevenBit/DI/Details/Utils/Impl/StringUtils.hpp"`
`51`	`50`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -40,27 +40,27 @@ namespace sb::di`
`40`	`40`
`41`	`41`	`struct EXPORT ServiceNotFoundException : InjectorException`
`42`	`42`	`{`
`43`		`- ServiceNotFoundException(TypeId typeIndex, const std::string &reason);`
	`43`	`+ ServiceNotFoundException(TypeId typeId, const std::string &reason);`
`44`	`44`	`};`
`45`	`45`
`46`	`46`	`struct EXPORT ServiceAlreadyRegisteredException : InjectorException`
`47`	`47`	`{`
`48`		`- explicit ServiceAlreadyRegisteredException(TypeId typeIndex);`
	`48`	`+ explicit ServiceAlreadyRegisteredException(TypeId typeId);`
`49`	`49`	`};`
`50`	`50`
`51`	`51`	`struct EXPORT ServiceLifeTimeMismatchException : InjectorException`
`52`	`52`	`{`
`53`		`- ServiceLifeTimeMismatchException(TypeId typeIndex, TypeId interface);`
	`53`	`+ ServiceLifeTimeMismatchException(TypeId typeId, TypeId interface);`
`54`	`54`	`};`
`55`	`55`
`56`	`56`	`struct EXPORT ServiceAliasMismatchException : InjectorException`
`57`	`57`	`{`
`58`		`- ServiceAliasMismatchException(TypeId typeIndex, TypeId interface, bool shouldBeAlias);`
	`58`	`+ ServiceAliasMismatchException(TypeId typeId, TypeId interface, bool shouldBeAlias);`
`59`	`59`	`};`
`60`	`60`
`61`	`61`	`struct EXPORT CircularDependencyException : InjectorException`
`62`	`62`	`{`
`63`		`- explicit CircularDependencyException(TypeId typeIndex);`
	`63`	`+ explicit CircularDependencyException(TypeId typeId);`
`64`	`64`	`};`
`65`	`65`	`} // namespace sb::di`
`66`	`66`