patterns: Updated pattern language

WerWolv · Jan 16, 2025 · 7564651 · 7564651
1 parent cad17dd
commit 7564651
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/external/pattern_language b/lib/external/pattern_language
diff --git a/plugins/builtin/include/content/views/view_pattern_editor.hpp b/plugins/builtin/include/content/views/view_pattern_editor.hpp
@@ -261,7 +261,7 @@ namespace hex::plugin::builtin {
         PerProvider<TextEditor::Breakpoints> m_breakpoints;
         PerProvider<std::optional<pl::core::err::PatternLanguageError>> m_lastEvaluationError;
         PerProvider<std::vector<pl::core::err::CompileError>> m_lastCompileError;
-        PerProvider<const std::vector<std::unique_ptr<pl::core::ast::ASTNode>>*> m_callStack;
+        PerProvider<const std::vector<pl::core::Evaluator::StackTrace>*> m_callStack;
         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;

diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp
@@ -1476,7 +1476,7 @@ namespace hex::plugin::builtin {
                 TextEditor::ErrorMarkers errorMarkers;
                 if (!(*m_callStack)->empty()) {
                     for (const auto &frame : **m_callStack | std::views::reverse) {
-                        auto location = frame->getLocation();
+                        auto location = frame.node->getLocation();
                         std::string message;
                         if (location.source != nullptr && location.source->mainSource) {
                             if (m_lastEvaluationError->has_value())
+3 −2		lib/include/pl/core/errors/error.hpp
+7 −2		lib/include/pl/core/evaluator.hpp
+9 −5		lib/source/pl/core/error.cpp
+1 −1		lib/source/pl/core/evaluator.cpp
+4 −3		lib/source/pl/pattern_language.cpp