Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pattern: Improved error messages when including std files or calling unknown std functions

This commit is contained in:
WerWolv 2022-02-05 23:02:38 +01:00
parent 8ab4d25e33
commit 5c3bfa690b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libimhex/include/hex/pattern_language/ast_node.hpp
View File

@ -2015,8 +2015,13 @@ namespace hex::pl {
for (auto &func : customFunctions)
functions.insert(func);
if (!functions.contains(this->m_functionName))
if (!functions.contains(this->m_functionName)) {
if (this->m_functionName.starts_with("std::")) {
evaluator->getConsole().log(LogConsole::Level::Warning, "This function might be part of the standard library.\nYou can install the standard library though\nthe Content Store found under Help -> Content Store.");
}
LogConsole::abortEvaluation(hex::format("call to unknown function '{}'", this->m_functionName), this);
}
auto function = functions[this->m_functionName];
if (function.parameterCount == ContentRegistry::PatternLanguage::UnlimitedParameters) {

8
lib/libimhex/source/pattern_language/preprocessor.cpp
View File

@ -72,8 +72,12 @@ namespace hex::pl {
}
File file(includePath, File::Mode::Read);
if (!file.isValid())
throwPreprocessorError(hex::format("{0}: No such file or directory", includeFile.c_str()), lineNumber);
if (!file.isValid()) {
if (includePath.parent_path().filename().string() == "std")
throwPreprocessorError(hex::format("{0}: No such file or directory.\n\nThis file might be part of the standard library.\nYou can install the standard library though\nthe Content Store found under Help -> Content Store.", includeFile.c_str()), lineNumber);
else
throwPreprocessorError(hex::format("{0}: No such file or directory", includeFile.c_str()), lineNumber);
}
bool shouldInclude = true;
this->addPragmaHandler("once", [&, includePath, this](const std::string &value) {