aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-dataloader/v2script/ParseState.hpp
diff options
context:
space:
mode:
author Spartan322 <Megacake1234@gmail.com>2024-05-09 16:06:02 +0200
committer Spartan322 <Megacake1234@gmail.com>2024-06-18 01:31:12 +0200
commitb0c3ba3f91926b0c95625bdbf4aab69269130b13 (patch)
treef15ebc47d6bf370031af28e4bb4814ae30ef46e1 /src/openvic-dataloader/v2script/ParseState.hpp
parent7b521d6023113372cf6b02e562828273c4040f0e (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/ParseState.hpp')
-rw-r--r--src/openvic-dataloader/v2script/ParseState.hpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/openvic-dataloader/v2script/ParseState.hpp b/src/openvic-dataloader/v2script/ParseState.hpp
index 8e29bf5..954e39d 100644
--- a/src/openvic-dataloader/v2script/ParseState.hpp
+++ b/src/openvic-dataloader/v2script/ParseState.hpp
@@ -1,23 +1,24 @@
#pragma once
-#include <openvic-dataloader/File.hpp>
-#include <openvic-dataloader/ParseState.hpp>
#include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp>
#include <lexy/encoding.hpp>
+#include "../openvic-dataloader/ParseState.hpp"
+#include "AbstractSyntaxTree.hpp"
+#include "File.hpp"
+#include "detail/InternalConcepts.hpp"
+
namespace ovdl::v2script::ast {
- using File = ovdl::BasicFile<lexy::default_encoding, Node>;
- struct AbstractSyntaxTree : ovdl::BasicAbstractSyntaxTree<File, FileTree> {
- using BasicAbstractSyntaxTree::BasicAbstractSyntaxTree;
+
+ struct FileAbstractSyntaxTree : ovdl::BasicAbstractSyntaxTree<ovdl::BasicFile<Node>, FileTree> {
+ using ovdl::BasicAbstractSyntaxTree<ovdl::BasicFile<Node>, FileTree>::BasicAbstractSyntaxTree;
std::string make_list_visualizer() const;
std::string make_native_visualizer() const;
};
- using ParseState = ovdl::ParseState<AbstractSyntaxTree>;
+ using ParseState = ovdl::ParseState<FileAbstractSyntaxTree>;
- static_assert(IsFile<ast::File>, "File failed IsFile concept");
- static_assert(IsAst<ast::AbstractSyntaxTree>, "AbstractSyntaxTree failed IsAst concept");
- static_assert(IsParseState<ast::ParseState>, "ParseState failed IsParseState concept");
+ static_assert(detail::IsParseState<ast::ParseState>, "ParseState failed IsParseState concept");
} \ No newline at end of file