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

Skip defines stream proxy empty lines

Browse Source
This commit is contained in:
Jan 2022-09-05 23:30:06 +02:00
parent 1464329245
commit d0155d426a
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
raw/iw4/techniques/technique_test.technique.template
View File

@ -1,12 +1,10 @@
#pragma options TEST(asdf, bla) #pragma options TEST(asdf, bla)
#pragma switch TEST_SWITCH #pragma switch TEST_SWITCH
#ifdef TEST_SWITCH #ifdef TEST_SWITCH
#define SVAL "1" #define SVAL "1"
#else #else
#define SVAL "0" #define SVAL "0"
#endif #endif
#pragma filename "lemao_" + TEST + SVAL + ".txt" #pragma filename "lemao_" + TEST + SVAL + ".txt"
HAHA TEST HAHA TEST
#ifdef TEST_SWITCH #ifdef TEST_SWITCH

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

@ -351,7 +351,7 @@ bool DefinesStreamProxy::MatchElIfDirective(const ParserLine& line, const unsign
if (m_modes.top() == BlockMode::BLOCK_BLOCKED) if (m_modes.top() == BlockMode::BLOCK_BLOCKED)
return true; return true;
if(m_modes.top() == BlockMode::IN_BLOCK) if (m_modes.top() == BlockMode::IN_BLOCK)
{ {
m_modes.top() = BlockMode::BLOCK_BLOCKED; m_modes.top() = BlockMode::BLOCK_BLOCKED;
return true; return true;
@ -528,7 +528,7 @@ void DefinesStreamProxy::ExtractParametersFromDefineUsage(const ParserLine& line
valueHasStarted = false; valueHasStarted = false;
} }
} }
else if(c == '(') else if (c == '(')
{ {
valueHasStarted = true; valueHasStarted = true;
parenthesisDepth++; parenthesisDepth++;
@ -536,7 +536,7 @@ void DefinesStreamProxy::ExtractParametersFromDefineUsage(const ParserLine& line
} }
else if (c == ')') else if (c == ')')
{ {
if(parenthesisDepth > 0) if (parenthesisDepth > 0)
{ {
valueHasStarted = true; valueHasStarted = true;
parenthesisDepth--; parenthesisDepth--;
@ -663,21 +663,23 @@ ParserLine DefinesStreamProxy::NextLine()
{ {
auto line = m_stream->NextLine(); auto line = m_stream->NextLine();
if (m_in_define) while (true)
{ {
ContinueDefine(line); if (m_in_define)
line.m_line.clear(); {
ContinueDefine(line);
line = m_stream->NextLine();
}
else if (MatchDirectives(line) || !m_modes.empty() && m_modes.top() != BlockMode::IN_BLOCK)
{
line = m_stream->NextLine();
}
else
{
ExpandDefines(line);
return line;
}
} }
else if (MatchDirectives(line) || !m_modes.empty() && m_modes.top() != BlockMode::IN_BLOCK)
{
line.m_line.clear();
}
else
{
ExpandDefines(line);
}
return line;
} }
bool DefinesStreamProxy::IncludeFile(const std::string& filename) bool DefinesStreamProxy::IncludeFile(const std::string& filename)