zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-07-26 18:00:38 +00:00
Code Activity

fix(menu): allow numeric dvar values (#927)

Browse Source 
* fix(menu): allow numeric dvar values

* chore: use std format instead of stringstream

---------

Co-authored-by: Jan Laupetin <[email protected]>
This commit is contained in:
mo
2026-07-23 20:06:08 +02:00
committed by GitHub
co-authored by Jan Laupetin
parent b154ee95a4
commit 4421b94831
4 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.cpp
+17
View File
@@ -2,6 +2,7 @@
#include "MenuExpressionMatchers.h"
#include <format>
#include <sstream>
using namespace menu;
@@ -42,6 +43,22 @@ MatcherFactoryWrapper<SimpleParserValue> MenuMatcherFactory::Text() const
}));
}
MatcherFactoryWrapper<SimpleParserValue> MenuMatcherFactory::TextOrNumeric() const
{
return Or({
Text(),
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::TextNoChain() const
{
return MatcherFactoryWrapper(Or({
src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherFactory.h
+1
View File
@@ -25,6 +25,7 @@ namespace menu
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> StringChain() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> Text() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextOrNumeric() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> TextNoChain() const;
[[nodiscard]] MatcherFactoryWrapper<SimpleParserValue> Numeric() const;
src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp
+2 -2
View File
@@ -308,10 +308,10 @@ namespace menu::item_scope_sequences
create.KeywordIgnoreCase(std::move(keyName)).Capture(CAPTURE_FIRST_TOKEN),
create.Char('{'),
create.Optional(create.And({
create.Text().Capture(CAPTURE_VALUE),
create.TextOrNumeric().Capture(CAPTURE_VALUE),
create.OptionalLoop(create.And({
create.Char(';'),
create.Text().Capture(CAPTURE_VALUE),
create.TextOrNumeric().Capture(CAPTURE_VALUE),
})),
})),
create.Char('}'),