diff options
Diffstat (limited to 'src/openvic-dataloader/v2script')
| -rw-r--r-- | src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp | 10 | ||||
| -rw-r--r-- | src/openvic-dataloader/v2script/Parser.cpp | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp b/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp index 5a98b40..71985f3 100644 --- a/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp +++ b/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp @@ -1,4 +1,4 @@ -#include "openvic-dataloader/v2script/AbstractSyntaxTree.hpp" +#include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp> #include <lexy/dsl/option.hpp> #include <lexy/encoding.hpp> @@ -31,6 +31,10 @@ ListValue::ListValue(dryad::node_ctor ctor, AssignStatementList statements) : no } } +ListValue::ListValue(dryad::node_ctor ctor) : node_base(ctor) { + _last_statement = nullptr; +} + FileTree::FileTree(dryad::node_ctor ctor, StatementList statements) : node_base(ctor) { insert_child_list_after(nullptr, statements); if (statements.empty()) { @@ -49,6 +53,10 @@ FileTree::FileTree(dryad::node_ctor ctor, AssignStatementList statements) : node } } +FileTree::FileTree(dryad::node_ctor ctor) : node_base(ctor) { + _last_node = nullptr; +} + std::string FileAbstractSyntaxTree::make_list_visualizer() const { const int INDENT_SIZE = 2; diff --git a/src/openvic-dataloader/v2script/Parser.cpp b/src/openvic-dataloader/v2script/Parser.cpp index 23dada7..a0003b1 100644 --- a/src/openvic-dataloader/v2script/Parser.cpp +++ b/src/openvic-dataloader/v2script/Parser.cpp @@ -76,6 +76,9 @@ struct Parser::ParseHandler final : detail::BasicStateParseHandler<v2script::ast } Parser::error_range get_errors() { + using iterator = typename decltype(std::declval<const error::Root*>()->children())::iterator; + if (!is_valid()) + return dryad::make_node_range<error::Error>(iterator::from_ptr(nullptr), iterator::from_ptr(nullptr)); return parse_state().logger().get_errors(); } }; @@ -149,19 +152,19 @@ constexpr void Parser::_run_load_func(detail::LoadCallback<Parser::ParseHandler* } } -constexpr Parser& Parser::load_from_buffer(const char* data, std::size_t size, std::optional<detail::Encoding> encoding_fallback) { +Parser& Parser::load_from_buffer(const char* data, std::size_t size, std::optional<detail::Encoding> encoding_fallback) { // Type can't be deduced? _run_load_func(std::mem_fn(&ParseHandler::load_buffer_size), data, size, encoding_fallback); return *this; } -constexpr Parser& Parser::load_from_buffer(const char* start, const char* end, std::optional<detail::Encoding> encoding_fallback) { +Parser& Parser::load_from_buffer(const char* start, const char* end, std::optional<detail::Encoding> encoding_fallback) { // Type can't be deduced? _run_load_func(std::mem_fn(&ParseHandler::load_buffer), start, end, encoding_fallback); return *this; } -constexpr Parser& Parser::load_from_string(const std::string_view string, std::optional<detail::Encoding> encoding_fallback) { +Parser& Parser::load_from_string(const std::string_view string, std::optional<detail::Encoding> encoding_fallback) { return load_from_buffer(string.data(), string.size(), encoding_fallback); } |