From 9802f0b500fd753b49b1785edbe204d46aac4b3d Mon Sep 17 00:00:00 2001
From: Spartan322 <Megacake1234@gmail.com>
Date: Wed, 15 May 2024 12:22:06 -0400
Subject: Expose dataloader includes Fix dataloader file includes Fix leaking
 lexy includes

---
 include/openvic-dataloader/v2script/AbstractSyntaxTree.hpp | 14 --------------
 include/openvic-dataloader/v2script/Parser.hpp             |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'include/openvic-dataloader/v2script')

diff --git a/include/openvic-dataloader/v2script/AbstractSyntaxTree.hpp b/include/openvic-dataloader/v2script/AbstractSyntaxTree.hpp
index 1e7b2c3..27dbfcb 100644
--- a/include/openvic-dataloader/v2script/AbstractSyntaxTree.hpp
+++ b/include/openvic-dataloader/v2script/AbstractSyntaxTree.hpp
@@ -6,7 +6,6 @@
 #include <openvic-dataloader/AbstractSyntaxTree.hpp>
 #include <openvic-dataloader/File.hpp>
 #include <openvic-dataloader/NodeLocation.hpp>
-#include <openvic-dataloader/ParseState.hpp>
 #include <openvic-dataloader/detail/LexyFwdDeclaration.hpp>
 
 #include <dryad/_detail/assert.hpp>
@@ -184,17 +183,4 @@ namespace ovdl::v2script::ast {
 	private:
 		Node* _last_node;
 	};
-
-	using File = ovdl::BasicFile<lexy::default_encoding, Node>;
-	struct AbstractSyntaxTree : ovdl::BasicAbstractSyntaxTree<File, FileTree> {
-		using BasicAbstractSyntaxTree::BasicAbstractSyntaxTree;
-
-		std::string make_list_visualizer() const;
-		std::string make_native_visualizer() const;
-	};
-	using ParseState = ovdl::ParseState<AbstractSyntaxTree>;
-
-	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");
 }
\ No newline at end of file
diff --git a/include/openvic-dataloader/v2script/Parser.hpp b/include/openvic-dataloader/v2script/Parser.hpp
index ea42aa2..f9f0ce8 100644
--- a/include/openvic-dataloader/v2script/Parser.hpp
+++ b/include/openvic-dataloader/v2script/Parser.hpp
@@ -11,6 +11,7 @@
 #include <openvic-dataloader/NodeLocation.hpp>
 #include <openvic-dataloader/Parser.hpp>
 #include <openvic-dataloader/detail/utility/Concepts.hpp>
+#include <openvic-dataloader/detail/utility/ErrorRange.hpp>
 #include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp>
 
 #include <dryad/node.hpp>
-- 
cgit v1.2.3-56-ga3b1