development/ImHex
development/ImHex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex synced 2024-10-19 09:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

patterns: Merged in new pattern language refactor (#1533)

Browse source
This commit is contained in:
Nik 2024-02-04 14:03:42 +01:00 committed by GitHub
parent f60986de8e
commit 5e5714baeb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 47 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/external/pattern_language vendored

@ -1 +1 @@
Subproject commit 82cce312ec0845cb2f31f0653beddcb69f077364
Subproject commit 188a8089a8f23d0cdacc0f6c38384e4f8fe93ef1

1
plugins/builtin/include/content/views/view_pattern_editor.hpp
View file

@ -204,6 +204,7 @@ namespace hex::plugin::builtin {
std::mutex m_logMutex;
PerProvider<std::optional<pl::core::err::PatternLanguageError>> m_lastEvaluationError;
PerProvider<std::vector<pl::core::err::CompileError>> m_lastCompileError;
PerProvider<std::map<std::string, pl::core::Token::Literal>> m_lastEvaluationOutVars;
PerProvider<std::map<std::string, PatternVariable>> m_patternVariables;
PerProvider<std::map<u64, pl::api::Section>> m_sections;

2
plugins/builtin/source/content/views/view_data_inspector.cpp
View file

@ -135,7 +135,7 @@ namespace hex::plugin::builtin {
// Execute the inspector file
if (!inspectorCode.empty()) {
if (m_runtime.executeString(inspectorCode, {}, inVariables, true)) {
if (m_runtime.executeString(inspectorCode, pl::api::Source::DefaultSource, {}, inVariables, true)) {
// Loop over patterns produced by the runtime
const auto &patterns = m_runtime.getPatterns();

63
plugins/builtin/source/content/views/view_pattern_editor.cpp
View file

@ -43,7 +43,7 @@ namespace hex::plugin::builtin {
static TextEditor::LanguageDefinition langDef;
if (!initialized) {
constexpr static std::array keywords = {
"using", "struct", "union", "enum", "bitfield", "be", "le", "if", "else", "match", "false", "true", "this", "parent", "addressof", "sizeof", "typenameof", "$", "while", "for", "fn", "return", "break", "continue", "namespace", "in", "out", "ref", "null", "const", "unsigned", "signed", "try", "catch"
"using", "struct", "union", "enum", "bitfield", "be", "le", "if", "else", "match", "false", "true", "this", "parent", "addressof", "sizeof", "typenameof", "$", "while", "for", "fn", "return", "break", "continue", "namespace", "in", "out", "ref", "null", "const", "unsigned", "signed", "try", "catch", "import", "as"
};
for (auto &k : keywords)
langDef.mKeywords.insert(k);
@ -1255,26 +1255,31 @@ namespace hex::plugin::builtin {
if (!m_lastEvaluationProcessed) {
if (!m_lastEvaluationResult) {
const auto processMessage = [](const auto &message) {
auto lines = wolv::util::splitString(message, "\n");
std::ranges::transform(lines, lines.begin(), [](auto line) {
if (line.size() >= 128)
line = wolv::util::trim(line);
return hex::limitStringLength(line, 128);
});
return wolv::util::combineStrings(lines, "\n");
};
TextEditor::ErrorMarkers errorMarkers;
if (m_lastEvaluationError->has_value()) {
const auto message = [this]{
const auto &message = (*m_lastEvaluationError)->message;
auto lines = wolv::util::splitString(message, "\n");
std::ranges::transform(lines, lines.begin(), [](auto line) {
if (line.size() >= 128)
line = wolv::util::trim(line);
return hex::limitStringLength(line, 128);
});
return wolv::util::combineStrings(lines, "\n");
}();
const TextEditor::ErrorMarkers errorMarkers = {
{ (*m_lastEvaluationError)->line, message }
};
m_textEditor.SetErrorMarkers(errorMarkers);
errorMarkers[(*m_lastEvaluationError)->line] = processMessage((*m_lastEvaluationError)->message);
}
if (!m_lastCompileError->empty()) {
for (const auto &error : *m_lastCompileError) {
errorMarkers[error.getLocation().line] = processMessage(error.getMessage());
}
}
m_textEditor.SetErrorMarkers(errorMarkers);
} else {
for (auto &[name, variable] : *m_patternVariables) {
if (variable.outVariable && m_lastEvaluationOutVars->contains(name))
@ -1385,14 +1390,13 @@ namespace hex::plugin::builtin {
if (!file.isValid())
continue;
try {
auto &preprocessor = runtime.getInternals().preprocessor;
auto ret = preprocessor->preprocess(runtime, file.readString());
if (!ret.has_value()) {
log::warn("Failed to preprocess file {} during MIME analysis: {}", entry.path().string(), preprocessor->getError()->what());
}
} catch (pl::core::err::PreprocessorError::Exception &e) {
log::warn("Failed to preprocess file {} during MIME analysis: {}", entry.path().string(), e.what());
auto &preprocessor = runtime.getInternals().preprocessor;
pl::api::Source source(file.readString());
auto ret = preprocessor->preprocess(&runtime, &source);
if (ret.hasErrs()) {
log::warn("Failed to preprocess file {} during MIME analysis", entry.path().string());
}
if (foundCorrectType)
@ -1488,7 +1492,7 @@ namespace hex::plugin::builtin {
m_runningParsers += 1;
ContentRegistry::PatternLanguage::configureRuntime(*m_editorRuntime, nullptr);
const auto &ast = m_editorRuntime->parseString(code);
const auto &ast = m_editorRuntime->parseString(code, pl::api::Source::DefaultSource);
auto &patternVariables = m_patternVariables.get(provider);
auto oldPatternVariables = std::move(patternVariables);
@ -1616,9 +1620,10 @@ namespace hex::plugin::builtin {
};
m_lastEvaluationResult = runtime.executeString(code, envVars, inVariables);
m_lastEvaluationResult = runtime.executeString(code, pl::api::Source::DefaultSource, envVars, inVariables);
if (!m_lastEvaluationResult) {
*m_lastEvaluationError = runtime.getError();
*m_lastCompileError = runtime.getCompileErrors();
}
TaskManager::doLater([code] {

23
plugins/ui/source/ui/pattern_drawer.cpp
View file

@ -162,22 +162,19 @@ namespace hex::ui {
char c = filter[i];
if (i < filter.size() - 1 && c == '=' && filter[i + 1] == '=') {
try {
pl::core::Lexer lexer;
pl::core::Lexer lexer;
auto source = filter.substr(i + 2);
auto tokens = lexer.lex(filter.substr(i + 2), filter.substr(i + 2));
pl::api::Source source(filter.substr(i + 2));
auto tokens = lexer.lex(&source);
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 &) {
if (!tokens.isOk() || tokens.unwrap().size() != 2)
return std::nullopt;
}
auto literal = std::get_if<pl::core::Token::Literal>(&tokens.unwrap().front().value);
if (literal == nullptr)
return std::nullopt;
result.value = *literal;
break;
} else if (c == '.') {
result.path.emplace_back();