xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small code refactoring

Browse Source
This commit is contained in:
Maxime Coste 2016-11-22 23:51:09 +00:00
parent 3f3ed0b333
commit ca0606017f
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/string.cc
View File

@ -283,17 +283,16 @@ String replace(StringView str, StringView substr, StringView replacement)
Optional<int> str_to_int_ifp(StringView str) Optional<int> str_to_int_ifp(StringView str)
{ {
bool negative = not str.empty() and str[0] == '-';
if (negative)
str = str.substr(1_byte);
unsigned int res = 0; unsigned int res = 0;
bool negative = false; for (auto c : str)
for (auto it = str.begin(), end = str.end(); it != end; ++it)
{ {
const char c = *it; if (c < '0' or c > '9')
if (it == str.begin() and c == '-')
negative = true;
else if (c >= '0' and c <= '9')
res = res * 10 + c - '0';
else
return {}; return {};
res = res * 10 + c - '0';
} }
return negative ? -(int)res : (int)res; return negative ? -(int)res : (int)res;
} }
@ -474,11 +473,9 @@ void format_impl(StringView fmt, ArrayView<const StringView> params, AppendFunc
auto closing = std::find(opening, end, '}'); auto closing = std::find(opening, end, '}');
if (closing == end) if (closing == end)
throw runtime_error("Format string error, unclosed '{'"); throw runtime_error("Format string error, unclosed '{'");
int index;
if (closing == opening + 1) const int index = (closing == opening + 1) ?
index = implicitIndex; implicitIndex : str_to_int({opening+1, closing});
else
index = str_to_int({opening+1, closing});
if (index >= params.size()) if (index >= params.size())
throw runtime_error("Format string parameter index too big"); throw runtime_error("Format string parameter index too big");