carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 22:02:52 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add line output to diagnostics to help identify error locations. (#3010)

Browse Source 
This also makes the filename a reference to the buffer since the line
seems better to have as a reference (versus copying a string per error).
Most tests now have different line deltas due to the extra output, but
the actual errors should overall stay the same.

Some of the error locations look like they could be improved, but this
change is only making it clear where they were before.
This commit is contained in:
Jon Ross-Perkins
2023-07-21 23:53:36 +00:00
committed by GitHub
parent 9c4188ab9f
commit 65a4e006a2
131 changed files with 578 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lexer/tokenized_buffer.cpp
+17 -3
View File
@@ -88,7 +88,7 @@ class TokenizedBuffer::Lexer {
emitter_(translator_, consumer),
token_translator_(&buffer, &current_column_),
token_emitter_(token_translator_, consumer),
current_line_(buffer.AddLine({0, 0, 0})),
current_line_(buffer.AddLine(LineInfo(0))),
current_line_info_(&buffer.GetLineInfo(current_line_)) {}
// Perform the necessary bookkeeping to step past a newline at the current
@@ -97,7 +97,7 @@ class TokenizedBuffer::Lexer {
current_line_info_->length = current_column_;
current_line_ = buffer_->AddLine(
{current_line_info_->start + current_column_ + 1, 0, 0});
LineInfo(current_line_info_->start + current_column_ + 1));
current_line_info_ = &buffer_->GetLineInfo(current_line_);
current_column_ = 0;
set_indent_ = false;
@@ -907,23 +907,37 @@ auto TokenizedBuffer::SourceBufferLocationTranslator::GetLocation(
int line_number = line_it - buffer_->line_infos_.begin();
int column_number = offset - line_it->start;
llvm::StringRef line;
// We might still be lexing the last line. If so, check to see if there are
// any newline characters between the position we've finished lexing up to
// and the given location.
if (incomplete_line_info && column_number > *last_line_lexed_to_column_) {
column_number = *last_line_lexed_to_column_;
int64_t start = line_it->start;
for (int64_t i = line_it->start + *last_line_lexed_to_column_; i != offset;
++i) {
if (buffer_->source_->text()[i] == '\n') {
start = i;
++line_number;
column_number = 0;
} else {
++column_number;
}
}
line = buffer_->source_->text().substr(start).take_until(
[](char c) { return c == '\n'; });
} else if (line_it->length < 0) {
line =
buffer_->source_->text().substr(line_it->start).take_until([](char c) {
return c == '\n';
});
} else {
line = buffer_->source_->text().substr(line_it->start, line_it->length);
}
return {.file_name = buffer_->source_->filename().str(),
return {.file_name = buffer_->source_->filename(),
.line = line,
.line_number = line_number + 1,
.column_number = column_number + 1};
}