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

For flyweights, shift from llvm::SmallVector to a type that enforces index types. (#2398)

Browse Source 
The intent here is to reduce use of vanilla `int32_t` without a clear indicator of what it's referencing, and to more tightly link references with the underlying types they reference into.

The type name DataIndex doesn't feel great, but I was kind of floundering for a better name.
This commit is contained in:
Jon Ross-Perkins
2022-11-18 14:07:01 -08:00
committed by GitHub
parent d9ce1827c8
commit 97ed697386
5 changed files with 87 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lexer/tokenized_buffer.cpp
+11 -11
View File
@@ -733,7 +733,7 @@ auto TokenizedBuffer::IsRecoveryToken(Token token) const -> bool {
}
auto TokenizedBuffer::GetLineNumber(Line line) const -> int {
return line.index_ + 1;
return line.index + 1;
}
auto TokenizedBuffer::GetIndentColumnNumber(Line line) const -> int {
@@ -742,7 +742,7 @@ auto TokenizedBuffer::GetIndentColumnNumber(Line line) const -> int {
auto TokenizedBuffer::GetIdentifierText(Identifier identifier) const
-> llvm::StringRef {
return identifier_infos_[identifier.index_].text;
return identifier_infos_[identifier.index].text;
}
auto TokenizedBuffer::PrintWidths::Widen(const PrintWidths& widths) -> void {
@@ -803,7 +803,7 @@ auto TokenizedBuffer::PrintToken(llvm::raw_ostream& output_stream,
auto TokenizedBuffer::PrintToken(llvm::raw_ostream& output_stream, Token token,
PrintWidths widths) const -> void {
widths.Widen(GetTokenPrintWidths(token));
int token_index = token.index_;
int token_index = token.index;
const auto& token_info = GetTokenInfo(token);
llvm::StringRef token_text = GetTokenText(token);
@@ -825,7 +825,7 @@ auto TokenizedBuffer::PrintToken(llvm::raw_ostream& output_stream, Token token,
switch (token_info.kind) {
case TokenKind::Identifier():
output_stream << ", identifier: " << GetIdentifier(token).index_;
output_stream << ", identifier: " << GetIdentifier(token).index;
break;
case TokenKind::IntegerLiteral():
output_stream << ", value: `";
@@ -841,10 +841,10 @@ auto TokenizedBuffer::PrintToken(llvm::raw_ostream& output_stream, Token token,
default:
if (token_info.kind.IsOpeningSymbol()) {
output_stream << ", closing_token: "
<< GetMatchedClosingToken(token).index_;
<< GetMatchedClosingToken(token).index;
} else if (token_info.kind.IsClosingSymbol()) {
output_stream << ", opening_token: "
<< GetMatchedOpeningToken(token).index_;
<< GetMatchedOpeningToken(token).index;
}
break;
}
@@ -860,11 +860,11 @@ auto TokenizedBuffer::PrintToken(llvm::raw_ostream& output_stream, Token token,
}
auto TokenizedBuffer::GetLineInfo(Line line) -> LineInfo& {
return line_infos_[line.index_];
return line_infos_[line.index];
}
auto TokenizedBuffer::GetLineInfo(Line line) const -> const LineInfo& {
return line_infos_[line.index_];
return line_infos_[line.index];
}
auto TokenizedBuffer::AddLine(LineInfo info) -> Line {
@@ -873,11 +873,11 @@ auto TokenizedBuffer::AddLine(LineInfo info) -> Line {
}
auto TokenizedBuffer::GetTokenInfo(Token token) -> TokenInfo& {
return token_infos_[token.index_];
return token_infos_[token.index];
}
auto TokenizedBuffer::GetTokenInfo(Token token) const -> const TokenInfo& {
return token_infos_[token.index_];
return token_infos_[token.index];
}
auto TokenizedBuffer::AddToken(TokenInfo info) -> Token {
@@ -887,7 +887,7 @@ auto TokenizedBuffer::AddToken(TokenInfo info) -> Token {
auto TokenizedBuffer::TokenIterator::Print(llvm::raw_ostream& output) const
-> void {
output << token_.index_;
output << token_.index;
}
auto TokenizedBuffer::SourceBufferLocationTranslator::GetLocation(