Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: awful wrong indentation in stringops #885

Merged
merged 4 commits into from
Sep 24, 2023
Merged

fix: awful wrong indentation in stringops #885

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23524d2
fix: awful wrong indentation in stringops
braindigitalis Sep 24, 2023
9b4a7d6
refactor: improved to_hex
braindigitalis Sep 24, 2023
8d62cf9
fix: add support for leading zeroes to to_hex
braindigitalis Sep 24, 2023
2fda856
improve by adding support for optional leading zero
braindigitalis Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions include/dpp/stringops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <algorithm>
#include <sstream>
#include <iostream>
#include <charconv>

namespace dpp {
/**
Expand All @@ -40,9 +41,9 @@ namespace dpp {
*/
template <typename T> std::basic_string<T> lowercase(const std::basic_string<T>& s)
{
std::basic_string<T> s2 = s;
std::transform(s2.begin(), s2.end(), s2.begin(), tolower);
return s2;
std::basic_string<T> s2 = s;
std::transform(s2.begin(), s2.end(), s2.begin(), tolower);
return s2;
}

/**
Expand All @@ -54,9 +55,9 @@ template <typename T> std::basic_string<T> lowercase(const std::basic_string<T>&
*/
template <typename T> std::basic_string<T> uppercase(const std::basic_string<T>& s)
{
std::basic_string<T> s2 = s;
std::transform(s2.begin(), s2.end(), s2.begin(), toupper);
return s2;
std::basic_string<T> s2 = s;
std::transform(s2.begin(), s2.end(), s2.begin(), toupper);
return s2;
}

/**
Expand Down Expand Up @@ -185,14 +186,19 @@ template <int> int from_string(const std::string &s)
*
* @tparam T numeric type
* @param i numeric value
* @param leading_zeroes set to false if you don't want the leading zeroes in the output
* @return std::string value in hex, the length will be 2* the raw size of the type
*/
template <typename T> std::string to_hex(T i)
template <typename T> std::string to_hex(T i, bool leading_zeroes = true)
{
std::stringstream stream;
stream.imbue(std::locale::classic());
stream << std::setfill('0') << std::setw(sizeof(T)*2) << std::hex << i;
return stream.str();
char str[26] = { 0 };
size_t size = sizeof(T) * 2;
std::to_chars(std::begin(str), std::end(str), i, 16);
std::string out{str};
if (leading_zeroes && out.length() < size) {
out.insert(out.begin(), size - out.length(), '0');
}
return out;
}

/**
Expand All @@ -205,10 +211,10 @@ template <typename T> std::string to_hex(T i)
*/
template <typename T> std::string leading_zeroes(T i, size_t width)
{
std::stringstream stream;
std::stringstream stream;
stream.imbue(std::locale::classic());
stream << std::setfill('0') << std::setw((int)width) << std::dec << i;
return stream.str();
stream << std::setfill('0') << std::setw((int)width) << std::dec << i;
return stream.str();
}

} // namespace dpp