mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-06 07:54:41 +01:00
Abbreviate "parameter" -> "param" (#3392)
Part of switching to the [abbreviations we've decided to use](https://docs.google.com/document/d/1RRYMm42osyqhI2LyjrjockYCutQ5dOf8Abu50kTrkX0/edit?resourcekey=0-kHyqOESbOHmzZphUbtLrTw#heading=h.pph7i5m5un7q). I will rename files in a follow-up PR. --------- Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
co-authored by
Jon Ross-Perkins
parent
522dcc44c5
commit
c53b248800
@@ -80,13 +80,13 @@ static auto HandleDeclNameAndParamsAfterName(Context& context, Params params)
|
||||
|
||||
if (context.PositionIs(Lex::TokenKind::OpenSquareBracket)) {
|
||||
context.PushState(State::DeclNameAndParamsAfterImplicit);
|
||||
context.PushState(State::ParameterListAsImplicit);
|
||||
context.PushState(State::ParamListAsImplicit);
|
||||
} else if (context.PositionIs(Lex::TokenKind::OpenParen)) {
|
||||
context.PushState(State::ParameterListAsRegular);
|
||||
context.PushState(State::ParamListAsRegular);
|
||||
} else if (params == Params::Required) {
|
||||
CARBON_DIAGNOSTIC(ParametersRequiredByIntroducer, Error,
|
||||
CARBON_DIAGNOSTIC(ParamsRequiredByIntroducer, Error,
|
||||
"`{0}` requires a `(` for parameters.", Lex::TokenKind);
|
||||
context.emitter().Emit(*context.position(), ParametersRequiredByIntroducer,
|
||||
context.emitter().Emit(*context.position(), ParamsRequiredByIntroducer,
|
||||
context.tokens().GetKind(state.token));
|
||||
context.ReturnErrorOnState();
|
||||
}
|
||||
@@ -108,13 +108,12 @@ auto HandleDeclNameAndParamsAfterImplicit(Context& context) -> void {
|
||||
context.PopAndDiscardState();
|
||||
|
||||
if (context.PositionIs(Lex::TokenKind::OpenParen)) {
|
||||
context.PushState(State::ParameterListAsRegular);
|
||||
context.PushState(State::ParamListAsRegular);
|
||||
} else {
|
||||
CARBON_DIAGNOSTIC(
|
||||
ParametersRequiredAfterImplicit, Error,
|
||||
ParamsRequiredAfterImplicit, Error,
|
||||
"A `(` for parameters is required after implicit parameters.");
|
||||
context.emitter().Emit(*context.position(),
|
||||
ParametersRequiredAfterImplicit);
|
||||
context.emitter().Emit(*context.position(), ParamsRequiredAfterImplicit);
|
||||
context.ReturnErrorOnState();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user