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

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

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

@ -663,22 +663,24 @@ ParserLine DefinesStreamProxy::NextLine()
{ {
auto line = m_stream->NextLine(); auto line = m_stream->NextLine();
while (true)
{
if (m_in_define) if (m_in_define)
{ {
ContinueDefine(line); ContinueDefine(line);
line.m_line.clear(); line = m_stream->NextLine();
} }
else if (MatchDirectives(line) || !m_modes.empty() && m_modes.top() != BlockMode::IN_BLOCK) else if (MatchDirectives(line) || !m_modes.empty() && m_modes.top() != BlockMode::IN_BLOCK)
{ {
line.m_line.clear(); line = m_stream->NextLine();
} }
else else
{ {
ExpandDefines(line); ExpandDefines(line);
}
return line; return line;
} }
}
}
bool DefinesStreamProxy::IncludeFile(const std::string& filename) bool DefinesStreamProxy::IncludeFile(const std::string& filename)
{ {