nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-30 22:20:59 +01:00
Code Activity

Connect AbstractPos with Pos

Browse source
This commit is contained in:
Eelco Dolstra 2022-07-05 20:43:20 +02:00
parent 9e9170a92e
commit 72dffd6c6c
13 changed files with 95 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libutil/error.cc
View file

@ -35,13 +35,13 @@ std::ostream & operator<<(std::ostream & os, const hintformat & hf)
return os << hf.str();
}
std::string AbstractPos::showErrPos() const
std::ostream & operator << (std::ostream & str, const AbstractPos & pos)
{
if (column > 0) {
return fmt("%d:%d", line, column);
} else {
return fmt("%d", line);
}
pos.print(str);
str << ":" << pos.line;
if (pos.column > 0)
str << ":" << pos.column;
return str;
}
std::optional<LinesOfCode> AbstractPos::getCodeLines() const
@ -202,8 +202,7 @@ std::ostream & showErrorInfo(std::ostream & out, const ErrorInfo & einfo, bool s
auto noSource = ANSI_ITALIC " (source not available)" ANSI_NORMAL "\n";
if (einfo.errPos) {
oss << "\n";
einfo.errPos->print(oss);
oss << "\n" << ANSI_BLUE << "at " ANSI_WARNING << *einfo.errPos << ANSI_NORMAL << ":";
if (auto loc = einfo.errPos->getCodeLines()) {
oss << "\n";
@ -226,8 +225,7 @@ std::ostream & showErrorInfo(std::ostream & out, const ErrorInfo & einfo, bool s
oss << "\n" << "… " << iter->hint.str() << "\n";
if (iter->pos) {
oss << "\n";
iter->pos->print(oss);
oss << "\n" << ANSI_BLUE << "at " ANSI_WARNING << *iter->pos << ANSI_NORMAL << ":";
if (auto loc = iter->pos->getCodeLines()) {
oss << "\n";

4
src/libutil/error.hh
View file

@ -73,11 +73,11 @@ struct AbstractPos
virtual void print(std::ostream & out) const = 0;
std::string showErrPos() const;
std::optional<LinesOfCode> getCodeLines() const;
};
std::ostream & operator << (std::ostream & str, const AbstractPos & pos);
void printCodeLines(std::ostream & out,
const std::string & prefix,
const AbstractPos & errPos,