imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 13:37:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Remove duplicated string functions and use libwolv ones instead

Browse Source
This commit is contained in:
WerWolv
2025-07-26 13:35:08 +02:00
parent e22923a980
commit e85216d9a6
7 changed files with 28 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/builtin/source/content/text_highlighting/pattern_language.cpp
View File

@@ -117,11 +117,11 @@ namespace hex::plugin::builtin {
return true;
std::vector<std::string> vectorString;
if (identifierName.contains("::")) {
vectorString = hex::splitString(identifierName, "::");
vectorString = wolv::util::splitString(identifierName, "::");
if (vectorString.size() > 1) {
shortName = vectorString.back();
vectorString.pop_back();
identifierName = hex::combineStrings(vectorString, "::");
identifierName = wolv::util::combineStrings(vectorString, "::");
}
}
bool found = true;
@@ -415,7 +415,7 @@ namespace hex::plugin::builtin {
separator = "::";
else
separator = ".";
auto vectorString = hex::splitString(identifierName, separator);
auto vectorString = wolv::util::splitString(identifierName, separator);
std::string nameSpace;
u32 index = 0;
@@ -623,7 +623,7 @@ namespace hex::plugin::builtin {
if (!getQualifiedName(variableName, identifiers, true))
return false;
auto vectorString = hex::splitString(variableName, ".");
auto vectorString = wolv::util::splitString(variableName, ".");
u32 index = 0;
@@ -742,7 +742,7 @@ namespace hex::plugin::builtin {
if (!getQualifiedName(identifierName, identifiers, true))
return false;
auto tokenCount = m_tokens.size();
auto vectorString = hex::splitString(identifierName, "::");
auto vectorString = wolv::util::splitString(identifierName, "::");
auto vectorStringCount = vectorString.size();
if (identifiers.size() != vectorStringCount)
return false;
@@ -917,7 +917,7 @@ namespace hex::plugin::builtin {
functionName = namespaceName + "::" + functionName;
} else {
auto vectorString = hex::splitString(functionName, "::");
auto vectorString = wolv::util::splitString(functionName, "::");
vectorString.pop_back();
for (auto nameSpace: vectorString) {
@@ -987,7 +987,7 @@ namespace hex::plugin::builtin {
if (optionalFullName.empty())
forwardIdentifierName(fullName, identifiers);
auto nameParts = hex::splitString(fullName, ".");
auto nameParts = wolv::util::splitString(fullName, ".");
std::vector<std::string> grandpaTypes;
findParentTypes(parentTypes);
@@ -1013,7 +1013,7 @@ namespace hex::plugin::builtin {
nameParts.insert(nameParts.begin(), currentName);
identifiers.insert(identifiers.begin(), identifier);
optionalFullName = hex::combineStrings(nameParts, ".");
optionalFullName = wolv::util::combineStrings(nameParts, ".");
return true;
}
@@ -1080,7 +1080,7 @@ namespace hex::plugin::builtin {
std::optional<Definition> &result,
std::vector<Identifier *> &identifiers) {
auto vectorString = hex::splitString(variableName, ".");
auto vectorString = wolv::util::splitString(variableName, ".");
auto count = vectorString.size();
auto UDTName = parentType;
auto currentName = vectorString[0];
@@ -1097,7 +1097,7 @@ namespace hex::plugin::builtin {
}
vectorString.erase(vectorString.begin());
variableName = hex::combineStrings(vectorString, ".");
variableName = wolv::util::combineStrings(vectorString, ".");
Identifier *identifier = identifiers[0];
identifiers.erase(identifiers.begin());
skipArray(200, true);
@@ -1135,10 +1135,10 @@ namespace hex::plugin::builtin {
forwardIdentifierName(fullName, identifiers);
std::vector<std::string> parentTypes;
auto vectorString = hex::splitString(fullName, ".");
auto vectorString = wolv::util::splitString(fullName, ".");
if (vectorString[0] == "Parent") {
vectorString.erase(vectorString.begin());
fullName = hex::combineStrings(vectorString, ".");
fullName = wolv::util::combineStrings(vectorString, ".");
identifiers.erase(identifiers.begin());
if (!findAllParentTypes(parentTypes, identifiers, fullName)) {
m_curr = curr;
@@ -1223,7 +1223,7 @@ namespace hex::plugin::builtin {
// Render the compilation errors using squiggly lines
void TextHighlighter::renderErrors() {
const auto processMessage = [](const auto &message) {
auto lines = hex::splitString(message, "\n");
auto lines = wolv::util::splitString(message, "\n");
std::ranges::transform(lines, lines.begin(), [](auto line) {
@@ -1233,7 +1233,7 @@ namespace hex::plugin::builtin {
return hex::limitStringLength(line, 128);
});
return hex::combineStrings(lines, "\n");
return wolv::util::combineStrings(lines, "\n");
};
TextEditor::ErrorMarkers errorMarkers;
@@ -1721,7 +1721,7 @@ namespace hex::plugin::builtin {
}
std::vector<std::string> candidates;
for (auto name: m_UDTs) {
auto vectorString = hex::splitString(name, "::");
auto vectorString = wolv::util::splitString(name, "::");
if (typeStr == vectorString.back())
candidates.push_back(name);
@@ -1737,7 +1737,7 @@ namespace hex::plugin::builtin {
}
// Definitions of global variables and placed variables.
void TextHighlighter::loadGlobalDefinitions( Scopes tokenRangeSet, std::vector<IdentifierType> identifierTypes, Variables &variables) {
void TextHighlighter::loadGlobalDefinitions(Scopes tokenRangeSet, std::vector<IdentifierType> identifierTypes, Variables &variables) {
m_startToken = m_originalPosition = m_partOriginalPosition = TokenIter(m_tokens.begin(), m_tokens.end());
for (auto range: tokenRangeSet) {
@@ -1917,7 +1917,7 @@ namespace hex::plugin::builtin {
if (m_text.empty())
m_text = m_viewPatternEditor->getTextEditor().GetText();
m_lines = hex::splitString(m_text, "\n");
m_lines = wolv::util::splitString(m_text, "\n");
m_lines.push_back("");
m_firstTokenIdOfLine.clear();
m_firstTokenIdOfLine.resize(m_lines.size(), -1);

2
plugins/builtin/source/content/views/view_bookmarks.cpp
View File

@@ -184,7 +184,7 @@ namespace hex::plugin::builtin {
for (const auto &[bookmark, highlightVisible] : bookmarks) {
result += hex::format("### <span style=\"background-color: #{:06X}80\">{} [0x{:04X} - 0x{:04X}]</span>\n\n", hex::changeEndianness(bookmark.color, std::endian::big) >> 8, bookmark.name, bookmark.region.getStartAddress(), bookmark.region.getEndAddress());
for (const auto &line : hex::splitString(bookmark.comment, "\n"))
for (const auto &line : wolv::util::splitString(bookmark.comment, "\n"))
result += hex::format("> {}\n", line);
result += "\n";

6
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -1938,7 +1938,7 @@ namespace hex::plugin::builtin {
TextEditor::Selection selection = m_selection.get(newProvider);
m_textEditor.get(newProvider).SetSelection(selection.mStart, selection.mEnd);
m_textEditor.get(newProvider).SetBreakpoints(m_breakpoints.get(newProvider));
m_consoleEditor.get(newProvider).SetText(hex::combineStrings(m_console.get(newProvider), "\n"));
m_consoleEditor.get(newProvider).SetText(wolv::util::combineStrings(m_console.get(newProvider), "\n"));
m_consoleEditor.get(newProvider).SetCursorPosition(m_consoleCursorPosition.get(newProvider));
m_consoleEditor.get(newProvider).SetLongestLineLength(m_consoleLongestLineLength.get(newProvider));
selection = m_consoleSelection.get(newProvider);
@@ -2161,9 +2161,9 @@ namespace hex::plugin::builtin {
if (type->isTemplateType())
continue;
createNestedMenu(hex::splitString(typeName, "::"), [&, this] {
createNestedMenu(wolv::util::splitString(typeName, "::"), [&, this] {
std::string variableName;
for (const char c : hex::replaceStrings(typeName, "::", "_"))
for (const char c : wolv::util::replaceStrings(typeName, "::", "_"))
variableName += static_cast<char>(std::tolower(c));
variableName += hex::format("_at_0x{:02X}", selection->getStartAddress());