love/txtv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use snake_case

Browse Source
This commit is contained in:
Love 2025-01-24 14:06:26 +01:00
parent 51943a5123
commit e0eba95ff4
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Page.cpp
View File

@ -86,8 +86,8 @@ std::string Page::str() const {
while (std::getline(stream, line)) while (std::getline(stream, line))
ret += line + "\n"; ret += line + "\n";
string_utils::limitConsecutiveWhitespace(ret, MAX_WHITESPACE); string_utils::limit_consecutive_whitespace(ret, MAX_WHITESPACE);
string_utils::removeTrailingWhitespace(ret); string_utils::remove_trailing_whitespace(ret);
return ret; return ret;
} }

16
src/stringutil.cpp
View File

@ -14,28 +14,28 @@
namespace string_utils { namespace string_utils {
bool isAllWhitespace(const std::string &str) { bool is_all_whitespace(const std::string &str) {
return std::ranges::all_of(str, [](const unsigned char c) -> bool { return std::ranges::all_of(str, [](const unsigned char c) -> bool {
return std::isspace(c); return std::isspace(c);
}); });
} }
void removeTrailingWhitespace(std::string &str) { void remove_trailing_whitespace(std::string &str) {
auto shouldRemoveTrailingWhitespace = [&str]() -> bool { auto shouldRemoveTrailingWhitespace = [&str]() -> bool {
std::size_t last_newline = str.find_last_of('\n'); std::size_t last_newline = str.find_last_of('\n');
if (last_newline == std::string::npos) if (last_newline == std::string::npos)
return isAllWhitespace(str); return is_all_whitespace(str);
const std::string last_line = str.substr(last_newline + 1); const std::string last_line = str.substr(last_newline + 1);
return isAllWhitespace(last_line); return is_all_whitespace(last_line);
}; };
while (shouldRemoveTrailingWhitespace()) { while (shouldRemoveTrailingWhitespace()) {
const std::size_t last_newline = str.find_last_of('\n'); const std::size_t last_newline = str.find_last_of('\n');
if (last_newline == std::string::npos) { if (last_newline == std::string::npos) {
if (isAllWhitespace(str)) if (is_all_whitespace(str))
str.clear(); str.clear();
break; break;
} }
@ -44,11 +44,11 @@ namespace string_utils {
} }
} }
void removeTabs(std::string &str) { void remove_tabs(std::string &str) {
std::erase(str, '\t'); std::erase(str, '\t');
} }
void limitConsecutiveWhitespace(std::string &str, const uint_fast8_t maxWhitespace) { void limit_consecutive_whitespace(std::string &str, const uint_fast8_t maxWhitespace) {
std::istringstream stream(str); std::istringstream stream(str);
std::string line; std::string line;
std::ostringstream processedStream; std::ostringstream processedStream;
@ -57,7 +57,7 @@ namespace string_utils {
bool hasAddedRealTextJet = false; bool hasAddedRealTextJet = false;
while (std::getline(stream, line)) { while (std::getline(stream, line)) {
const bool onlySpace = isAllWhitespace(line); const bool onlySpace = is_all_whitespace(line);
if (!hasAddedRealTextJet) { if (!hasAddedRealTextJet) {
if (onlySpace) if (onlySpace)

8
src/stringutil.hpp
View File

@ -23,7 +23,7 @@ namespace string_utils {
* @return true If all characters in the string are whitespace. * @return true If all characters in the string are whitespace.
* @return false Otherwise. * @return false Otherwise.
*/ */
bool isAllWhitespace(const std::string& str); bool is_all_whitespace(const std::string& str);
/** /**
* @brief Removes trailing whitespace lines from the given string. * @brief Removes trailing whitespace lines from the given string.
@ -33,14 +33,14 @@ namespace string_utils {
* *
* @param str The string from which to remove trailing whitespace lines. * @param str The string from which to remove trailing whitespace lines.
*/ */
void removeTrailingWhitespace(std::string& str); void remove_trailing_whitespace(std::string& str);
/** /**
* @brief Removes all tab characters from the given string. * @brief Removes all tab characters from the given string.
* *
* @param str The string from which to remove tab characters. * @param str The string from which to remove tab characters.
*/ */
void removeTabs(std::string& str); void remove_tabs(std::string& str);
/** /**
* @brief Limits the number of consecutive whitespace lines in the given string. * @brief Limits the number of consecutive whitespace lines in the given string.
@ -51,6 +51,6 @@ namespace string_utils {
* @param str The string to process. * @param str The string to process.
* @param maxWhitespace The maximum allowed consecutive whitespace lines. * @param maxWhitespace The maximum allowed consecutive whitespace lines.
*/ */
void limitConsecutiveWhitespace(std::string& str, uint_fast8_t maxWhitespace); void limit_consecutive_whitespace(std::string& str, uint_fast8_t maxWhitespace);
} }