Merge pull request #46 from OpenVicProject/fix/char-detection

Add runtime encoding detection and conversion 

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