drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/std] Make ox_atoi return an ox::Result

Browse Source
This commit is contained in:
Gary Talent 2021-03-03 00:30:16 -06:00
parent 28e68adc75
commit c5773202b5
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/clargs/clargs.cpp vendored
View File

@ -28,7 +28,9 @@ ClArgs::ClArgs(int argc, const char **args) {
m_bools[arg] = false;
}
m_strings[arg] = val;
m_ints[arg] = ox_atoi(val.c_str());
if (auto r = ox_atoi(val.c_str()); r.error == 0) {
m_ints[arg] = r.value;
}
i++;
}
}

4
deps/ox/src/ox/claw/read.cpp vendored
View File

@ -49,7 +49,9 @@ Result<ClawHeader> readHeader(const char *buff, std::size_t buffLen) noexcept {
return OxError(1);
}
hdr.typeName = typeName;
hdr.typeVersion = ox_atoi(versionStr.c_str());
if (auto r = ox_atoi(versionStr.c_str()); r.error == 0) {
hdr.typeVersion = r.value;
}
hdr.data = buff;
hdr.dataSize = buffLen;
return hdr;

13
deps/ox/src/ox/std/strops.hpp vendored
View File

@ -8,6 +8,7 @@
#pragma once
#include "error.hpp"
#include "math.hpp"
#include "types.hpp"
#include "typetraits.hpp"
@ -125,15 +126,17 @@ template<typename T1, typename T2>
return retval;
}
[[nodiscard]] constexpr int ox_atoi(const char *str) noexcept {
[[nodiscard]] constexpr ox::Result<int> ox_atoi(const char *str) noexcept {
int total = 0;
int multiplier = 1;
for (auto i = static_cast<int64_t>(ox_strlen(str)) - 1; i != -1; i--) {
total += (str[i] - '0') * multiplier;
multiplier *= 10;
if (str[i] >= '0' && str[i] <= '9') {
total += (str[i] - '0') * multiplier;
multiplier *= 10;
} else {
return OxError(1);
}
}
return total;
}