From b0c3ba3f91926b0c95625bdbf4aab69269130b13 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Thu, 9 May 2024 10:06:02 -0400 Subject: Add runtime encoding detection and conversion 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 --- src/openvic-dataloader/v2script/ModifierGrammar.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/openvic-dataloader/v2script/ModifierGrammar.hpp') diff --git a/src/openvic-dataloader/v2script/ModifierGrammar.hpp b/src/openvic-dataloader/v2script/ModifierGrammar.hpp index 22592d4..122a8c7 100644 --- a/src/openvic-dataloader/v2script/ModifierGrammar.hpp +++ b/src/openvic-dataloader/v2script/ModifierGrammar.hpp @@ -10,9 +10,9 @@ #include "openvic-dataloader/NodeLocation.hpp" -#include "ParseState.hpp" #include "SimpleGrammar.hpp" #include "TriggerGrammar.hpp" +#include "detail/InternalConcepts.hpp" #include "detail/dsl.hpp" namespace ovdl::v2script::grammar { @@ -22,9 +22,9 @@ namespace ovdl::v2script::grammar { struct FactorStatement { static constexpr auto rule = lexy::dsl::position(factor_keyword) >> (lexy::dsl::equal_sign + lexy::dsl::p>); static constexpr auto value = dsl::callback( - [](ast::ParseState& state, NodeLocation loc, ast::IdentifierValue* value) { - auto* factor = state.ast().create(loc, state.ast().intern("factor")); - return state.ast().create(loc, factor, value); + [](detail::IsParseState auto& state, NodeLocation loc, ast::IdentifierValue* value) { + auto* factor = state.ast().template create(loc, state.ast().intern("factor")); + return state.ast().template create(loc, factor, value); }); }; @@ -49,9 +49,9 @@ namespace ovdl::v2script::grammar { lexy::dsl::position(modifier_keyword) >> lexy::dsl::equal_sign >> lexy::dsl::p; static constexpr auto value = dsl::callback( - [](ast::ParseState& state, NodeLocation loc, ast::ListValue* list) { - auto* factor = state.ast().create(loc, state.ast().intern("modifier")); - return state.ast().create(loc, factor, list); + [](detail::IsParseState auto& state, NodeLocation loc, ast::ListValue* list) { + auto* factor = state.ast().template create(loc, state.ast().intern("modifier")); + return state.ast().template create(loc, factor, list); }); }; } \ No newline at end of file -- cgit v1.2.3-56-ga3b1