mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-04-20 00:02:55 +00:00
Make DefinesProxy use ContinueDefine method instead of duplicated code
This commit is contained in:
parent
8d0147d6cf
commit
12bb974324
@ -240,26 +240,11 @@ bool DefinesStreamProxy::MatchDefineDirective(const ParserLine& line, const unsi
|
|||||||
MatchDefineParameters(line, currentPos);
|
MatchDefineParameters(line, currentPos);
|
||||||
SkipWhitespace(line, currentPos);
|
SkipWhitespace(line, currentPos);
|
||||||
|
|
||||||
const auto lineEndEscapePos = GetLineEndEscapePos(line);
|
|
||||||
if (lineEndEscapePos < 0)
|
|
||||||
{
|
|
||||||
std::string value;
|
|
||||||
if (currentPos < line.m_line.size())
|
|
||||||
value = line.m_line.substr(currentPos);
|
|
||||||
|
|
||||||
Define define(name, value);
|
|
||||||
define.IdentifyParameters(m_current_define_parameters);
|
|
||||||
AddDefine(std::move(define));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_in_define = true;
|
m_in_define = true;
|
||||||
m_current_define = Define(name, std::string());
|
m_current_define = Define(name, std::string());
|
||||||
m_current_define_value.str(std::string());
|
m_current_define_value.str(std::string());
|
||||||
|
|
||||||
if (currentPos < line.m_line.size() && (currentPos) < static_cast<unsigned>(lineEndEscapePos))
|
ContinueDefine(line, currentPos);
|
||||||
m_current_define_value << line.m_line.substr(currentPos, static_cast<unsigned>(lineEndEscapePos) - (currentPos));
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user