mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
This makes each token info consist of 8 bytes of data: - 1 byte of the kind - 1 bit for whitespace tracking - 23 bits of payload - 32 bits for byte offset in the file This builds directly on representing the location of the token as a single 32-bit offset, now compressing the rest of the data into a single 32-bit bitfield. This adds some implementation limits: we can no longer lex more than 2^23 tokens in a single source file. Nor can we have more than 2^23 string literals, integer literals, real literals, or identifiers. Only the first of these is even close to an issue, and even then seems unlikely to ever be a problem in practice. The memory efficiency here is great and the motivating goal. But to make this work well, we also need to streamline how we create the tokens. Otherwise, all the bit fiddling can end up erasing our gains. This PR adds a number of APIs to manage creating and accessing the now significantly more complex storage of token infos to try and help with this. One big change required to simplify the writes here is to switch from computing whether a token has trailing space after-the-fact to pre-computing whether a token will have leading space. That lets us have the leading space information available immediately when forming the token, and avoids doing a single bit flip afterward. Another change that helps with this representation is to minimize the updating of groups after-the-fact. The code now tries to set the opening index directly when creating the closing token and only updates the opening group afterward. Because of the bit packing, this is a reduction of 0.5% of dynamic instructions in the compile benchmark, and has dramatic improvements for the grouping symbol focused benchmarks. All combined, this is a significant improvement on the lexer-focused benchmarks despite the added complexity, and a significant win on our compile time benchmarks due to both the lexer improvements and downstream memory density improvements: 5-12% reduction in lex time, growing larger as files get larger. About a 4.5% reduction in parse time, and even a 1-2% reduction in total check time. =D --------- Co-authored-by: Jon Ross-Perkins <jperkins@google.com> Co-authored-by: Geoff Romer <gromer@google.com>
439 lines
16 KiB
C++
439 lines
16 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/lex/tokenized_buffer.h"
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
|
|
#include "common/check.h"
|
|
#include "common/string_helpers.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/Support/Format.h"
|
|
#include "llvm/Support/FormatVariadic.h"
|
|
#include "toolchain/base/value_store.h"
|
|
#include "toolchain/diagnostics/diagnostic_emitter.h"
|
|
#include "toolchain/lex/character_set.h"
|
|
#include "toolchain/lex/numeric_literal.h"
|
|
#include "toolchain/lex/string_literal.h"
|
|
|
|
namespace Carbon::Lex {
|
|
|
|
auto TokenizedBuffer::GetKind(TokenIndex token) const -> TokenKind {
|
|
return GetTokenInfo(token).kind();
|
|
}
|
|
|
|
auto TokenizedBuffer::GetLine(TokenIndex token) const -> LineIndex {
|
|
return FindLineIndex(GetTokenInfo(token).byte_offset());
|
|
}
|
|
|
|
auto TokenizedBuffer::GetLineNumber(TokenIndex token) const -> int {
|
|
return GetLineNumber(GetLine(token));
|
|
}
|
|
|
|
auto TokenizedBuffer::GetColumnNumber(TokenIndex token) const -> int {
|
|
const auto& token_info = GetTokenInfo(token);
|
|
const auto& line_info = GetLineInfo(FindLineIndex(token_info.byte_offset()));
|
|
return token_info.byte_offset() - line_info.start + 1;
|
|
}
|
|
|
|
auto TokenizedBuffer::GetEndLoc(TokenIndex token) const
|
|
-> std::pair<LineIndex, int> {
|
|
auto line = GetLine(token);
|
|
int column = GetColumnNumber(token);
|
|
auto token_text = GetTokenText(token);
|
|
|
|
if (auto [before_newline, after_newline] = token_text.rsplit('\n');
|
|
before_newline.size() == token_text.size()) {
|
|
// Token fits on one line, advance the column number.
|
|
column += before_newline.size();
|
|
} else {
|
|
// Token contains newlines.
|
|
line.index += before_newline.count('\n') + 1;
|
|
column = 1 + after_newline.size();
|
|
}
|
|
|
|
return {line, column};
|
|
}
|
|
|
|
auto TokenizedBuffer::GetTokenText(TokenIndex token) const -> llvm::StringRef {
|
|
const auto& token_info = GetTokenInfo(token);
|
|
llvm::StringRef fixed_spelling = token_info.kind().fixed_spelling();
|
|
if (!fixed_spelling.empty()) {
|
|
return fixed_spelling;
|
|
}
|
|
|
|
if (token_info.kind() == TokenKind::Error) {
|
|
return source_->text().substr(token_info.byte_offset(),
|
|
token_info.error_length());
|
|
}
|
|
|
|
// Refer back to the source text to preserve oddities like radix or digit
|
|
// separators the author included.
|
|
if (token_info.kind() == TokenKind::IntLiteral ||
|
|
token_info.kind() == TokenKind::RealLiteral) {
|
|
std::optional<NumericLiteral> relexed_token =
|
|
NumericLiteral::Lex(source_->text().substr(token_info.byte_offset()));
|
|
CARBON_CHECK(relexed_token) << "Could not reform numeric literal token.";
|
|
return relexed_token->text();
|
|
}
|
|
|
|
// Refer back to the source text to find the original spelling, including
|
|
// escape sequences etc.
|
|
if (token_info.kind() == TokenKind::StringLiteral) {
|
|
std::optional<StringLiteral> relexed_token =
|
|
StringLiteral::Lex(source_->text().substr(token_info.byte_offset()));
|
|
CARBON_CHECK(relexed_token) << "Could not reform string literal token.";
|
|
return relexed_token->text();
|
|
}
|
|
|
|
// Refer back to the source text to avoid needing to reconstruct the
|
|
// spelling from the size.
|
|
if (token_info.kind().is_sized_type_literal()) {
|
|
llvm::StringRef suffix = source_->text()
|
|
.substr(token_info.byte_offset() + 1)
|
|
.take_while(IsDecimalDigit);
|
|
return llvm::StringRef(suffix.data() - 1, suffix.size() + 1);
|
|
}
|
|
|
|
if (token_info.kind() == TokenKind::FileStart ||
|
|
token_info.kind() == TokenKind::FileEnd) {
|
|
return llvm::StringRef();
|
|
}
|
|
|
|
CARBON_CHECK(token_info.kind() == TokenKind::Identifier) << token_info.kind();
|
|
return value_stores_->identifiers().Get(token_info.ident_id());
|
|
}
|
|
|
|
auto TokenizedBuffer::GetIdentifier(TokenIndex token) const -> IdentifierId {
|
|
const auto& token_info = GetTokenInfo(token);
|
|
CARBON_CHECK(token_info.kind() == TokenKind::Identifier) << token_info.kind();
|
|
return token_info.ident_id();
|
|
}
|
|
|
|
auto TokenizedBuffer::GetIntLiteral(TokenIndex token) const -> IntId {
|
|
const auto& token_info = GetTokenInfo(token);
|
|
CARBON_CHECK(token_info.kind() == TokenKind::IntLiteral) << token_info.kind();
|
|
return token_info.int_id();
|
|
}
|
|
|
|
auto TokenizedBuffer::GetRealLiteral(TokenIndex token) const -> RealId {
|
|
const auto& token_info = GetTokenInfo(token);
|
|
CARBON_CHECK(token_info.kind() == TokenKind::RealLiteral)
|
|
<< token_info.kind();
|
|
return token_info.real_id();
|
|
}
|
|
|
|
auto TokenizedBuffer::GetStringLiteralValue(TokenIndex token) const
|
|
-> StringLiteralValueId {
|
|
const auto& token_info = GetTokenInfo(token);
|
|
CARBON_CHECK(token_info.kind() == TokenKind::StringLiteral)
|
|
<< token_info.kind();
|
|
return token_info.string_literal_id();
|
|
}
|
|
|
|
auto TokenizedBuffer::GetTypeLiteralSize(TokenIndex token) const -> IntId {
|
|
const auto& token_info = GetTokenInfo(token);
|
|
CARBON_CHECK(token_info.kind().is_sized_type_literal()) << token_info.kind();
|
|
return token_info.int_id();
|
|
}
|
|
|
|
auto TokenizedBuffer::GetMatchedClosingToken(TokenIndex opening_token) const
|
|
-> TokenIndex {
|
|
const auto& opening_token_info = GetTokenInfo(opening_token);
|
|
CARBON_CHECK(opening_token_info.kind().is_opening_symbol())
|
|
<< opening_token_info.kind();
|
|
return opening_token_info.closing_token_index();
|
|
}
|
|
|
|
auto TokenizedBuffer::GetMatchedOpeningToken(TokenIndex closing_token) const
|
|
-> TokenIndex {
|
|
const auto& closing_token_info = GetTokenInfo(closing_token);
|
|
CARBON_CHECK(closing_token_info.kind().is_closing_symbol())
|
|
<< closing_token_info.kind();
|
|
return closing_token_info.opening_token_index();
|
|
}
|
|
|
|
auto TokenizedBuffer::HasLeadingWhitespace(TokenIndex token) const -> bool {
|
|
return GetTokenInfo(token).has_leading_space();
|
|
}
|
|
|
|
auto TokenizedBuffer::HasTrailingWhitespace(TokenIndex token) const -> bool {
|
|
TokenIterator it(token);
|
|
++it;
|
|
return it != tokens().end() && GetTokenInfo(*it).has_leading_space();
|
|
}
|
|
|
|
auto TokenizedBuffer::IsRecoveryToken(TokenIndex token) const -> bool {
|
|
if (recovery_tokens_.empty()) {
|
|
return false;
|
|
}
|
|
return recovery_tokens_[token.index];
|
|
}
|
|
|
|
auto TokenizedBuffer::GetLineNumber(LineIndex line) const -> int {
|
|
return line.index + 1;
|
|
}
|
|
|
|
auto TokenizedBuffer::GetNextLine(LineIndex line) const -> LineIndex {
|
|
LineIndex next(line.index + 1);
|
|
CARBON_DCHECK(static_cast<size_t>(next.index) < line_infos_.size());
|
|
return next;
|
|
}
|
|
|
|
auto TokenizedBuffer::GetPrevLine(LineIndex line) const -> LineIndex {
|
|
CARBON_CHECK(line.index > 0);
|
|
return LineIndex(line.index - 1);
|
|
}
|
|
|
|
auto TokenizedBuffer::GetIndentColumnNumber(LineIndex line) const -> int {
|
|
return GetLineInfo(line).indent + 1;
|
|
}
|
|
|
|
auto TokenizedBuffer::PrintWidths::Widen(const PrintWidths& widths) -> void {
|
|
index = std::max(widths.index, index);
|
|
kind = std::max(widths.kind, kind);
|
|
column = std::max(widths.column, column);
|
|
line = std::max(widths.line, line);
|
|
indent = std::max(widths.indent, indent);
|
|
}
|
|
|
|
// Compute the printed width of a number. When numbers are printed in decimal,
|
|
// the number of digits needed is one more than the log-base-10 of the
|
|
// value. We handle a value of `zero` explicitly.
|
|
//
|
|
// This routine requires its argument to be *non-negative*.
|
|
static auto ComputeDecimalPrintedWidth(int number) -> int {
|
|
CARBON_CHECK(number >= 0) << "Negative numbers are not supported.";
|
|
if (number == 0) {
|
|
return 1;
|
|
}
|
|
|
|
return static_cast<int>(std::log10(number)) + 1;
|
|
}
|
|
|
|
auto TokenizedBuffer::GetTokenPrintWidths(TokenIndex token) const
|
|
-> PrintWidths {
|
|
PrintWidths widths = {};
|
|
widths.index = ComputeDecimalPrintedWidth(token_infos_.size());
|
|
widths.kind = GetKind(token).name().size();
|
|
widths.line = ComputeDecimalPrintedWidth(GetLineNumber(token));
|
|
widths.column = ComputeDecimalPrintedWidth(GetColumnNumber(token));
|
|
widths.indent =
|
|
ComputeDecimalPrintedWidth(GetIndentColumnNumber(GetLine(token)));
|
|
return widths;
|
|
}
|
|
|
|
auto TokenizedBuffer::Print(llvm::raw_ostream& output_stream) const -> void {
|
|
if (tokens().begin() == tokens().end()) {
|
|
return;
|
|
}
|
|
|
|
output_stream << "- filename: " << source_->filename() << "\n"
|
|
<< " tokens: [\n";
|
|
|
|
PrintWidths widths = {};
|
|
widths.index = ComputeDecimalPrintedWidth((token_infos_.size()));
|
|
for (TokenIndex token : tokens()) {
|
|
widths.Widen(GetTokenPrintWidths(token));
|
|
}
|
|
|
|
for (TokenIndex token : tokens()) {
|
|
PrintToken(output_stream, token, widths);
|
|
output_stream << "\n";
|
|
}
|
|
output_stream << " ]\n";
|
|
}
|
|
|
|
auto TokenizedBuffer::PrintToken(llvm::raw_ostream& output_stream,
|
|
TokenIndex token) const -> void {
|
|
PrintToken(output_stream, token, {});
|
|
}
|
|
|
|
auto TokenizedBuffer::PrintToken(llvm::raw_ostream& output_stream,
|
|
TokenIndex token, PrintWidths widths) const
|
|
-> void {
|
|
widths.Widen(GetTokenPrintWidths(token));
|
|
int token_index = token.index;
|
|
const auto& token_info = GetTokenInfo(token);
|
|
LineIndex line_index = FindLineIndex(token_info.byte_offset());
|
|
llvm::StringRef token_text = GetTokenText(token);
|
|
|
|
// Output the main chunk using one format string. We have to do the
|
|
// justification manually in order to use the dynamically computed widths
|
|
// and get the quotes included.
|
|
output_stream << llvm::formatv(
|
|
" { index: {0}, kind: {1}, line: {2}, column: {3}, indent: {4}, "
|
|
"spelling: '{5}'",
|
|
llvm::format_decimal(token_index, widths.index),
|
|
llvm::right_justify(
|
|
llvm::formatv("'{0}'", token_info.kind().name()).str(),
|
|
widths.kind + 2),
|
|
llvm::format_decimal(GetLineNumber(GetLine(token)), widths.line),
|
|
llvm::format_decimal(GetColumnNumber(token), widths.column),
|
|
llvm::format_decimal(GetIndentColumnNumber(line_index), widths.indent),
|
|
token_text);
|
|
|
|
switch (token_info.kind()) {
|
|
case TokenKind::Identifier:
|
|
output_stream << ", identifier: " << GetIdentifier(token).index;
|
|
break;
|
|
case TokenKind::IntLiteral:
|
|
output_stream << ", value: `";
|
|
value_stores_->ints()
|
|
.Get(GetIntLiteral(token))
|
|
.print(output_stream, /*isSigned=*/false);
|
|
output_stream << "`";
|
|
break;
|
|
case TokenKind::RealLiteral:
|
|
output_stream << ", value: `"
|
|
<< value_stores_->reals().Get(GetRealLiteral(token)) << "`";
|
|
break;
|
|
case TokenKind::StringLiteral:
|
|
output_stream << ", value: `"
|
|
<< value_stores_->string_literal_values().Get(
|
|
GetStringLiteralValue(token))
|
|
<< "`";
|
|
break;
|
|
default:
|
|
if (token_info.kind().is_opening_symbol()) {
|
|
output_stream << ", closing_token: "
|
|
<< GetMatchedClosingToken(token).index;
|
|
} else if (token_info.kind().is_closing_symbol()) {
|
|
output_stream << ", opening_token: "
|
|
<< GetMatchedOpeningToken(token).index;
|
|
}
|
|
break;
|
|
}
|
|
|
|
if (token_info.has_leading_space()) {
|
|
output_stream << ", has_leading_space: true";
|
|
}
|
|
if (IsRecoveryToken(token)) {
|
|
output_stream << ", recovery: true";
|
|
}
|
|
|
|
output_stream << " },";
|
|
}
|
|
|
|
// Find the line index corresponding to a specific byte offset within the source
|
|
// text for this tokenized buffer.
|
|
//
|
|
// This takes advantage of the lines being sorted by their starting byte offsets
|
|
// to do a binary search for the line that contains the provided offset.
|
|
auto TokenizedBuffer::FindLineIndex(int32_t byte_offset) const -> LineIndex {
|
|
CARBON_DCHECK(!line_infos_.empty());
|
|
const auto* line_it =
|
|
std::partition_point(line_infos_.begin(), line_infos_.end(),
|
|
[byte_offset](LineInfo line_info) {
|
|
return line_info.start <= byte_offset;
|
|
});
|
|
--line_it;
|
|
|
|
// If this isn't the first line but it starts past the end of the source, then
|
|
// this is a synthetic line added for simplicity of lexing. Step back one
|
|
// further to find the last non-synthetic line.
|
|
if (line_it != line_infos_.begin() &&
|
|
line_it->start == static_cast<int32_t>(source_->text().size())) {
|
|
--line_it;
|
|
}
|
|
CARBON_DCHECK(line_it->start <= byte_offset);
|
|
return LineIndex(line_it - line_infos_.begin());
|
|
}
|
|
|
|
auto TokenizedBuffer::GetLineInfo(LineIndex line) -> LineInfo& {
|
|
return line_infos_[line.index];
|
|
}
|
|
|
|
auto TokenizedBuffer::GetLineInfo(LineIndex line) const -> const LineInfo& {
|
|
return line_infos_[line.index];
|
|
}
|
|
|
|
auto TokenizedBuffer::AddLine(LineInfo info) -> LineIndex {
|
|
line_infos_.push_back(info);
|
|
return LineIndex(static_cast<int>(line_infos_.size()) - 1);
|
|
}
|
|
|
|
auto TokenizedBuffer::GetTokenInfo(TokenIndex token) -> TokenInfo& {
|
|
return token_infos_[token.index];
|
|
}
|
|
|
|
auto TokenizedBuffer::GetTokenInfo(TokenIndex token) const -> const TokenInfo& {
|
|
return token_infos_[token.index];
|
|
}
|
|
|
|
auto TokenizedBuffer::AddToken(TokenInfo info) -> TokenIndex {
|
|
token_infos_.push_back(info);
|
|
expected_parse_tree_size_ += info.kind().expected_parse_tree_size();
|
|
return TokenIndex(static_cast<int>(token_infos_.size()) - 1);
|
|
}
|
|
|
|
auto TokenizedBuffer::CollectMemUsage(MemUsage& mem_usage,
|
|
llvm::StringRef label) const -> void {
|
|
mem_usage.Add(MemUsage::ConcatLabel(label, "allocator_"), allocator_);
|
|
mem_usage.Add(MemUsage::ConcatLabel(label, "token_infos_"), token_infos_);
|
|
mem_usage.Add(MemUsage::ConcatLabel(label, "line_infos_"), line_infos_);
|
|
}
|
|
|
|
auto TokenIterator::Print(llvm::raw_ostream& output) const -> void {
|
|
output << token_.index;
|
|
}
|
|
|
|
auto TokenizedBuffer::SourceBufferDiagnosticConverter::ConvertLoc(
|
|
const char* loc, ContextFnT /*context_fn*/) const -> DiagnosticLoc {
|
|
CARBON_CHECK(StringRefContainsPointer(buffer_->source_->text(), loc))
|
|
<< "location not within buffer";
|
|
int32_t offset = loc - buffer_->source_->text().begin();
|
|
|
|
// Find the first line starting after the given location.
|
|
const auto* next_line_it = std::partition_point(
|
|
buffer_->line_infos_.begin(), buffer_->line_infos_.end(),
|
|
[offset](const LineInfo& line) { return line.start <= offset; });
|
|
|
|
// Step back one line to find the line containing the given position.
|
|
CARBON_CHECK(next_line_it != buffer_->line_infos_.begin())
|
|
<< "location precedes the start of the first line";
|
|
const auto* line_it = std::prev(next_line_it);
|
|
int line_number = line_it - buffer_->line_infos_.begin();
|
|
int column_number = offset - line_it->start;
|
|
|
|
// Grab the line from the buffer by slicing from this line to the next
|
|
// minus the newline. When on the last line, instead use the start to the end
|
|
// of the buffer.
|
|
llvm::StringRef text = buffer_->source_->text();
|
|
llvm::StringRef line = next_line_it != buffer_->line_infos_.end()
|
|
? text.slice(line_it->start, next_line_it->start)
|
|
: text.substr(line_it->start);
|
|
|
|
// Remove a newline at the end of the line if present.
|
|
// TODO: This should expand to remove all vertical whitespace bytes at the
|
|
// tail of the line such as CR+LF, etc.
|
|
line.consume_back("\n");
|
|
|
|
return {.filename = buffer_->source_->filename(),
|
|
.line = line,
|
|
.line_number = line_number + 1,
|
|
.column_number = column_number + 1};
|
|
}
|
|
|
|
auto TokenDiagnosticConverter::ConvertLoc(TokenIndex token,
|
|
ContextFnT context_fn) const
|
|
-> DiagnosticLoc {
|
|
// Map the token location into a position within the source buffer.
|
|
const auto& token_info = buffer_->GetTokenInfo(token);
|
|
const char* token_start =
|
|
buffer_->source_->text().begin() + token_info.byte_offset();
|
|
|
|
// Find the corresponding file location.
|
|
// TODO: Should we somehow indicate in the diagnostic location if this token
|
|
// is a recovery token that doesn't correspond to the original source?
|
|
DiagnosticLoc loc =
|
|
TokenizedBuffer::SourceBufferDiagnosticConverter(buffer_).ConvertLoc(
|
|
token_start, context_fn);
|
|
loc.length = buffer_->GetTokenText(token).size();
|
|
return loc;
|
|
}
|
|
|
|
} // namespace Carbon::Lex
|