mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Richard Smith
23f9065949
Change syntax for package declaration to put the `impl` keyword at the start and remove the `api` keyword. To support this, rearrange processing of package, library, and import declarations to use the general modifier handling support in declaration parsing rather than special-case logic. There is an ambiguity in `impl package.Foo as Bar`, which we resolve by treating `package` as an introducer after a modifier only if it's not followed by `.`.
41 lines
1.5 KiB
C++
41 lines
1.5 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/parse/context.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
// Handles a `base` declaration after the introducer.
|
|
auto HandleBaseAfterIntroducer(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (!context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::Colon,
|
|
NodeKind::BaseColon)) {
|
|
// 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.
|
|
CARBON_DIAGNOSTIC(ExpectedAfterBase, Error,
|
|
"`class` or `:` expected after `base`.");
|
|
context.emitter().Emit(*context.position(), ExpectedAfterBase);
|
|
context.RecoverFromDeclError(state, NodeKind::BaseDecl,
|
|
/*skip_past_likely_end=*/true);
|
|
return;
|
|
}
|
|
|
|
state.state = State::BaseDecl;
|
|
context.PushState(state);
|
|
context.PushState(State::Expr);
|
|
}
|
|
|
|
// Handles processing of a complete `base: B` declaration.
|
|
auto HandleBaseDecl(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNodeExpectingDeclSemi(state, NodeKind::BaseDecl,
|
|
Lex::TokenKind::Base,
|
|
/*is_def_allowed=*/false);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|