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(parser): parse spaced and negated defined checks (#926)

Browse Source
This commit is contained in:
mo
2026-07-23 19:27:52 +02:00
committed by GitHub
parent 52f557a9bb
commit b154ee95a4
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Parser/Parsing/Impl/DefinesStreamProxy.cpp
+4 -1
View File
@@ -561,6 +561,9 @@ bool DefinesStreamProxy::MatchDefinedExpression(const ParserLine& line, size_t&
if (!MatchNextCharacter(line, currentPos, '('))
return false;
if (!SkipWhitespace(line, currentPos))
return false;
const auto nameStartPos = currentPos;
if (!ExtractIdentifier(line, currentPos))
return false;
@@ -586,7 +589,7 @@ void DefinesStreamProxy::ExpandDefinedExpressions(ParserLine& line) const
currentPos = definedPos;
if (definedPos > 0 && !isspace(line.m_line[definedPos - 1]))
if (definedPos > 0 && (isalnum(line.m_line[definedPos - 1]) || line.m_line[definedPos - 1] == '_'))
{
currentPos += std::char_traits<char>::length(DEFINED_KEYWORD);
continue;
test/ParserTests/Parsing/Impl/DefinesStreamProxyTests.cpp
+22
View File
@@ -589,6 +589,28 @@ namespace test::parsing::impl::defines_stream_proxy
REQUIRE(proxy.Eof());
}
TEST_CASE("DefinesStreamProxy: Can negate spaced defined operator", "[parsing][parsingstream]")
{
const std::vector<std::string> lines{
"#if defined( CONSOLE ) && !defined( SPLITSCREEN )",
"Console",
"#else",
"PC",
"#endif",
};
MockParserLineStream mockStream(lines);
DefinesStreamProxy proxy(&mockStream);
ExpectLine(&proxy, 1, "");
ExpectLine(&proxy, 2, "");
ExpectLine(&proxy, 3, "");
ExpectLine(&proxy, 4, "PC");
ExpectLine(&proxy, 5, "");
REQUIRE(proxy.Eof());
}
TEST_CASE("DefinesStreamProxy: Ensure can use elif", "[parsing][parsingstream]")
{
const std::vector<std::string> lines{