aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author George L. Albany <Megacake1234@gmail.com>2023-09-29 01:02:02 +0200
committer GitHub <noreply@github.com>2023-09-29 01:02:02 +0200
commitc34b78f135f4fa67a10cc41bc11443461e97f92b (patch)
treea2aff564ada82edc3aa1195b36cbe740bb48f2a3
parent92961412af3ae908633b4ef7b8453091448ffd4d (diff)
parenta6d8b022c32c6cfa8e73fa07bba018d1dcb93cef (diff)
Merge pull request #20 from OpenVicProject/update/lexy
-rw-r--r--.gitignore4
m---------deps/lexy0
-rw-r--r--src/openvic-dataloader/v2script/SimpleGrammar.hpp15
3 files changed, 10 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index d8b9d7f..adae621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,4 +73,6 @@ bin/*
.DS_Store
*.translation
-!game/common/map/*.obj \ No newline at end of file
+!game/common/map/*.obj
+
+compile_commands.json \ No newline at end of file
diff --git a/deps/lexy b/deps/lexy
-Subproject d5041ebb894bd2a4c3a8dceeaa7a579781f6b85
+Subproject 721bf9b2a4f3a10cdcb51888eeec873bbc5c7b1
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);