luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a color overload for stacktrace_frame::to_string, fixes #190

Browse Source
This commit is contained in:
Jeremy Rifkin 2024-11-14 23:54:52 -06:00
parent 8866d70a32
commit e10dbf431e
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/cpptrace/basic.hpp
View File

@ -154,6 +154,7 @@ namespace cpptrace {
object_frame get_object_info() const; object_frame get_object_info() const;
std::string to_string() const; std::string to_string() const;
std::string to_string(bool color) const;
friend std::ostream& operator<<(std::ostream& stream, const stacktrace_frame& frame); friend std::ostream& operator<<(std::ostream& stream, const stacktrace_frame& frame);
}; };

62
src/cpptrace.cpp
View File

@ -129,28 +129,43 @@ namespace cpptrace {
return detail::get_frame_object_info(raw_address); return detail::get_frame_object_info(raw_address);
} }
std::string stacktrace_frame::to_string() const { static std::string frame_to_string(
bool color,
const stacktrace_frame& frame
) {
const auto reset = color ? RESET : "";
const auto green = color ? GREEN : "";
const auto yellow = color ? YELLOW : "";
const auto blue = color ? BLUE : "";
std::string str; std::string str;
if(is_inline) { if(frame.is_inline) {
str += microfmt::format("{<{}}", 2 * sizeof(frame_ptr) + 2, "(inlined)"); str += microfmt::format("{<{}}", 2 * sizeof(frame_ptr) + 2, "(inlined)");
} else { } else {
str += microfmt::format("0x{>{}:0h}", 2 * sizeof(frame_ptr), raw_address); str += microfmt::format("{}0x{>{}:0h}{}", blue, 2 * sizeof(frame_ptr), frame.raw_address, reset);
} }
if(!symbol.empty()) { if(!frame.symbol.empty()) {
str += microfmt::format(" in {}", symbol); str += microfmt::format(" in {}{}{}", yellow, frame.symbol, reset);
} }
if(!filename.empty()) { if(!frame.filename.empty()) {
str += microfmt::format(" at {}", filename); str += microfmt::format(" at {}{}{}", green, frame.filename, reset);
if(line.has_value()) { if(frame.line.has_value()) {
str += microfmt::format(":{}", line.value()); str += microfmt::format(":{}{}{}", blue, frame.line.value(), reset);
if(column.has_value()) { if(frame.column.has_value()) {
str += microfmt::format(":{}", column.value()); str += microfmt::format(":{}{}{}", blue, frame.column.value(), reset);
} }
} }
} }
return str; return str;
} }
std::string stacktrace_frame::to_string() const {
return to_string(false);
}
std::string stacktrace_frame::to_string(bool color) const {
return frame_to_string(color, *this);
}
std::ostream& operator<<(std::ostream& stream, const stacktrace_frame& frame) { std::ostream& operator<<(std::ostream& stream, const stacktrace_frame& frame) {
return stream << frame.to_string(); return stream << frame.to_string();
} }
@ -191,35 +206,14 @@ namespace cpptrace {
print(stream, color, true, nullptr); print(stream, color, true, nullptr);
} }
void print_frame( static void print_frame(
std::ostream& stream, std::ostream& stream,
bool color, bool color,
unsigned frame_number_width, unsigned frame_number_width,
std::size_t counter, std::size_t counter,
const stacktrace_frame& frame const stacktrace_frame& frame
) { ) {
const auto reset = color ? RESET : ""; std::string line = microfmt::format("#{<{}} {}", frame_number_width, counter, frame.to_string(color));
const auto green = color ? GREEN : "";
const auto yellow = color ? YELLOW : "";
const auto blue = color ? BLUE : "";
std::string line = microfmt::format("#{<{}} ", frame_number_width, counter);
if(frame.is_inline) {
line += microfmt::format("{<{}}", 2 * sizeof(frame_ptr) + 2, "(inlined)");
} else {
line += microfmt::format("{}0x{>{}:0h}{}", blue, 2 * sizeof(frame_ptr), frame.raw_address, reset);
}
if(!frame.symbol.empty()) {
line += microfmt::format(" in {}{}{}", yellow, frame.symbol, reset);
}
if(!frame.filename.empty()) {
line += microfmt::format(" at {}{}{}", green, frame.filename, reset);
if(frame.line.has_value()) {
line += microfmt::format(":{}{}{}", blue, frame.line.value(), reset);
if(frame.column.has_value()) {
line += microfmt::format(":{}{}{}", blue, frame.column.value(), reset);
}
}
}
stream << line; stream << line;
} }