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

Add typed forms of TokenIndex for tokens with a known kind. (#4016)

Browse Source 
Instead of adding a `Token<Kind>` field to typed parse nodes that
contains a `TokenIndex`, make the parse node directly hold a
`TokenIndex` of a more specific kind.
This commit is contained in:
Richard Smith
2024-06-04 00:20:49 +00:00
committed by GitHub
parent 4387a3ab14
commit c2ab520522
6 changed files with 230 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/extract.cpp
+8 -6
View File
@@ -330,10 +330,11 @@ auto NodeExtractor::MatchesTokenKind(Lex::TokenKind expected_kind) const
// Extract the token corresponding to a node.
template <const Lex::TokenKind& Kind>
struct Extractable<Token<Kind>> {
static auto Extract(NodeExtractor& extractor) -> std::optional<Token<Kind>> {
struct Extractable<Lex::TokenIndexForKind<Kind>> {
static auto Extract(NodeExtractor& extractor)
-> std::optional<Lex::TokenIndexForKind<Kind>> {
if (extractor.MatchesTokenKind(Kind)) {
return Token<Kind>{.index = extractor.token()};
return static_cast<Lex::TokenIndexForKind<Kind>>(extractor.token());
} else {
return std::nullopt;
}
@@ -342,15 +343,16 @@ struct Extractable<Token<Kind>> {
// Extract the token corresponding to a node.
template <>
struct Extractable<AnyToken> {
static auto Extract(NodeExtractor& extractor) -> std::optional<AnyToken> {
struct Extractable<Lex::TokenIndex> {
static auto Extract(NodeExtractor& extractor)
-> std::optional<Lex::TokenIndex> {
if (!extractor.has_token()) {
if (auto* trace = extractor.trace()) {
*trace << "Token expected but processing root node\n";
}
return std::nullopt;
}
return AnyToken{.index = extractor.token()};
return extractor.token();
}
};