mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-03 09:05:50 +01:00
Jon Ross-Perkins
3f7af842a3
I'm trying to make the line of code more clearly nested in crash output (the way it is, I sometimes forget about it). Also, `Check::HandleFunctionDecl` is the old naming scheme, it's now all `Check::HandleParseNode`, so I'm replacing that. Before: ``` 3. extern_library_owner.carbon:6:1: Check::HandleFunctionDecl extern fn F(); ^~~~~~~~~~~~~~ #0 0x0000564c0057ef1d llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) ... ``` After: ``` 3. extern_library_owner.carbon:6:1: checking FunctionDecl extern fn F(); ^~~~~~~~~~~~~~ #0 0x00005629029ffd9d llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) ... ```
48 lines
1.2 KiB
C++
48 lines
1.2 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/diagnostics/diagnostic.h"
|
|
|
|
#include <algorithm>
|
|
#include <cstdint>
|
|
|
|
namespace Carbon {
|
|
|
|
auto DiagnosticLoc::FormatLocation(llvm::raw_ostream& out) const -> void {
|
|
out << filename;
|
|
if (line_number > 0) {
|
|
out << ":" << line_number;
|
|
if (column_number > 0) {
|
|
out << ":" << column_number;
|
|
}
|
|
}
|
|
}
|
|
|
|
auto DiagnosticLoc::FormatSnippet(llvm::raw_ostream& out, int indent) const
|
|
-> void {
|
|
if (column_number <= 0) {
|
|
return;
|
|
}
|
|
|
|
// column_number is 1-based.
|
|
int32_t column = column_number - 1;
|
|
|
|
out.indent(indent);
|
|
out << line << "\n";
|
|
out.indent(indent + column);
|
|
out << "^";
|
|
// We want to ensure that we don't underline past the end of the line in
|
|
// case of a multiline token.
|
|
// TODO: revisit this once we can reference multiple ranges on multiple
|
|
// lines in a single diagnostic message.
|
|
int underline_length =
|
|
std::min(length, static_cast<int32_t>(line.size()) - column);
|
|
for (int i = 1; i < underline_length; ++i) {
|
|
out << '~';
|
|
}
|
|
out << '\n';
|
|
}
|
|
|
|
} // namespace Carbon
|