From 12bb974324106708a2aea3a14600dd9d7d288cdf Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 23 Dec 2023 13:54:45 +0100 Subject: [PATCH] Make DefinesProxy use ContinueDefine method instead of duplicated code --- .../Parsing/Impl/DefinesStreamProxy.cpp | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp b/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp index e723d869..c24ae47e 100644 --- a/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp +++ b/src/Parser/Parsing/Impl/DefinesStreamProxy.cpp @@ -240,26 +240,11 @@ bool DefinesStreamProxy::MatchDefineDirective(const ParserLine& line, const unsi MatchDefineParameters(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); + m_in_define = true; + m_current_define = Define(name, std::string()); + m_current_define_value.str(std::string()); - Define define(name, value); - define.IdentifyParameters(m_current_define_parameters); - AddDefine(std::move(define)); - } - else - { - m_in_define = true; - m_current_define = Define(name, std::string()); - m_current_define_value.str(std::string()); - - if (currentPos < line.m_line.size() && (currentPos) < static_cast(lineEndEscapePos)) - m_current_define_value << line.m_line.substr(currentPos, static_cast(lineEndEscapePos) - (currentPos)); - } + ContinueDefine(line, currentPos); return true; }