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

Support for base: T;, .base, x.base. (#3450)

Browse Source 
No support for `extend base` yet, in an effort to minimize collisions
with #3412.
This commit is contained in:
Richard Smith
2023-12-04 22:45:59 +00:00
committed by GitHub
parent 30155dbb72
commit 7dffa0c7ec
34 changed files with 1088 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_decl_scope_loop.cpp
+13 -1
View File
@@ -62,8 +62,20 @@ auto HandleDeclScopeLoop(Context& context) -> void {
// result in a `set_packaging_state` call. Note, this may not always be
// necessary but is probably cheaper than validating.
switch (position_kind) {
case Lex::TokenKind::Abstract:
case Lex::TokenKind::Base: {
if (context.PositionIs(Lex::TokenKind::Colon, Lookahead::NextToken)) {
context.PushState(State::BaseDecl);
context.PushState(State::Expr);
context.AddLeafNode(NodeKind::BaseIntroducer, context.Consume());
context.AddLeafNode(NodeKind::BaseColon, context.Consume());
return;
}
// TODO: If the next token isn't a colon or `class`, try to recover based
// on whether we're in a class, whether we have an `extend` modifier, and
// the following tokens.
[[fallthrough]];
}
case Lex::TokenKind::Abstract: {
if (context.PositionIs(Lex::TokenKind::Class, Lookahead::NextToken)) {
context.PushState(State::TypeAfterIntroducerAsClass);
auto modifier_token = context.Consume();