Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-04-27 09:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolving some feedback

Browse Source
This commit is contained in:
jadebenn 2024-02-03 01:06:24 -06:00
parent e0e686fd99
commit b3dd1d3d4c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dCommon/GeneralUtils.h
View File

@ -14,6 +14,7 @@
#include "BitStream.h" #include "BitStream.h"
#include "NiPoint3.h" #include "NiPoint3.h"
#include "dPlatforms.h"
#include "Game.h" #include "Game.h"
#include "Logger.h" #include "Logger.h"
@ -150,24 +151,24 @@ namespace GeneralUtils {
using numeric_parse_t = numeric_parse<T>::type; using numeric_parse_t = numeric_parse<T>::type;
/** /**
* For numeric values: Parses a C-style char range (string) and returns an optional variable depending on the result * For numeric values: Parses a C-style char range (string) and returns an optional variable depending on the result.
* @param str The pointer to the start of the char range (string) * @param str The pointer to the start of the char range (string)
* @param strEnd The pointer to the end of the char range (string), defaults to NULL * @param strEnd The pointer to the end of the char range (string), defaults to NULL
* @returns An std::optional containing the desired value if it exists in the string * @returns An std::optional containing the desired value if it exists in the string
*/ */
template <Numeric T> template <Numeric T>
[[nodiscard]] std::optional<T> TryParse(const char* const str, const char* const strEnd = NULL) noexcept { [[nodiscard]] std::optional<T> TryParse(const char* const str, const char* const strEnd = NULL) {
numeric_parse_t<T> result; numeric_parse_t<T> result;
const bool isParsed = std::from_chars(str, strEnd, result).ec == std::errc{}; const bool isParsed = std::from_chars(str, strEnd, result).ec == std::errc{};
return isParsed ? static_cast<T>(result) : std::optional<T>{}; return isParsed ? static_cast<T>(result) : std::optional<T>{};
} }
#ifdef __APPLE__ #ifdef DARKFLAME_PLATFORM_MACOS
/** /**
* For floating-point values: Parses a C-style char range (string) and returns an optional variable depending on the result * For floating-point values: Parses a C-style char range (string) and returns an optional variable depending on the result.
* Note that this function is only included for MacOS, as from_chars will fufill its purpose otherwise * Note that this function overload is only included for MacOS, as from_chars will fufill its purpose otherwise.
* @param str The pointer to the start of the char range (string) * @param str The pointer to the start of the char range (string)
* @param strEnd The pointer to the end of the char range (string), defaults to NULL but is unused * @param strEnd The pointer to the end of the char range (string), defaults to NULL but is unused
* @returns An std::optional containing the desired value if it exists in the string * @returns An std::optional containing the desired value if it exists in the string
@ -188,7 +189,7 @@ namespace GeneralUtils {
* @returns An std::optional containing the desired value if it exists in the string * @returns An std::optional containing the desired value if it exists in the string
*/ */
template <typename T> template <typename T>
[[nodiscard]] std::optional<T> TryParse(const std::string& str) noexcept { [[nodiscard]] std::optional<T> TryParse(const std::string& str) {
return TryParse<T>(str.data(), str.data() + str.size()); return TryParse<T>(str.data(), str.data() + str.size());
} }
@ -198,7 +199,7 @@ namespace GeneralUtils {
* @returns An std::optional containing the desired value if it exists in the string * @returns An std::optional containing the desired value if it exists in the string
*/ */
template <typename T> template <typename T>
[[nodiscard]] std::optional<T> TryParse(const std::string_view str) noexcept { [[nodiscard]] std::optional<T> TryParse(const std::string_view str) {
return TryParse<T>(str.data(), str.data() + str.size()); return TryParse<T>(str.data(), str.data() + str.size());
} }
@ -210,7 +211,7 @@ namespace GeneralUtils {
* @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters * @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters
*/ */
template <typename T> template <typename T>
[[nodiscard]] std::optional<NiPoint3> TryParse(const std::string& strX, const std::string& strY, const std::string& strZ) noexcept { [[nodiscard]] std::optional<NiPoint3> TryParse(const std::string& strX, const std::string& strY, const std::string& strZ) {
const auto x = TryParse<float>(strX); const auto x = TryParse<float>(strX);
const auto y = TryParse<float>(strY); const auto y = TryParse<float>(strY);
const auto z = TryParse<float>(strZ); const auto z = TryParse<float>(strZ);
@ -224,8 +225,8 @@ namespace GeneralUtils {
* @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters * @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters
*/ */
template <typename T> template <typename T>
[[nodiscard]] std::optional<NiPoint3> TryParse(const std::vector<std::string>& str) noexcept { [[nodiscard]] std::optional<NiPoint3> TryParse(const std::vector<std::string>& str) {
return TryParse<NiPoint3>(str.at(0), str.at(1), str.at(2)); return (str.size() == 3) ? TryParse<NiPoint3>(str[0], str[1], str[2]) : std::nullopt;
} }
template <typename T> template <typename T>