From 05de9cab29d97d856792ac086604fee347e6a47f Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 4 Dec 2021 13:38:51 +0100 Subject: [PATCH] Use StringChain in menu parsing whenever applicable --- src/ObjLoading/Parsing/Menu/Sequence/GlobalScopeSequences.cpp | 2 +- src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp | 2 +- src/ObjLoading/Parsing/Menu/Sequence/MenuScopeSequences.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ObjLoading/Parsing/Menu/Sequence/GlobalScopeSequences.cpp b/src/ObjLoading/Parsing/Menu/Sequence/GlobalScopeSequences.cpp index fa230397..7e3ae9da 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/GlobalScopeSequences.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/GlobalScopeSequences.cpp @@ -82,7 +82,7 @@ namespace menu::global_scope_sequences AddMatchers({ create.Keyword("loadMenu"), create.Char('{'), - create.String().Capture(CAPTURE_MENU_NAME), + create.StringChain().Capture(CAPTURE_MENU_NAME), create.Char('}'), }); } diff --git a/src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp b/src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp index 3f9fa6d8..12666917 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp @@ -488,7 +488,7 @@ namespace menu::item_scope_sequences AddMatchers({ create.KeywordIgnoreCase("execKey"), - create.String().Capture(CAPTURE_KEY), + create.StringChain().Capture(CAPTURE_KEY), create.Char('{') }); } diff --git a/src/ObjLoading/Parsing/Menu/Sequence/MenuScopeSequences.cpp b/src/ObjLoading/Parsing/Menu/Sequence/MenuScopeSequences.cpp index e3059f42..93ad2388 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/MenuScopeSequences.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/MenuScopeSequences.cpp @@ -158,7 +158,7 @@ namespace menu::menu_scope_sequences AddMatchers({ create.KeywordIgnoreCase("execKey"), - create.String().Capture(CAPTURE_KEY), + create.StringChain().Capture(CAPTURE_KEY), create.Char('{') }); }