imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 21:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert pattern language until it's stable again (#1468)

Browse Source 
- Revert pattern language
This commit is contained in:
Justus Garbe
2023-12-21 22:01:07 +01:00
committed by GitHub
parent ffc1aa6a91
commit ad8e3e38f0
6 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/builtin/source/ui/pattern_drawer.cpp
View File

@@ -150,7 +150,7 @@ namespace hex::plugin::builtin::ui {
}
std::optional<PatternDrawer::Filter> PatternDrawer::parseRValueFilter(pl::PatternLanguage *runtime, const std::string &filter) const {
std::optional<PatternDrawer::Filter> PatternDrawer::parseRValueFilter(const std::string &filter) const {
Filter result;
if (filter.empty()) {
@@ -162,16 +162,22 @@ namespace hex::plugin::builtin::ui {
char c = filter[i];
if (i < filter.size() - 1 && c == '=' && filter[i + 1] == '=') {
auto tokens = runtime->lexString(filter.substr(i + 2), pl::api::Source::DefaultSource);
if (!tokens.has_value())
try {
pl::core::Lexer lexer;
auto source = filter.substr(i + 2);
auto tokens = lexer.lex(filter.substr(i + 2), filter.substr(i + 2));
if (!tokens.has_value() || tokens->size() != 2)
return std::nullopt;
auto literal = std::get_if<pl::core::Token::Literal>(&tokens->front().value);
if (literal == nullptr)
return std::nullopt;
result.value = *literal;
} catch (pl::core::err::LexerError &) {
return std::nullopt;
auto literal = std::get_if<pl::core::Token::Literal>(&tokens->front().value);
if (literal == nullptr)
return std::nullopt;
result.value = *literal;
}
break;
} else if (c == '.')
result.path.emplace_back();
@@ -1102,7 +1108,7 @@ namespace hex::plugin::builtin::ui {
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x - ImGui::GetTextLineHeightWithSpacing() * 9.5);
if (ImGuiExt::InputTextIcon("##Search", ICON_VS_FILTER, m_filterText)) {
m_filter = parseRValueFilter(runtime, m_filterText).value_or(Filter{ });
m_filter = parseRValueFilter(m_filterText).value_or(Filter{ });
}
ImGui::PopItemWidth();