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

Fixed pattern language being basically completely broken

Browse Source
This commit is contained in:
WerWolv
2021-01-23 14:00:09 +01:00
parent 8e46751e98
commit 51d9d37d1a
5 changed files with 56 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/views/view_pattern.cpp
View File

@@ -75,7 +75,7 @@ namespace hex {
ViewPattern::ViewPattern(std::vector<lang::PatternData*> &patternData) : View("Pattern"), m_patternData(patternData) {
this->m_patternLanguageRuntime = new lang::PatternLanguage(SharedData::currentProvider);
this->m_patternLanguageRuntime = new lang::PatternLanguage();
this->m_textEditor.SetLanguageDefinition(PatternLanguage());
this->m_textEditor.SetShowWhitespaces(false);
@@ -335,16 +335,19 @@ namespace hex {
this->m_console.clear();
this->postEvent(Events::PatternChanged);
auto result = this->m_patternLanguageRuntime->executeString(buffer);
auto result = this->m_patternLanguageRuntime->executeString(SharedData::currentProvider, buffer);
if (!result.has_value()) {
this->m_textEditor.SetErrorMarkers({ this->m_patternLanguageRuntime->getError().value() });
auto error = this->m_patternLanguageRuntime->getError();
if (error.has_value()) {
this->m_textEditor.SetErrorMarkers({ error.value() });
}
this->m_console = this->m_patternLanguageRuntime->getConsoleLog();
this->m_patternData = result.value();
View::postEvent(Events::PatternChanged);
if (result.has_value()) {
this->m_patternData = std::move(result.value());
View::postEvent(Events::PatternChanged);
}
}
}