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>
76 lines
2.8 KiB
C++
76 lines
2.8 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/check/name_component.h"
|
|
|
|
#include "toolchain/check/context.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto PopNameComponent(Context& context) -> NameComponent {
|
|
Parse::NodeId first_param_node_id = Parse::InvalidNodeId();
|
|
Parse::NodeId last_param_node_id = Parse::InvalidNodeId();
|
|
|
|
// Explicit params.
|
|
auto [params_loc_id, params_id] =
|
|
context.node_stack().PopWithNodeIdIf<Parse::NodeKind::TuplePattern>();
|
|
if (params_id) {
|
|
first_param_node_id =
|
|
context.node_stack()
|
|
.PopForSoloNodeId<Parse::NodeKind::TuplePatternStart>();
|
|
last_param_node_id = params_loc_id;
|
|
}
|
|
|
|
// Implicit params.
|
|
auto [implicit_params_loc_id, implicit_params_id] =
|
|
context.node_stack()
|
|
.PopWithNodeIdIf<Parse::NodeKind::ImplicitParamList>();
|
|
if (implicit_params_id) {
|
|
// Implicit params always come before explicit params.
|
|
first_param_node_id =
|
|
context.node_stack()
|
|
.PopForSoloNodeId<Parse::NodeKind::ImplicitParamListStart>();
|
|
// Only use the end of implicit params if there weren't explicit params.
|
|
if (last_param_node_id.is_valid()) {
|
|
last_param_node_id = params_loc_id;
|
|
}
|
|
}
|
|
|
|
auto [name_loc_id, name_id] = context.node_stack().PopNameWithNodeId();
|
|
return {
|
|
.name_loc_id = name_loc_id,
|
|
.name_id = name_id,
|
|
.first_param_node_id = first_param_node_id,
|
|
.last_param_node_id = last_param_node_id,
|
|
.implicit_params_loc_id = implicit_params_loc_id,
|
|
.implicit_params_id =
|
|
implicit_params_id.value_or(SemIR::InstBlockId::Invalid),
|
|
.params_loc_id = params_loc_id,
|
|
.params_id = params_id.value_or(SemIR::InstBlockId::Invalid),
|
|
};
|
|
}
|
|
|
|
// Pop the name of a declaration from the node stack, and diagnose if it has
|
|
// parameters.
|
|
auto PopNameComponentWithoutParams(Context& context, Lex::TokenKind introducer)
|
|
-> NameComponent {
|
|
NameComponent name = PopNameComponent(context);
|
|
if (name.implicit_params_id.is_valid() || name.params_id.is_valid()) {
|
|
CARBON_DIAGNOSTIC(UnexpectedDeclNameParams, Error,
|
|
"`{0}` declaration cannot have parameters",
|
|
Lex::TokenKind);
|
|
// Point to the lexically first parameter list in the diagnostic.
|
|
context.emitter().Emit(name.implicit_params_id.is_valid()
|
|
? name.implicit_params_loc_id
|
|
: name.params_loc_id,
|
|
UnexpectedDeclNameParams, introducer);
|
|
|
|
name.implicit_params_id = SemIR::InstBlockId::Invalid;
|
|
name.params_id = SemIR::InstBlockId::Invalid;
|
|
}
|
|
return name;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|