ruiu created this revision.
ruiu added reviewers: MaskRay, grimar.
Herald added subscribers: cfe-commits, thopre, gbedwell, aheejin, hiraditya,
arichardson, sbc100, emaste.
Herald added a reviewer: espindola.
Herald added a reviewer: andreadb.
Herald added projects: clang, LLVM.
1. raw_ostream supports ANSI colors so that you can write messages
to the termina with colors. Previously, in order to change and reset
color, you had to call `changeColor` and `resetColor` functions,
respectively.
So, if you print out "error: " in red, for example, you had to do
something like this:
OS.changeColor(raw_ostream::RED);
OS << "error: ";
OS.resetColor();
With this patch, you can write the same code as follows:
OS << raw_ostream::RED << "error: " << raw_ostream::RESET;
2. Add a boolean flag to raw_ostream so that you can disable colored
output. If you disable colors, changeColor, operator<<(Color), resetColor
and other color-related functions have no effect.
Most LLVM tools automatically prints out messages using colors, and
you can disable it by passing a flag such as `--disable-colors`.
This new flag makes it easy to write code that works that way.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D65564
Files:
clang/include/clang/AST/ASTDumperUtils.h
clang/lib/Analysis/CFG.cpp
clang/lib/Frontend/TextDiagnostic.cpp
clang/tools/diagtool/TreeView.cpp
lld/COFF/Driver.cpp
lld/COFF/DriverUtils.cpp
lld/Common/ErrorHandler.cpp
lld/ELF/Driver.cpp
lld/ELF/DriverUtils.cpp
lld/include/lld/Common/ErrorHandler.h
lld/lib/Driver/DarwinLdDriver.cpp
lld/test/COFF/color-diagnostics.test
lld/test/ELF/color-diagnostics.test
lld/wasm/Driver.cpp
llvm/include/llvm/Support/FormattedStream.h
llvm/include/llvm/Support/WithColor.h
llvm/include/llvm/Support/raw_ostream.h
llvm/lib/Support/WithColor.cpp
llvm/lib/Support/raw_ostream.cpp
llvm/tools/llvm-cov/CoverageReport.cpp
llvm/tools/llvm-cov/CoverageViewOptions.h
llvm/tools/llvm-cov/RenderingSupport.h
llvm/tools/llvm-cov/SourceCoverageViewText.cpp
llvm/tools/llvm-cov/llvm-cov.cpp
llvm/tools/llvm-mca/Views/TimelineView.cpp
llvm/utils/FileCheck/FileCheck.cpp
Index: llvm/utils/FileCheck/FileCheck.cpp
===================================================================
--- llvm/utils/FileCheck/FileCheck.cpp
+++ llvm/utils/FileCheck/FileCheck.cpp
@@ -138,12 +138,11 @@
/// The starting char (before tildes) for marking the line.
char Lead;
/// What color to use for this annotation.
- raw_ostream::Colors Color;
+ raw_ostream::Color Color;
/// A note to follow the marker, or empty string if none.
std::string Note;
MarkerStyle() {}
- MarkerStyle(char Lead, raw_ostream::Colors Color,
- const std::string &Note = "")
+ MarkerStyle(char Lead, raw_ostream::Color Color, const std::string &Note = "")
: Lead(Lead), Color(Color), Note(Note) {}
};
Index: llvm/tools/llvm-mca/Views/TimelineView.cpp
===================================================================
--- llvm/tools/llvm-mca/Views/TimelineView.cpp
+++ llvm/tools/llvm-mca/Views/TimelineView.cpp
@@ -103,8 +103,8 @@
LastCycle = std::max(LastCycle, CurrentCycle);
}
-static raw_ostream::Colors chooseColor(unsigned CumulativeCycles,
- unsigned Executions, int BufferSize) {
+static raw_ostream::Color chooseColor(unsigned CumulativeCycles,
+ unsigned Executions, int BufferSize) {
if (CumulativeCycles && BufferSize < 0)
return raw_ostream::MAGENTA;
unsigned Size = static_cast<unsigned>(BufferSize);
@@ -120,7 +120,7 @@
if (!OS.has_colors())
return;
- raw_ostream::Colors Color = chooseColor(Cycles, Executions, BufferSize);
+ raw_ostream::Color Color = chooseColor(Cycles, Executions, BufferSize);
if (Color == raw_ostream::SAVEDCOLOR) {
OS.resetColor();
return;
Index: llvm/tools/llvm-cov/llvm-cov.cpp
===================================================================
--- llvm/tools/llvm-cov/llvm-cov.cpp
+++ llvm/tools/llvm-cov/llvm-cov.cpp
@@ -83,13 +83,10 @@
}
}
- if (argc > 1) {
- if (sys::Process::StandardErrHasColors())
- errs().changeColor(raw_ostream::RED);
- errs() << "Unrecognized command: " << argv[1] << ".\n\n";
- if (sys::Process::StandardErrHasColors())
- errs().resetColor();
- }
+ if (argc > 1)
+ errs() << raw_ostream::RED << "Unrecognized command: " << argv[1] << ".\n\n"
+ << raw_ostream::RESET;
+
helpMain(argc, argv);
return 1;
}
Index: llvm/tools/llvm-cov/SourceCoverageViewText.cpp
===================================================================
--- llvm/tools/llvm-cov/SourceCoverageViewText.cpp
+++ llvm/tools/llvm-cov/SourceCoverageViewText.cpp
@@ -101,7 +101,7 @@
auto *WrappedSegment = LCS.getWrappedSegment();
CoverageSegmentArray Segments = LCS.getLineSegments();
- Optional<raw_ostream::Colors> Highlight;
+ Optional<raw_ostream::Color> Highlight;
SmallVector<std::pair<unsigned, unsigned>, 2> HighlightedRanges;
// The first segment overlaps from a previous line, so we treat it specially.
Index: llvm/tools/llvm-cov/RenderingSupport.h
===================================================================
--- llvm/tools/llvm-cov/RenderingSupport.h
+++ llvm/tools/llvm-cov/RenderingSupport.h
@@ -47,7 +47,7 @@
/// Change the color of the output stream if the `IsColorUsed` flag
/// is true. Returns an object that resets the color when destroyed.
inline ColoredRawOstream colored_ostream(raw_ostream &OS,
- raw_ostream::Colors Color,
+ raw_ostream::Color Color,
bool IsColorUsed = true,
bool Bold = false, bool BG = false) {
if (IsColorUsed)
Index: llvm/tools/llvm-cov/CoverageViewOptions.h
===================================================================
--- llvm/tools/llvm-cov/CoverageViewOptions.h
+++ llvm/tools/llvm-cov/CoverageViewOptions.h
@@ -46,7 +46,7 @@
/// Change the output's stream color if the colors are enabled.
ColoredRawOstream colored_ostream(raw_ostream &OS,
- raw_ostream::Colors Color) const {
+ raw_ostream::Color Color) const {
return llvm::colored_ostream(OS, Color, Colors);
}
Index: llvm/tools/llvm-cov/CoverageReport.cpp
===================================================================
--- llvm/tools/llvm-cov/CoverageReport.cpp
+++ llvm/tools/llvm-cov/CoverageReport.cpp
@@ -111,7 +111,7 @@
/// Return the color which correponds to the coverage percentage of a
/// certain metric.
template <typename T>
-raw_ostream::Colors determineCoveragePercentageColor(const T &Info) {
+raw_ostream::Color determineCoveragePercentageColor(const T &Info) {
if (Info.isFullyCovered())
return raw_ostream::GREEN;
return Info.getPercentCovered() >= 80.0 ? raw_ostream::YELLOW
Index: llvm/lib/Support/raw_ostream.cpp
===================================================================
--- llvm/lib/Support/raw_ostream.cpp
+++ llvm/lib/Support/raw_ostream.cpp
@@ -65,6 +65,17 @@
using namespace llvm;
+const raw_ostream::Color raw_ostream::BLACK;
+const raw_ostream::Color raw_ostream::RED;
+const raw_ostream::Color raw_ostream::GREEN;
+const raw_ostream::Color raw_ostream::YELLOW;
+const raw_ostream::Color raw_ostream::BLUE;
+const raw_ostream::Color raw_ostream::MAGENTA;
+const raw_ostream::Color raw_ostream::CYAN;
+const raw_ostream::Color raw_ostream::WHITE;
+const raw_ostream::Color raw_ostream::SAVEDCOLOR;
+const raw_ostream::Color raw_ostream::RESET;
+
raw_ostream::~raw_ostream() {
// raw_ostream's subclasses should take care to flush the buffer
// in their destructors.
@@ -133,6 +144,14 @@
return *this;
}
+raw_ostream &raw_ostream::operator<<(Color C) {
+ if (C == Color::RESET)
+ resetColor();
+ else
+ changeColor(C);
+ return *this;
+}
+
raw_ostream &raw_ostream::write_uuid(const uuid_t UUID) {
for (int Idx = 0; Idx < 16; ++Idx) {
*this << format("%02" PRIX32, UUID[Idx]);
@@ -552,8 +571,9 @@
/// FD is the file descriptor that this writes to. If ShouldClose is true, this
/// closes the file when the stream is destroyed.
raw_fd_ostream::raw_fd_ostream(int fd, bool shouldClose, bool unbuffered)
- : raw_pwrite_stream(unbuffered), FD(fd), ShouldClose(shouldClose) {
- if (FD < 0 ) {
+ : raw_pwrite_stream(unbuffered), FD(fd), ShouldClose(shouldClose),
+ ColorEnabled(sys::Process::FileDescriptorHasColors(fd)) {
+ if (FD < 0) {
ShouldClose = false;
return;
}
@@ -782,13 +802,16 @@
#endif
}
-raw_ostream &raw_fd_ostream::changeColor(enum Colors colors, bool bold,
- bool bg) {
+raw_ostream &raw_fd_ostream::changeColor(Color color, bool bold, bool bg) {
+ if (!ColorEnabled)
+ return *this;
+
if (sys::Process::ColorNeedsFlush())
flush();
const char *colorcode =
- (colors == SAVEDCOLOR) ? sys::Process::OutputBold(bg)
- : sys::Process::OutputColor(colors, bold, bg);
+ (color == Color::SAVEDCOLOR)
+ ? sys::Process::OutputBold(bg)
+ : sys::Process::OutputColor(static_cast<char>(color), bold, bg);
if (colorcode) {
size_t len = strlen(colorcode);
write(colorcode, len);
@@ -799,6 +822,9 @@
}
raw_ostream &raw_fd_ostream::resetColor() {
+ if (!ColorEnabled)
+ return *this;
+
if (sys::Process::ColorNeedsFlush())
flush();
const char *colorcode = sys::Process::ResetColor();
@@ -812,6 +838,9 @@
}
raw_ostream &raw_fd_ostream::reverseColor() {
+ if (!ColorEnabled)
+ return *this;
+
if (sys::Process::ColorNeedsFlush())
flush();
const char *colorcode = sys::Process::OutputReverse();
Index: llvm/lib/Support/WithColor.cpp
===================================================================
--- llvm/lib/Support/WithColor.cpp
+++ llvm/lib/Support/WithColor.cpp
@@ -104,10 +104,9 @@
return UseColor == cl::BOU_TRUE;
}
-WithColor &WithColor::changeColor(raw_ostream::Colors Color, bool Bold,
- bool BG) {
+WithColor &WithColor::changeColor(raw_ostream::Color C, bool Bold, bool BG) {
if (colorsEnabled())
- OS.changeColor(Color, Bold, BG);
+ OS.changeColor(C, Bold, BG);
return *this;
}
Index: llvm/include/llvm/Support/raw_ostream.h
===================================================================
--- llvm/include/llvm/Support/raw_ostream.h
+++ llvm/include/llvm/Support/raw_ostream.h
@@ -72,7 +72,7 @@
public:
// color order matches ANSI escape sequence, don't change
- enum Colors {
+ enum class Color {
BLACK = 0,
RED,
GREEN,
@@ -81,9 +81,21 @@
MAGENTA,
CYAN,
WHITE,
- SAVEDCOLOR
+ SAVEDCOLOR,
+ RESET,
};
+ static const Color BLACK = Color::BLACK;
+ static const Color RED = Color::RED;
+ static const Color GREEN = Color::GREEN;
+ static const Color YELLOW = Color::YELLOW;
+ static const Color BLUE = Color::BLUE;
+ static const Color MAGENTA = Color::MAGENTA;
+ static const Color CYAN = Color::CYAN;
+ static const Color WHITE = Color::WHITE;
+ static const Color SAVEDCOLOR = Color::SAVEDCOLOR;
+ static const Color RESET = Color::RESET;
+
explicit raw_ostream(bool unbuffered = false)
: BufferMode(unbuffered ? Unbuffered : InternalBuffer) {
// Start out ready to flush.
@@ -214,6 +226,9 @@
/// Output \p N in hexadecimal, without any prefix or padding.
raw_ostream &write_hex(unsigned long long N);
+ // Change the foreground color of text.
+ raw_ostream &operator<<(Color C);
+
/// Output a formatted UUID with dash separators.
using uuid_t = uint8_t[16];
raw_ostream &write_uuid(const uuid_t UUID);
@@ -248,15 +263,14 @@
/// Changes the foreground color of text that will be output from this point
/// forward.
- /// @param Color ANSI color to use, the special SAVEDCOLOR can be used to
+ /// @param C ANSI color to use, the special SAVEDCOLOR can be used to
/// change only the bold attribute, and keep colors untouched
/// @param Bold bold/brighter text, default false
/// @param BG if true change the background, default: change foreground
/// @returns itself so it can be used within << invocations
- virtual raw_ostream &changeColor(enum Colors Color,
- bool Bold = false,
+ virtual raw_ostream &changeColor(Color C, bool Bold = false,
bool BG = false) {
- (void)Color;
+ (void)C;
(void)Bold;
(void)BG;
return *this;
@@ -277,6 +291,11 @@
/// This function determines if this stream is displayed and supports colors.
virtual bool has_colors() const { return is_displayed(); }
+ // Enable or disable colors. Once disable_colors() is called,
+ // changeColor() has no effect until enable_colors() is called.
+ virtual void enable_colors() {}
+ virtual void disable_colors() {}
+
//===--------------------------------------------------------------------===//
// Subclass Interface
//===--------------------------------------------------------------------===//
@@ -368,6 +387,8 @@
bool SupportsSeeking;
+ bool ColorEnabled;
+
#ifdef _WIN32
/// True if this fd refers to a Windows console device. Mintty and other
/// terminal emulators are TTYs, but they are not consoles.
@@ -432,8 +453,8 @@
/// to the offset specified from the beginning of the file.
uint64_t seek(uint64_t off);
- raw_ostream &changeColor(enum Colors colors, bool bold=false,
- bool bg=false) override;
+ raw_ostream &changeColor(Color C, bool bold = false,
+ bool bg = false) override;
raw_ostream &resetColor() override;
raw_ostream &reverseColor() override;
@@ -442,6 +463,10 @@
bool has_colors() const override;
+ void enable_colors() override { ColorEnabled = true; }
+
+ void disable_colors() override { ColorEnabled = false; }
+
std::error_code error() const { return EC; }
/// Return the value of the flag in this raw_fd_ostream indicating whether an
Index: llvm/include/llvm/Support/WithColor.h
===================================================================
--- llvm/include/llvm/Support/WithColor.h
+++ llvm/include/llvm/Support/WithColor.h
@@ -53,8 +53,7 @@
/// @param BG If true, change the background, default: change foreground
/// @param DisableColors Whether to ignore color changes regardless of -color
/// and support in OS
- WithColor(raw_ostream &OS,
- raw_ostream::Colors Color = raw_ostream::SAVEDCOLOR,
+ WithColor(raw_ostream &OS, raw_ostream::Color Color = raw_ostream::SAVEDCOLOR,
bool Bold = false, bool BG = false, bool DisableColors = false)
: OS(OS), DisableColors(DisableColors) {
changeColor(Color, Bold, BG);
@@ -102,7 +101,7 @@
/// change only the bold attribute, and keep colors untouched
/// @param Bold Bold/brighter text, default false
/// @param BG If true, change the background, default: change foreground
- WithColor &changeColor(raw_ostream::Colors Color, bool Bold = false,
+ WithColor &changeColor(raw_ostream::Color Color, bool Bold = false,
bool BG = false);
/// Reset the colors to terminal defaults. Call this when you are done
Index: llvm/include/llvm/Support/FormattedStream.h
===================================================================
--- llvm/include/llvm/Support/FormattedStream.h
+++ llvm/include/llvm/Support/FormattedStream.h
@@ -121,8 +121,8 @@
return *this;
}
- raw_ostream &changeColor(enum Colors Color, bool Bold, bool BG) override {
- TheStream->changeColor(Color, Bold, BG);
+ raw_ostream &changeColor(Color C, bool Bold, bool BG) override {
+ TheStream->changeColor(C, Bold, BG);
return *this;
}
Index: lld/wasm/Driver.cpp
===================================================================
--- lld/wasm/Driver.cpp
+++ lld/wasm/Driver.cpp
@@ -83,7 +83,6 @@
raw_ostream &error) {
errorHandler().logName = args::getFilenameWithoutExe(args[0]);
errorHandler().errorOS = &error;
- errorHandler().colorDiagnostics = error.has_colors();
errorHandler().errorLimitExceededMsg =
"too many errors emitted, stopping now (use "
"-error-limit=0 to see all errors)";
@@ -133,16 +132,17 @@
OPT_no_color_diagnostics);
if (!arg)
return;
+
if (arg->getOption().getID() == OPT_color_diagnostics) {
- errorHandler().colorDiagnostics = true;
+ errorHandler().errorOS->enable_colors();
} else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
- errorHandler().colorDiagnostics = false;
+ errorHandler().errorOS->disable_colors();
} else {
StringRef s = arg->getValue();
if (s == "always")
- errorHandler().colorDiagnostics = true;
+ errorHandler().errorOS->enable_colors();
else if (s == "never")
- errorHandler().colorDiagnostics = false;
+ errorHandler().errorOS->disable_colors();
else if (s != "auto")
error("unknown option: --color-diagnostics=" + s);
}
Index: lld/test/ELF/color-diagnostics.test
===================================================================
--- lld/test/ELF/color-diagnostics.test
+++ lld/test/ELF/color-diagnostics.test
@@ -6,8 +6,8 @@
# RUN: not ld.lld -xyz -color-diagnostics=always /nosuchfile 2>&1 \
# RUN: | FileCheck -check-prefix=COLOR %s
-# COLOR: {{ld.lld: .\[0;1;31merror: .\[0munknown argument '-xyz'}}
-# COLOR: {{ld.lld: .\[0;1;31merror: .\[0mcannot open /nosuchfile}}
+# COLOR: {{ld.lld: .\[0;31merror: .\[0munknown argument '-xyz'}}
+# COLOR: {{ld.lld: .\[0;31merror: .\[0mcannot open /nosuchfile}}
# RUN: not ld.lld -color-diagnostics=foobar 2>&1 | FileCheck -check-prefix=ERR %s
# ERR: unknown option: --color-diagnostics=foobar
Index: lld/test/COFF/color-diagnostics.test
===================================================================
--- lld/test/COFF/color-diagnostics.test
+++ lld/test/COFF/color-diagnostics.test
@@ -6,8 +6,8 @@
# RUN: not lld-link -xyz --color-diagnostics=always /nosuchfile 2>&1 \
# RUN: | FileCheck -check-prefix=COLOR %s
-# COLOR: {{lld-link: .\[0;1;35mwarning: .\[0mignoring unknown argument '-xyz'}}
-# COLOR: {{lld-link: .\[0;1;31merror: .\[0mcould not open '/nosuchfile'}}
+# COLOR: {{lld-link: .\[0;35mwarning: .\[0mignoring unknown argument '-xyz'}}
+# COLOR: {{lld-link: .\[0;31merror: .\[0mcould not open '/nosuchfile'}}
# RUN: not lld-link /nosuchfile 2>&1 | FileCheck -check-prefix=NOCOLOR %s
# RUN: not lld-link -color-diagnostics=never /nosuchfile 2>&1 \
Index: lld/lib/Driver/DarwinLdDriver.cpp
===================================================================
--- lld/lib/Driver/DarwinLdDriver.cpp
+++ lld/lib/Driver/DarwinLdDriver.cpp
@@ -1151,7 +1151,6 @@
"'-error-limit 0' to see all errors)";
errorHandler().errorOS = &Error;
errorHandler().exitEarly = CanExitEarly;
- errorHandler().colorDiagnostics = Error.has_colors();
MachOLinkingContext ctx;
if (!parse(args, ctx))
Index: lld/include/lld/Common/ErrorHandler.h
===================================================================
--- lld/include/lld/Common/ErrorHandler.h
+++ lld/include/lld/Common/ErrorHandler.h
@@ -87,7 +87,6 @@
StringRef errorLimitExceededMsg = "too many errors emitted, stopping now";
StringRef logName = "lld";
llvm::raw_ostream *errorOS = &llvm::errs();
- bool colorDiagnostics = llvm::errs().has_colors();
bool exitEarly = true;
bool fatalWarnings = false;
bool verbose = false;
@@ -102,7 +101,9 @@
std::unique_ptr<llvm::FileOutputBuffer> outputBuffer;
private:
- void printHeader(StringRef s, raw_ostream::Colors c, const Twine &msg);
+ using Color = raw_ostream::Color;
+
+ std::string getLocation(const Twine &msg);
};
/// Returns the default error handler.
Index: lld/ELF/DriverUtils.cpp
===================================================================
--- lld/ELF/DriverUtils.cpp
+++ lld/ELF/DriverUtils.cpp
@@ -58,16 +58,17 @@
OPT_no_color_diagnostics);
if (!arg)
return;
+
if (arg->getOption().getID() == OPT_color_diagnostics) {
- errorHandler().colorDiagnostics = true;
+ errorHandler().errorOS->enable_colors();
} else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
- errorHandler().colorDiagnostics = false;
+ errorHandler().errorOS->disable_colors();
} else {
StringRef s = arg->getValue();
if (s == "always")
- errorHandler().colorDiagnostics = true;
+ errorHandler().errorOS->enable_colors();
else if (s == "never")
- errorHandler().colorDiagnostics = false;
+ errorHandler().errorOS->disable_colors();
else if (s != "auto")
error("unknown option: --color-diagnostics=" + s);
}
Index: lld/ELF/Driver.cpp
===================================================================
--- lld/ELF/Driver.cpp
+++ lld/ELF/Driver.cpp
@@ -82,7 +82,6 @@
"-error-limit=0 to see all errors)";
errorHandler().errorOS = &error;
errorHandler().exitEarly = canExitEarly;
- errorHandler().colorDiagnostics = error.has_colors();
inputSections.clear();
outputSections.clear();
Index: lld/Common/ErrorHandler.cpp
===================================================================
--- lld/Common/ErrorHandler.cpp
+++ lld/Common/ErrorHandler.cpp
@@ -85,7 +85,10 @@
[&](ErrorInfoBase &eib) { error(eib.message()); });
}
-static std::string getLocation(std::string msg, std::string defaultMsg) {
+std::string ErrorHandler::getLocation(const Twine &msg) {
+ if (!vsDiagnostics)
+ return logName;
+
static std::regex regexes[] = {
std::regex(
R"(^undefined (?:\S+ )?symbol:.*\n>>> referenced by (\S+):(\d+)\n.*)"),
@@ -97,9 +100,11 @@
std::regex(R"((\S+):(\d+): unclosed quote)"),
};
- std::smatch match;
+ std::string str = msg.str();
+
for (std::regex &re : regexes) {
- if (!std::regex_search(msg, match, re))
+ std::smatch match;
+ if (!std::regex_search(str, match, re))
continue;
if (match.size() > 2)
@@ -107,34 +112,14 @@
return match.str(1);
}
- return defaultMsg;
-}
-
-void ErrorHandler::printHeader(StringRef s, raw_ostream::Colors c,
- const Twine &msg) {
-
- if (vsDiagnostics) {
- // A Visual Studio-style error message starts with an error location.
- // If a location cannot be extracted then we default to LogName.
- *errorOS << getLocation(msg.str(), logName) << ": ";
- } else {
- *errorOS << logName << ": ";
- }
-
- if (colorDiagnostics) {
- errorOS->changeColor(c, true);
- *errorOS << s;
- errorOS->resetColor();
- } else {
- *errorOS << s;
- }
+ return logName;
}
void ErrorHandler::log(const Twine &msg) {
- if (verbose) {
- std::lock_guard<std::mutex> lock(mu);
- *errorOS << logName << ": " << msg << "\n";
- }
+ if (!verbose)
+ return;
+ std::lock_guard<std::mutex> lock(mu);
+ *errorOS << logName << ": " << msg << "\n";
}
void ErrorHandler::message(const Twine &msg) {
@@ -151,8 +136,8 @@
std::lock_guard<std::mutex> lock(mu);
newline(errorOS, msg);
- printHeader("warning: ", raw_ostream::MAGENTA, msg);
- *errorOS << msg << "\n";
+ *errorOS << getLocation(msg) << ": " << Color::MAGENTA
+ << "warning: " << Color::RESET << msg << "\n";
}
void ErrorHandler::error(const Twine &msg) {
@@ -160,12 +145,12 @@
if (errorLimit == 0 || errorCount < errorLimit) {
newline(errorOS, msg);
- printHeader("error: ", raw_ostream::RED, msg);
- *errorOS << msg << "\n";
+ *errorOS << getLocation(msg) << ": " << Color::RED
+ << "error: " << Color::RESET << msg << "\n";
} else if (errorCount == errorLimit) {
newline(errorOS, msg);
- printHeader("error: ", raw_ostream::RED, msg);
- *errorOS << errorLimitExceededMsg << "\n";
+ *errorOS << getLocation(msg) << ": " << Color::RED
+ << "error: " << Color::RESET << errorLimitExceededMsg << "\n";
if (exitEarly)
exitLld(1);
}
Index: lld/COFF/DriverUtils.cpp
===================================================================
--- lld/COFF/DriverUtils.cpp
+++ lld/COFF/DriverUtils.cpp
@@ -756,16 +756,17 @@
OPT_no_color_diagnostics);
if (!arg)
return;
+
if (arg->getOption().getID() == OPT_color_diagnostics) {
- errorHandler().colorDiagnostics = true;
+ errorHandler().errorOS->enable_colors();
} else if (arg->getOption().getID() == OPT_no_color_diagnostics) {
- errorHandler().colorDiagnostics = false;
+ errorHandler().errorOS->disable_colors();
} else {
StringRef s = arg->getValue();
if (s == "always")
- errorHandler().colorDiagnostics = true;
+ errorHandler().errorOS->enable_colors();
else if (s == "never")
- errorHandler().colorDiagnostics = false;
+ errorHandler().errorOS->disable_colors();
else if (s != "auto")
error("unknown option: --color-diagnostics=" + s);
}
Index: lld/COFF/Driver.cpp
===================================================================
--- lld/COFF/Driver.cpp
+++ lld/COFF/Driver.cpp
@@ -62,7 +62,6 @@
bool link(ArrayRef<const char *> args, bool canExitEarly, raw_ostream &diag) {
errorHandler().logName = args::getFilenameWithoutExe(args[0]);
errorHandler().errorOS = &diag;
- errorHandler().colorDiagnostics = diag.has_colors();
errorHandler().errorLimitExceededMsg =
"too many errors emitted, stopping now"
" (use /errorlimit:0 to see all errors)";
Index: clang/tools/diagtool/TreeView.cpp
===================================================================
--- clang/tools/diagtool/TreeView.cpp
+++ clang/tools/diagtool/TreeView.cpp
@@ -20,29 +20,16 @@
using namespace clang;
using namespace diagtool;
-static bool hasColors(const llvm::raw_ostream &out) {
- if (&out != &llvm::errs() && &out != &llvm::outs())
- return false;
- return llvm::errs().is_displayed() && llvm::outs().is_displayed();
-}
-
class TreePrinter {
+ using Color = llvm::raw_ostream::Color;
+
public:
llvm::raw_ostream &out;
- const bool ShowColors;
bool Internal;
- TreePrinter(llvm::raw_ostream &out)
- : out(out), ShowColors(hasColors(out)), Internal(false) {}
-
- void setColor(llvm::raw_ostream::Colors Color) {
- if (ShowColors)
- out << llvm::sys::Process::OutputColor(Color, false, false);
- }
-
- void resetColor() {
- if (ShowColors)
- out << llvm::sys::Process::ResetColor();
+ TreePrinter(llvm::raw_ostream &out) : out(out), Internal(false) {
+ if (&out != &llvm::errs() && &out != &llvm::outs())
+ out.disable_colors();
}
static bool isIgnored(unsigned DiagID) {
@@ -70,12 +57,11 @@
out.indent(Indent * 2);
if (enabledByDefault(Group))
- setColor(llvm::raw_ostream::GREEN);
+ out << Color::GREEN;
else
- setColor(llvm::raw_ostream::YELLOW);
+ out << Color::YELLOW;
- out << "-W" << Group.getName() << "\n";
- resetColor();
+ out << "-W" << Group.getName() << "\n" << Color::RESET;
++Indent;
for (const GroupRecord &GR : Group.subgroups()) {
@@ -84,12 +70,10 @@
if (Internal) {
for (const DiagnosticRecord &DR : Group.diagnostics()) {
- if (ShowColors && !isIgnored(DR.DiagID))
- setColor(llvm::raw_ostream::GREEN);
+ if (!isIgnored(DR.DiagID))
+ out << Color::GREEN;
out.indent(Indent * 2);
- out << DR.getName();
- resetColor();
- out << "\n";
+ out << DR.getName() << Color::RESET << "\n";
}
}
}
@@ -135,13 +119,9 @@
}
void showKey() {
- if (ShowColors) {
- out << '\n';
- setColor(llvm::raw_ostream::GREEN);
- out << "GREEN";
- resetColor();
- out << " = enabled by default\n\n";
- }
+ out << '\n'
+ << Color::GREEN << "GREEN" << Color::RESET
+ << " = enabled by default\n\n";
}
};
Index: clang/lib/Frontend/TextDiagnostic.cpp
===================================================================
--- clang/lib/Frontend/TextDiagnostic.cpp
+++ clang/lib/Frontend/TextDiagnostic.cpp
@@ -23,23 +23,16 @@
using namespace clang;
-static const enum raw_ostream::Colors noteColor =
- raw_ostream::BLACK;
-static const enum raw_ostream::Colors remarkColor =
- raw_ostream::BLUE;
-static const enum raw_ostream::Colors fixitColor =
- raw_ostream::GREEN;
-static const enum raw_ostream::Colors caretColor =
- raw_ostream::GREEN;
-static const enum raw_ostream::Colors warningColor =
- raw_ostream::MAGENTA;
-static const enum raw_ostream::Colors templateColor =
- raw_ostream::CYAN;
-static const enum raw_ostream::Colors errorColor = raw_ostream::RED;
-static const enum raw_ostream::Colors fatalColor = raw_ostream::RED;
+static const enum raw_ostream::Color noteColor = raw_ostream::BLACK;
+static const enum raw_ostream::Color remarkColor = raw_ostream::BLUE;
+static const enum raw_ostream::Color fixitColor = raw_ostream::GREEN;
+static const enum raw_ostream::Color caretColor = raw_ostream::GREEN;
+static const enum raw_ostream::Color warningColor = raw_ostream::MAGENTA;
+static const enum raw_ostream::Color templateColor = raw_ostream::CYAN;
+static const enum raw_ostream::Color errorColor = raw_ostream::RED;
+static const enum raw_ostream::Color fatalColor = raw_ostream::RED;
// Used for changing only the bold attribute.
-static const enum raw_ostream::Colors savedColor =
- raw_ostream::SAVEDCOLOR;
+static const enum raw_ostream::Color savedColor = raw_ostream::SAVEDCOLOR;
/// Add highlights to differences in template strings.
static void applyTemplateHighlighting(raw_ostream &OS, StringRef Str,
Index: clang/lib/Analysis/CFG.cpp
===================================================================
--- clang/lib/Analysis/CFG.cpp
+++ clang/lib/Analysis/CFG.cpp
@@ -5509,7 +5509,7 @@
if (print_edges) {
// Print the predecessors of this block.
if (!B.pred_empty()) {
- const raw_ostream::Colors Color = raw_ostream::BLUE;
+ const raw_ostream::Color Color = raw_ostream::BLUE;
if (ShowColors)
OS.changeColor(Color);
OS << " Preds " ;
@@ -5546,7 +5546,7 @@
// Print the successors of this block.
if (!B.succ_empty()) {
- const raw_ostream::Colors Color = raw_ostream::MAGENTA;
+ const raw_ostream::Color Color = raw_ostream::MAGENTA;
if (ShowColors)
OS.changeColor(Color);
OS << " Succs ";
Index: clang/include/clang/AST/ASTDumperUtils.h
===================================================================
--- clang/include/clang/AST/ASTDumperUtils.h
+++ clang/include/clang/AST/ASTDumperUtils.h
@@ -27,7 +27,7 @@
// Do not use bold yellow for any text. It is hard to read on white screens.
struct TerminalColor {
- llvm::raw_ostream::Colors Color;
+ llvm::raw_ostream::Color Color;
bool Bold;
};
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
