mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-PerkinsandRichard Smith
e7aebbe581
This is a primarily automated change:
- Search & replace for capitalization
-
`(CARBON_DIAGNOSTIC\((?:\n\s+)?\w+,(?:\n\s+)?\s\w+,(?:\n\s+)?\s")([A-Z])`
- `$1\L$2`
- Search & replace for period
-
`(CARBON_DIAGNOSTIC\((?:\n\s+)?\w+,(?:\n\s+)?\s\w+,(?:\n\s+)?\s"(?:[^)]|\n)+)\.("[,)])`
- `$1$2`
- Limited search & replace for `ERROR: ` -> `error: ` in streamed things
- Leaving a TODO for command_line because there's more cleanup that can
be done there
- Modify diagnostic_consumer.cpp
- ERROR -> error
- WARNING -> warning
---------
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
92 lines
3.0 KiB
C++
92 lines
3.0 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"
|
|
#include "toolchain/parse/handle.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
auto HandleDeclNameAndParams(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto identifier = context.ConsumeIf(Lex::TokenKind::Identifier);
|
|
if (!identifier) {
|
|
Lex::TokenIndex token = *context.position();
|
|
if (context.tokens().GetKind(token) == Lex::TokenKind::FileEnd) {
|
|
// The end of file is an unhelpful diagnostic location. Instead, use the
|
|
// introducer token.
|
|
token = state.token;
|
|
}
|
|
if (state.token == *context.position()) {
|
|
CARBON_DIAGNOSTIC(ExpectedDeclNameAfterPeriod, Error,
|
|
"`.` should be followed by a name");
|
|
context.emitter().Emit(token, ExpectedDeclNameAfterPeriod);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedDeclName, Error,
|
|
"`{0}` introducer should be followed by a name",
|
|
Lex::TokenKind);
|
|
context.emitter().Emit(token, ExpectedDeclName,
|
|
context.tokens().GetKind(state.token));
|
|
}
|
|
context.ReturnErrorOnState();
|
|
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
|
|
/*has_error=*/true);
|
|
return;
|
|
}
|
|
|
|
context.AddLeafNode(NodeKind::IdentifierName, *identifier);
|
|
|
|
switch (context.PositionKind()) {
|
|
case Lex::TokenKind::Period:
|
|
context.AddNode(NodeKind::NameQualifier,
|
|
context.ConsumeChecked(Lex::TokenKind::Period),
|
|
state.has_error);
|
|
context.PushState(State::DeclNameAndParams);
|
|
break;
|
|
|
|
case Lex::TokenKind::OpenSquareBracket:
|
|
state.state = State::DeclNameAndParamsAfterImplicit;
|
|
context.PushState(state);
|
|
context.PushState(State::PatternListAsImplicit);
|
|
break;
|
|
|
|
case Lex::TokenKind::OpenParen:
|
|
state.state = State::DeclNameAndParamsAfterParams;
|
|
context.PushState(state);
|
|
context.PushState(State::PatternListAsTuple);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
auto HandleDeclNameAndParamsAfterImplicit(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::OpenParen)) {
|
|
CARBON_DIAGNOSTIC(
|
|
ParamsRequiredAfterImplicit, Error,
|
|
"a `(` for parameters is required after implicit parameters");
|
|
context.emitter().Emit(*context.position(), ParamsRequiredAfterImplicit);
|
|
context.ReturnErrorOnState();
|
|
return;
|
|
}
|
|
|
|
state.state = State::DeclNameAndParamsAfterParams;
|
|
context.PushState(state);
|
|
context.PushState(State::PatternListAsTuple);
|
|
}
|
|
|
|
auto HandleDeclNameAndParamsAfterParams(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (auto period = context.ConsumeIf(Lex::TokenKind::Period)) {
|
|
context.AddNode(NodeKind::NameQualifier, *period, state.has_error);
|
|
context.PushState(State::DeclNameAndParams);
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|