mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmListFileCache: avoid redundant operator<< calls

Browse Source 
Also, remove unneeded `clang-format off` comments.
This commit is contained in:
Alex Turbov
2024-07-22 20:15:17 +04:00
committed by Brad King
parent 459c01d520
commit 1bf4900df7
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmListFileCache.cxx
View File

@@ -217,12 +217,8 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
token->type == cmListFileLexer_Token_Space) {
}
if (!token) {
std::ostringstream error;
/* clang-format off */
error << "Unexpected end of file.\n"
<< "Parse error. Function missing opening \"(\".";
/* clang-format on */
this->IssueError(error.str());
this->IssueError("Unexpected end of file.\n"
"Parse error. Function missing opening \"(\".");
return false;
}
if (token->type != cmListFileLexer_Token_ParenLeft) {
@@ -282,7 +278,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
// Error.
std::ostringstream error;
error << "Parse error. Function missing ending \")\". "
<< "Instead found "
"Instead found "
<< cmListFileLexer_GetTypeAsString(this->Lexer, token->type)
<< " with text \"" << token->text << "\".";
this->IssueError(error.str());
@@ -290,15 +286,16 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
}
}
std::ostringstream error;
cmListFileContext lfc;
lfc.FilePath = this->FileName;
lfc.Line = line;
cmListFileBacktrace lfbt = this->Backtrace;
lfbt = lfbt.Push(lfc);
error << "Parse error. Function missing ending \")\". "
<< "End of file reached.";
this->Messenger->IssueMessage(MessageType::FATAL_ERROR, error.str(), lfbt);
this->Messenger->IssueMessage(
MessageType::FATAL_ERROR,
"Parse error. Function missing ending \")\". "
"End of file reached.",
lfbt);
return false;
}
@@ -317,11 +314,10 @@ bool cmListFileParser::AddArgument(cmListFileLexer_Token* token,
lfc.Line = token->line;
cmListFileBacktrace lfbt = this->Backtrace;
lfbt = lfbt.Push(lfc);
m << "Syntax " << (isError ? "Error" : "Warning") << " in cmake code at "
<< "column " << token->column << "\n"
<< "Argument not separated from preceding token by whitespace.";
/* clang-format on */
m << "Syntax " << (isError ? "Error" : "Warning")
<< " in cmake code at column " << token->column
<< "\n"
"Argument not separated from preceding token by whitespace.";
if (isError) {
this->Messenger->IssueMessage(MessageType::FATAL_ERROR, m.str(), lfbt);
return false;
@@ -464,9 +460,9 @@ std::ostream& operator<<(std::ostream& os, cmListFileContext const& lfc)
{
os << lfc.FilePath;
if (lfc.Line > 0) {
os << ":" << lfc.Line;
os << ':' << lfc.Line;
if (!lfc.Name.empty()) {
os << " (" << lfc.Name << ")";
os << " (" << lfc.Name << ')';
}
} else if (lfc.Line == cmListFileContext::DeferPlaceholderLine) {
os << ":DEFERRED";