From a8126e2db3516799e5e9ca1404594a6a7940bf2c Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 1 Dec 2021 18:16:58 +0100 Subject: [PATCH] Make parenthesis when using menu boolean expression optional --- .../Generic/GenericExpressionPropertySequence.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/ObjLoading/Parsing/Menu/Sequence/Generic/GenericExpressionPropertySequence.cpp b/src/ObjLoading/Parsing/Menu/Sequence/Generic/GenericExpressionPropertySequence.cpp index e10049f0..f9f70059 100644 --- a/src/ObjLoading/Parsing/Menu/Sequence/Generic/GenericExpressionPropertySequence.cpp +++ b/src/ObjLoading/Parsing/Menu/Sequence/Generic/GenericExpressionPropertySequence.cpp @@ -53,15 +53,8 @@ std::unique_ptr GenericExpressionPropertySequ const MenuMatcherFactory create(result.get()); result->AddMatchers({ create.KeywordIgnoreCase(std::move(keyword)).Capture(CAPTURE_FIRST_TOKEN), - create.Or({ - create.And({ - create.KeywordIgnoreCase("when"), - create.Char('('), - create.Label(MenuExpressionMatchers::LABEL_EXPRESSION), - create.Char(')') - }), - create.Label(MenuExpressionMatchers::LABEL_EXPRESSION) - }), + create.Optional(create.KeywordIgnoreCase("when")), + create.Label(MenuExpressionMatchers::LABEL_EXPRESSION), create.Optional(create.Char(';')) });