zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support comma in brackets and braces in preprocessor args

Browse Source
This commit is contained in:
Jan 2023-12-24 01:01:17 +01:00
parent 067f1a854e
commit 4ba33f03a0
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
2 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Parser/Parsing/Impl/DefinesStreamProxy.cpp
View File

@ -510,10 +510,10 @@ void DefinesStreamProxy::ContinueMacroParameters(const ParserLine& line, unsigne
m_macro_parameter_state = ParameterState::AFTER_COMMA; m_macro_parameter_state = ParameterState::AFTER_COMMA;
} }
} }
else if (c == '(') else if (c == '(' || c == '[' || c == '{')
{ {
m_macro_parameter_state = ParameterState::AFTER_PARAM; m_macro_parameter_state = ParameterState::AFTER_PARAM;
m_macro_bracket_depth.push('('); m_macro_bracket_depth.push(c);
m_current_macro_parameter << c; m_current_macro_parameter << c;
} }
else if (c == ')') else if (c == ')')
@ -523,8 +523,8 @@ void DefinesStreamProxy::ContinueMacroParameters(const ParserLine& line, unsigne
if (m_macro_bracket_depth.top() != '(') if (m_macro_bracket_depth.top() != '(')
throw ParsingException(CreatePos(line, pos), "Unbalanced brackets in macro parameters"); throw ParsingException(CreatePos(line, pos), "Unbalanced brackets in macro parameters");
m_macro_parameter_state = ParameterState::AFTER_PARAM;
m_macro_bracket_depth.pop(); m_macro_bracket_depth.pop();
m_macro_parameter_state = ParameterState::AFTER_PARAM;
m_current_macro_parameter << c; m_current_macro_parameter << c;
} }
else if (m_macro_parameter_state == ParameterState::AFTER_COMMA) else if (m_macro_parameter_state == ParameterState::AFTER_COMMA)
@ -537,6 +537,19 @@ void DefinesStreamProxy::ContinueMacroParameters(const ParserLine& line, unsigne
m_macro_parameter_state = ParameterState::NOT_IN_PARAMETERS; m_macro_parameter_state = ParameterState::NOT_IN_PARAMETERS;
} }
} }
else if (c == ']' || c == '}')
{
if (!m_macro_bracket_depth.empty())
{
const auto otherBracket = c == ']' ? '[' : '{';
if (m_macro_bracket_depth.top() != otherBracket)
throw ParsingException(CreatePos(line, pos), "Unbalanced brackets in macro parameters");
m_macro_bracket_depth.pop();
}
m_macro_parameter_state = ParameterState::AFTER_PARAM;
m_current_macro_parameter << c;
}
else if (m_macro_parameter_state == ParameterState::AFTER_PARAM || !isspace(c)) else if (m_macro_parameter_state == ParameterState::AFTER_PARAM || !isspace(c))
{ {
m_macro_parameter_state = ParameterState::AFTER_PARAM; m_macro_parameter_state = ParameterState::AFTER_PARAM;

38
test/ParserTests/Parsing/Impl/DefinesStreamProxyTests.cpp
View File

@ -729,6 +729,44 @@ namespace test::parsing::impl::defines_stream_proxy
REQUIRE(proxy.Eof()); REQUIRE(proxy.Eof());
} }
TEST_CASE("DefinesStreamProxy: Ensure throws error on unclosed parenthesis in params", "[parsing][parsingstream]")
{
const std::vector<std::string> lines{
"#define someStuff(param1) Hello param1 World",
"someStuff(A sentence with [brackets and a , character and stuff)",
"someStuff(A sentence with {braces and a , character and stuff)",
};
MockParserLineStream mockStream(lines);
DefinesStreamProxy proxy(&mockStream);
ExpectLine(&proxy, 1, "");
ExpectErrorInLine(&proxy, 2, 64);
ExpectErrorInLine(&proxy, 3, 62);
REQUIRE(proxy.Eof());
}
TEST_CASE("DefinesStreamProxy: Ensure throws error on parenthesis in params closed with wrong equivalent", "[parsing][parsingstream]")
{
const std::vector<std::string> lines{
"#define someStuff(param1) Hello param1 World",
"someStuff(A sentence with (parenthesis and a , character] and stuff)",
"someStuff(A sentence with [brackets and a , character} and stuff)",
"someStuff(A sentence with {braces and a , character) and stuff)",
};
MockParserLineStream mockStream(lines);
DefinesStreamProxy proxy(&mockStream);
ExpectLine(&proxy, 1, "");
ExpectErrorInLine(&proxy, 2, 57);
ExpectErrorInLine(&proxy, 3, 54);
ExpectErrorInLine(&proxy, 4, 52);
REQUIRE(proxy.Eof());
}
TEST_CASE("DefinesStreamProxy: Ensure defines can go over multiple lines", "[parsing][parsingstream]") TEST_CASE("DefinesStreamProxy: Ensure defines can go over multiple lines", "[parsing][parsingstream]")
{ {
const std::vector<std::string> lines{ const std::vector<std::string> lines{