Add `deps/dryad` -> https://github.com/Spartan322/dryadadd/dryad

Add `deps/fmt` -> https://github.com/fmtlib/fmt
Add `deps/range-v3` -> https://github.com/ericniebler/range-v3

Improve parser error and warning support
Update .clang-format
Update `deps/SCsub`

1 files changed, 36 insertions, 13 deletions

diff --git a/src/openvic-dataloader/v2script/ModifierGrammar.hpp b/src/openvic-dataloader/v2script/ModifierGrammar.hpp
index 96e928c..5b937d5 100644
--- a/src/openvic-dataloader/v2script/ModifierGrammar.hpp
+++ b/src/openvic-dataloader/v2script/ModifierGrammar.hpp
@@ -2,32 +2,55 @@
 
 #include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp>
 
+#include <lexy/callback/container.hpp>
 #include <lexy/dsl.hpp>
 
+#include <dryad/node.hpp>
+#include <dryad/tree.hpp>
+
+#include "openvic-dataloader/NodeLocation.hpp"
+
 #include "SimpleGrammar.hpp"
 #include "TriggerGrammar.hpp"
+#include "detail/dsl.hpp"
 
 namespace ovdl::v2script::grammar {
 	constexpr auto modifier_keyword = LEXY_KEYWORD("modifier", lexy::dsl::inline_<Identifier<StringEscapeOption>>);
 	constexpr auto factor_keyword = LEXY_KEYWORD("factor", lexy::dsl::inline_<Identifier<StringEscapeOption>>);
 
 	struct FactorStatement {
-		static constexpr auto rule = factor_keyword >> lexy::dsl::equal_sign + lexy::dsl::inline_<Identifier<StringEscapeOption>>;
-		static constexpr auto value = lexy::as_string<std::string> | lexy::new_<ast::FactorNode, ast::NodePtr>;
+		static constexpr auto rule = lexy::dsl::position(factor_keyword) >> (lexy::dsl::equal_sign + lexy::dsl::p<Identifier<StringEscapeOption>>);
+		static constexpr auto value = dsl::callback<ast::AssignStatement*>(
+			[](ast::ParseState& state, NodeLocation loc, ast::IdentifierValue* value) {
+				auto* factor = state.ast().create<ast::IdentifierValue>(loc, state.ast().intern("factor"));
+				return state.ast().create<ast::AssignStatement>(loc, factor, value);
+			});
+	};
+
+	struct ModifierList {
+		struct expected_factor {
+			static constexpr auto name = "expected factor in modifier";
+		};
+
+		static constexpr auto rule = [] {
+			auto factor_flag = lexy::dsl::context_flag<ModifierList>;
+
+			auto element = (lexy::dsl::p<FactorStatement> >> factor_flag.set()) | lexy::dsl::p<TriggerStatement>;
+
+			return dsl::curly_bracketed.list(factor_flag.create() + element) >> lexy::dsl::must(factor_flag.is_reset()).error<expected_factor>;
+		}();
+
+		static constexpr auto value = lexy::as_list<ast::AssignStatementList> >> construct_list<ast::ListValue>;
 	};
 
 	struct ModifierStatement {
 		static constexpr auto rule =
-			modifier_keyword >>
-			lexy::dsl::curly_bracketed.list(
-				lexy::dsl::p<FactorStatement> |
-				lexy::dsl::p<TriggerList>);
-
-		static constexpr auto value =
-			lexy::as_list<std::vector<ast::NodePtr>> >>
-			lexy::callback<ast::NodePtr>(
-				[](auto&& list) {
-					return ast::make_node_ptr<ast::ModifierNode>(LEXY_MOV(list));
-				});
+			lexy::dsl::position(modifier_keyword) >> lexy::dsl::equal_sign >> lexy::dsl::p<ModifierList>;
+
+		static constexpr auto value = dsl::callback<ast::AssignStatement*>(
+			[](ast::ParseState& state, NodeLocation loc, ast::ListValue* list) {
+				auto* factor = state.ast().create<ast::IdentifierValue>(loc, state.ast().intern("modifier"));
+				return state.ast().create<ast::AssignStatement>(loc, factor, list);
+			});
 	};
 }
\ No newline at end of file