mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 02:58:11 +00:00
Continuing on #3070. I moved ParseTree::Node to just Parse::Node, versus Parse::Tree::Node. Other name changes are just removing "Parse" or "Parser" prefixes. In EnumBase, I'm directly defining operator<< because the ostream.h approach just isn't working, not for either of Parse::State nor Parse::NodeKind. Errors look like: ```toolchain/parser/parser_context.cpp:449:34: error: invalid operands to binary expression ('llvm::raw_ostream' and 'const Carbon::Parse::State') output << "\t" << i << ".\t" << entry.state; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~ ``` The expected template in `Carbon::` is not in the error list; I only see the: ``` ./common/ostream.h:112:6: note: candidate template ignored: requirement 'std::is_base_of_v<std::ostream, llvm::raw_ostream>' was not satisfied [with S = llvm::raw_ostream, T = Carbon::Parse::State] auto operator<<(S& standard_out, const T& value) -> S& { ^ ``` I'm still prodding at this, but not seeing an obvious fix. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
89 lines
3.1 KiB
C++
89 lines
3.1 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/parser/parser_context.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
auto HandlePackage(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddLeafNode(NodeKind::PackageIntroducer, context.Consume());
|
|
|
|
auto exit_on_parse_error = [&]() {
|
|
auto semi_token = context.SkipPastLikelyEnd(state.token);
|
|
return context.AddNode(NodeKind::PackageDirective,
|
|
semi_token ? *semi_token : state.token,
|
|
state.subtree_start,
|
|
/*has_error=*/true);
|
|
};
|
|
|
|
if (!context.ConsumeAndAddLeafNodeIf(TokenKind::Identifier, NodeKind::Name)) {
|
|
CARBON_DIAGNOSTIC(ExpectedIdentifierAfterPackage, Error,
|
|
"Expected identifier after `package`.");
|
|
context.emitter().Emit(*context.position(), ExpectedIdentifierAfterPackage);
|
|
exit_on_parse_error();
|
|
return;
|
|
}
|
|
|
|
bool library_parsed = false;
|
|
if (auto library_token = context.ConsumeIf(TokenKind::Library)) {
|
|
auto library_start = context.tree().size();
|
|
|
|
if (!context.ConsumeAndAddLeafNodeIf(TokenKind::StringLiteral,
|
|
NodeKind::Literal)) {
|
|
CARBON_DIAGNOSTIC(
|
|
ExpectedLibraryName, Error,
|
|
"Expected a string literal to specify the library name.");
|
|
context.emitter().Emit(*context.position(), ExpectedLibraryName);
|
|
exit_on_parse_error();
|
|
return;
|
|
}
|
|
|
|
context.AddNode(NodeKind::PackageLibrary, *library_token, library_start,
|
|
/*has_error=*/false);
|
|
library_parsed = true;
|
|
}
|
|
|
|
switch (auto api_or_impl_token =
|
|
context.tokens().GetKind(*(context.position()))) {
|
|
case TokenKind::Api: {
|
|
context.AddLeafNode(NodeKind::PackageApi, context.Consume());
|
|
break;
|
|
}
|
|
case TokenKind::Impl: {
|
|
context.AddLeafNode(NodeKind::PackageImpl, context.Consume());
|
|
break;
|
|
}
|
|
default: {
|
|
if (!library_parsed && api_or_impl_token == TokenKind::StringLiteral) {
|
|
// If we come acroess a string literal and we didn't parse `library
|
|
// "..."` yet, then most probably the user forgot to add `library`
|
|
// before the library name.
|
|
CARBON_DIAGNOSTIC(MissingLibraryKeyword, Error,
|
|
"Missing `library` keyword.");
|
|
context.emitter().Emit(*context.position(), MissingLibraryKeyword);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedApiOrImpl, Error,
|
|
"Expected a `api` or `impl`.");
|
|
context.emitter().Emit(*context.position(), ExpectedApiOrImpl);
|
|
}
|
|
exit_on_parse_error();
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (!context.PositionIs(TokenKind::Semi)) {
|
|
context.EmitExpectedDeclarationSemi(TokenKind::Package);
|
|
exit_on_parse_error();
|
|
return;
|
|
}
|
|
|
|
context.AddNode(NodeKind::PackageDirective, context.Consume(),
|
|
state.subtree_start,
|
|
/*has_error=*/false);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|