From a6d8b022c32c6cfa8e73fa07bba018d1dcb93cef Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Tue, 26 Sep 2023 17:26:12 -0400 Subject: Update lexy to main branch Cleanup and simplify SimpleGrammar data_specifier Add compile_commands.json to gitignore --- src/openvic-dataloader/v2script/SimpleGrammar.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/openvic-dataloader') diff --git a/src/openvic-dataloader/v2script/SimpleGrammar.hpp b/src/openvic-dataloader/v2script/SimpleGrammar.hpp index 160ab92..a065c7f 100644 --- a/src/openvic-dataloader/v2script/SimpleGrammar.hpp +++ b/src/openvic-dataloader/v2script/SimpleGrammar.hpp @@ -45,14 +45,13 @@ namespace ovdl::v2script::grammar { * DAT-635 */ static constexpr auto data_specifier = - lexy::dsl::ascii::alpha_digit_underscore / - LEXY_ASCII_ONE_OF("%&'") / lexy::dsl::lit_c<0x2B> / LEXY_ASCII_ONE_OF("-.") / - lexy::dsl::ascii::digit / lexy::dsl::lit_c<0x3A> / - lexy::dsl::lit_c<0x40> / lexy::dsl::ascii::upper / lexy::dsl::lit_c<0x5F> / - lexy::dsl::ascii::lower / lexy::dsl::lit_b<0x8A> / lexy::dsl::lit_b<0x8C> / lexy::dsl::lit_b<0x8E> / - lexy::dsl::lit_b<0x92> / lexy::dsl::lit_b<0x97> / lexy::dsl::lit_b<0x9A> / lexy::dsl::lit_b<0x9C> / lexy::dsl::lit_b<0x9E> / lexy::dsl::lit_b<0x9F> / - lexy::dsl::lit_b<0xC0> / - ovdl::detail::lexydsl::make_range<0xC0, 0xD6>() / ovdl::detail::lexydsl::make_range<0xD8, 0xF6>() / ovdl::detail::lexydsl::make_range<0xF8, 0xFF>(); + lexy::dsl::ascii::alpha_digit_underscore / LEXY_ASCII_ONE_OF("+:@%&'-.") / + lexy::dsl::lit_b<0x8A> / lexy::dsl::lit_b<0x8C> / lexy::dsl::lit_b<0x8E> / + lexy::dsl::lit_b<0x92> / lexy::dsl::lit_b<0x97> / lexy::dsl::lit_b<0x9A> / lexy::dsl::lit_b<0x9C> / + detail::lexydsl::make_range<0x9E, 0x9F>() / + detail::lexydsl::make_range<0xC0, 0xD6>() / + detail::lexydsl::make_range<0xD8, 0xF6>() / + detail::lexydsl::make_range<0xF8, 0xFF>(); static constexpr auto data_char_class = LEXY_CHAR_CLASS("DataSpecifier", data_specifier); -- cgit v1.2.3-56-ga3b1