1 files changed, 45 insertions, 13 deletions

diff --git a/include/openvic-dataloader/v2script/Parser.hpp b/include/openvic-dataloader/v2script/Parser.hpp
index 53aab90..1c524b2 100644
--- a/include/openvic-dataloader/v2script/Parser.hpp
+++ b/include/openvic-dataloader/v2script/Parser.hpp
@@ -1,27 +1,59 @@
 #pragma once
 
 #include <cstddef>
-#include <cstdio>
+#include <filesystem>
+#include <functional>
+#include <memory>
+#include <optional>
 #include <ostream>
+#include <string_view>
+#include <vector>
+
+#include <openvic-dataloader/ParseError.hpp>
+#include <openvic-dataloader/ParseWarning.hpp>
+#include <openvic-dataloader/detail/BasicParser.hpp>
+#include <openvic-dataloader/detail/Concepts.hpp>
+#include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp>
 
 namespace ovdl::v2script {
-	class Parser {
+
+	using FileNode = ast::FileNode;
+
+	class Parser final : public detail::BasicParser {
 	public:
-		static Parser from_buffer(char8_t* data, std::size_t size);
-		static Parser from_buffer(char8_t* start, char8_t* end);
-		static Parser from_file(const char8_t* path);
+		Parser();
+
+		static Parser from_buffer(const char* data, std::size_t size);
+		static Parser from_buffer(const char* start, const char* end);
+		static Parser from_string(const std::string_view string);
+		static Parser from_file(const char* path);
+		static Parser from_file(const std::filesystem::path& path);
 
-		void set_error_log_to_stderr();
-		void set_error_log_path(const char8_t* path);
-		void set_error_log_to(std::basic_ostream<char8_t> stream);
-		void set_error_log_to(std::FILE* file);
+		constexpr Parser& load_from_buffer(const char* data, std::size_t size);
+		constexpr Parser& load_from_buffer(const char* start, const char* end);
+		constexpr Parser& load_from_string(const std::string_view string);
+		constexpr Parser& load_from_file(const char* path);
+		Parser& load_from_file(const std::filesystem::path& path);
 
-		bool parse();
+		constexpr Parser& load_from_file(const detail::Has_c_str auto& path);
 
-		bool has_error();
-		bool has_warning();
+		bool simple_parse();
+		bool event_parse();
+		bool decision_parse();
+
+		const FileNode* get_file_node() const;
+
+		Parser(Parser&&);
+		Parser& operator=(Parser&&);
+
+		~Parser();
 
 	private:
-		Parser();
+		class BufferHandler;
+		std::unique_ptr<BufferHandler> _buffer_handler;
+		std::unique_ptr<FileNode> _file_node;
+
+		template<typename... Args>
+		constexpr void _run_load_func(detail::LoadCallback<BufferHandler, Args...> auto func, Args... args);
 	};
 }
\ No newline at end of file