diff options
author | Spartan322 <Megacake1234@gmail.com> | 2024-05-09 16:06:02 +0200 |
---|---|---|
committer | Spartan322 <Megacake1234@gmail.com> | 2024-06-18 01:31:12 +0200 |
commit | b0c3ba3f91926b0c95625bdbf4aab69269130b13 (patch) | |
tree | f15ebc47d6bf370031af28e4bb4814ae30ef46e1 /src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp | |
parent | 7b521d6023113372cf6b02e562828273c4040f0e (diff) |
Add runtime encoding detection and conversionfix/char-detection
Win-1251/1252 detection is a reduced C++ version of https://github.com/hsivonen/chardetng
Add manually-specified encoding fallback
Add default system encoding fallback
Add error recovery to v2script
Add unknown encoding detection warning
Remove csv::Parser templating
Fix lua files dropping data
Update lexy to foonathan/lexy@1e5d99fa3826b1c3c8628d3a11117fb4fb4cc0d0
Remove exclusive reliance on lexy::default_encoding for v2script
Move internal concepts to src/openvic-detail/InternalConcepts.hpp
Move contents of DetectUtf8.hpp to src/detail/Detect.hpp
Move openvic-dataloader/AbstractSyntaxTree.hpp to src
Move DiagnosticLogger.hpp to src
Move File.hpp to src
Move openvic-dataloader/detail/utlity files to openvic-dataloader/detail
Add ovdl::utility::type_concat
Add ovdl::utility::type_prepend
Add ovdl::utility::is_instance_of
Overhaul parse error messages
Diffstat (limited to 'src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp')
-rw-r--r-- | src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp b/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp index abade40..5a98b40 100644 --- a/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp +++ b/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp @@ -1,8 +1,7 @@ -#include <stddef.h> - -#include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp> +#include "openvic-dataloader/v2script/AbstractSyntaxTree.hpp" #include <lexy/dsl/option.hpp> +#include <lexy/encoding.hpp> #include <lexy/input_location.hpp> #include <dryad/node.hpp> @@ -23,6 +22,15 @@ ListValue::ListValue(dryad::node_ctor ctor, StatementList statements) } } +ListValue::ListValue(dryad::node_ctor ctor, AssignStatementList statements) : node_base(ctor) { + insert_child_list_after(nullptr, statements); + if (statements.empty()) { + _last_statement = nullptr; + } else { + _last_statement = statements.back(); + } +} + FileTree::FileTree(dryad::node_ctor ctor, StatementList statements) : node_base(ctor) { insert_child_list_after(nullptr, statements); if (statements.empty()) { @@ -32,29 +40,22 @@ FileTree::FileTree(dryad::node_ctor ctor, StatementList statements) : node_base( } } -// static void _handle_string_characters(std::string& string, bool allow_newline) { -// size_t position = 0; -// for (auto& c : string) { -// switch (c) { -// case '\r': -// case '\n': -// if (allow_newline) goto END_LOOP; -// c = ' '; -// break; -// default: break; -// } -// END_LOOP: -// position++; -// } -// } - -std::string AbstractSyntaxTree::make_list_visualizer() const { +FileTree::FileTree(dryad::node_ctor ctor, AssignStatementList statements) : node_base(ctor) { + insert_child_list_after(nullptr, statements); + if (statements.empty()) { + _last_node = nullptr; + } else { + _last_node = statements.back(); + } +} + +std::string FileAbstractSyntaxTree::make_list_visualizer() const { const int INDENT_SIZE = 2; std::string result; unsigned int level = 0; - for (auto [event, node] : dryad::traverse(_tree)) { + for (auto [event, node] : dryad::traverse(this->_tree)) { if (event == dryad::traverse_event::exit) { --level; continue; @@ -66,7 +67,7 @@ std::string AbstractSyntaxTree::make_list_visualizer() const { dryad::visit_node( node, [&](const FlatValue* value) { - result.append(value->value(_symbol_interner)); + result.append(value->value(this->_symbol_interner)); }, [&](const ListValue* value) { }, @@ -89,19 +90,19 @@ std::string AbstractSyntaxTree::make_list_visualizer() const { return result; } -std::string AbstractSyntaxTree::make_native_visualizer() const { +std::string FileAbstractSyntaxTree::make_native_visualizer() const { constexpr int INDENT_SIZE = 2; std::string result; unsigned int level = 0; dryad::visit_tree( - _tree, + this->_tree, [&](const IdentifierValue* value) { - result.append(value->value(_symbol_interner)); + result.append(value->value(this->_symbol_interner)); }, [&](const StringValue* value) { - result.append(1, '"').append(value->value(_symbol_interner)).append(1, '"'); + result.append(1, '"').append(value->value(this->_symbol_interner)).append(1, '"'); }, [&](dryad::child_visitor<NodeKind> visitor, const ValueStatement* statement) { visitor(statement->value()); |