zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-08-19 21:44:26 +00:00
Code Activity

fix(menu): accept numeric dvarStrList values (#947)

Browse Source 
* fix(menu): accept numeric `dvarStrList` values

Convert numeric tokens to strings to match the game menu parser behaviour.

https://github.com/Laupetin/OpenAssetTools/issues/160

* chore: rename TextOrNumericNoChain to TextNoChainOrNumeric

---------

Co-authored-by: Jan Laupetin <[email protected]>
This commit is contained in:
mo
2026-08-05 19:08:02 +02:00
committed by GitHub
co-authored by Jan Laupetin
parent f82f191e6c
commit ae4f63eb2b
4 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.cpp
+16
View File
@@ -67,6 +67,22 @@ MatcherFactoryWrapper<SimpleParserValue> MenuMatcherFactory::TextNoChain() const
}));
}
MatcherFactoryWrapper<SimpleParserValue> MenuMatcherFactory::TextNoChainOrNumeric() const
{
return Or({
TextNoChain(),
Numeric().Transform(
[](const token_list_t& tokens) -> SimpleParserValue
{
const auto& token = tokens[0].get();
if (token.m_type == SimpleParserValueType::INTEGER)
return SimpleParserValue::String(token.GetPos(), new std::string(std::to_string(token.IntegerValue())));
return SimpleParserValue::String(token.GetPos(), new std::string(std::format("{:g}", token.FloatingPointValue())));
}),
});
}
MatcherFactoryWrapper<SimpleParserValue> MenuMatcherFactory::Numeric() const
{
return MatcherFactoryWrapper(Or({
src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h
+1
View File
@@ -27,6 +27,7 @@ namespace menu
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> Text() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextOrNumeric() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextNoChain() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextNoChainOrNumeric() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> Numeric() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextExpression() const;
src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp
+1 -1
View File
@@ -385,7 +385,7 @@ namespace
create.OptionalLoop(create.And({
create.TextNoChain().Capture(CAPTURE_STEP_NAME),
create.Optional(create.Char(';')),
create.TextNoChain().Capture(CAPTURE_STEP_VALUE),
create.TextNoChainOrNumeric().Capture(CAPTURE_STEP_VALUE),
create.Optional(create.Char(';')),
})),
create.Char('}'),
test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp
+32
View File
@@ -402,4 +402,36 @@ namespace test::parsing::menu::sequence::item
REQUIRE(multiValueFeatures->m_string_values[2] == "wide 16:10");
REQUIRE(multiValueFeatures->m_string_values[3] == "wide 16:9");
}
TEST_CASE("ItemScopeSequences: dvarStrList accepts numeric values", "[parsing][sequence][menu]")
{
ItemSequenceTestsHelper helper(FeatureLevel::IW4, false);
const TokenPos pos;
helper.Tokens({
SimpleParserValue::Identifier(pos, new std::string("dvarStrList")),
SimpleParserValue::Character(pos, '{'),
SimpleParserValue::String(pos, new std::string("@MPUI_RULES_5MINUTES")),
SimpleParserValue::Integer(pos, 5),
SimpleParserValue::String(pos, new std::string()),
SimpleParserValue::Integer(pos, 0),
SimpleParserValue::Character(pos, '}'),
SimpleParserValue::EndOfFile(pos),
});
helper.m_item->m_feature_type = CommonItemFeatureType::MULTI_VALUE;
helper.m_item->m_multi_value_features = std::make_unique<CommonItemFeaturesMultiValue>();
const auto result = helper.PerformTest();
REQUIRE(result);
REQUIRE(helper.m_consumed_token_count == 7);
const auto* item = helper.m_state->m_current_item;
REQUIRE(item);
const auto* multiValueFeatures = item->m_multi_value_features.get();
REQUIRE(multiValueFeatures);
REQUIRE(multiValueFeatures->m_step_names == std::vector<std::string>{"@MPUI_RULES_5MINUTES", ""});
REQUIRE(multiValueFeatures->m_string_values == std::vector<std::string>{"5", "0"});
}
} // namespace test::parsing::menu::sequence::item