carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 20:42:01 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Abbreviate "parameter" -> "param" (#3392)

Browse Source 
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:
josh11b
2023-11-13 19:06:54 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent 522dcc44c5
commit c53b248800
142 changed files with 614 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_brace_expr.cpp
+51 -58
View File
@@ -16,18 +16,17 @@ auto HandleBraceExpr(Context& context) -> void {
Lex::TokenKind::OpenCurlyBrace,
NodeKind::StructLiteralOrStructTypeLiteralStart));
if (!context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
context.PushState(State::BraceExprParameterAsUnknown);
context.PushState(State::BraceExprParamAsUnknown);
}
}
// Prints a diagnostic for brace expression syntax errors.
static auto HandleBraceExprParameterError(Context& context,
Context::StateStackEntry state,
State param_finish_state) -> void {
bool is_type = param_finish_state == State::BraceExprParameterFinishAsType;
bool is_value = param_finish_state == State::BraceExprParameterFinishAsValue;
bool is_unknown =
param_finish_state == State::BraceExprParameterFinishAsUnknown;
static auto HandleBraceExprParamError(Context& context,
Context::StateStackEntry state,
State param_finish_state) -> void {
bool is_type = param_finish_state == State::BraceExprParamFinishAsType;
bool is_value = param_finish_state == State::BraceExprParamFinishAsValue;
bool is_unknown = param_finish_state == State::BraceExprParamFinishAsUnknown;
CARBON_CHECK(is_type || is_value || is_unknown);
CARBON_DIAGNOSTIC(ExpectedStructLiteralField, Error, "Expected {0}{1}{2}.",
llvm::StringRef, llvm::StringRef, llvm::StringRef);
@@ -41,14 +40,13 @@ static auto HandleBraceExprParameterError(Context& context,
context.PushState(state);
}
// Handles BraceExprParameterAs(Type|Value|Unknown).
static auto HandleBraceExprParameter(Context& context,
State after_designator_state,
State param_finish_state) -> void {
// Handles BraceExprParamAs(Type|Value|Unknown).
static auto HandleBraceExprParam(Context& context, State after_designator_state,
State param_finish_state) -> void {
auto state = context.PopState();
if (!context.PositionIs(Lex::TokenKind::Period)) {
HandleBraceExprParameterError(context, state, param_finish_state);
HandleBraceExprParamError(context, state, param_finish_state);
return;
}
@@ -57,27 +55,24 @@ static auto HandleBraceExprParameter(Context& context,
context.PushState(State::PeriodAsStruct);
}
auto HandleBraceExprParameterAsType(Context& context) -> void {
HandleBraceExprParameter(context,
State::BraceExprParameterAfterDesignatorAsType,
State::BraceExprParameterFinishAsType);
auto HandleBraceExprParamAsType(Context& context) -> void {
HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsType,
State::BraceExprParamFinishAsType);
}
auto HandleBraceExprParameterAsValue(Context& context) -> void {
HandleBraceExprParameter(context,
State::BraceExprParameterAfterDesignatorAsValue,
State::BraceExprParameterFinishAsValue);
auto HandleBraceExprParamAsValue(Context& context) -> void {
HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsValue,
State::BraceExprParamFinishAsValue);
}
auto HandleBraceExprParameterAsUnknown(Context& context) -> void {
HandleBraceExprParameter(context,
State::BraceExprParameterAfterDesignatorAsUnknown,
State::BraceExprParameterFinishAsUnknown);
auto HandleBraceExprParamAsUnknown(Context& context) -> void {
HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsUnknown,
State::BraceExprParamFinishAsUnknown);
}
// Handles BraceExprParameterAfterDesignatorAs(Type|Value|Unknown).
static auto HandleBraceExprParameterAfterDesignator(Context& context,
State param_finish_state)
// Handles BraceExprParamAfterDesignatorAs(Type|Value|Unknown).
static auto HandleBraceExprParamAfterDesignator(Context& context,
State param_finish_state)
-> void {
auto state = context.PopState();
@@ -100,29 +95,28 @@ static auto HandleBraceExprParameterAfterDesignator(Context& context,
} else if (context.PositionIs(Lex::TokenKind::Equal)) {
is_type = false;
} else {
HandleBraceExprParameterError(context, state, param_finish_state);
HandleBraceExprParamError(context, state, param_finish_state);
return;
}
// If we're changing from unknown, update the related finish states.
if (param_finish_state == State::BraceExprParameterFinishAsUnknown) {
if (param_finish_state == State::BraceExprParamFinishAsUnknown) {
auto finish_state = context.PopState();
CARBON_CHECK(finish_state.state == State::BraceExprFinishAsUnknown);
if (is_type) {
finish_state.state = State::BraceExprFinishAsType;
param_finish_state = State::BraceExprParameterFinishAsType;
param_finish_state = State::BraceExprParamFinishAsType;
} else {
finish_state.state = State::BraceExprFinishAsValue;
param_finish_state = State::BraceExprParameterFinishAsValue;
param_finish_state = State::BraceExprParamFinishAsValue;
}
context.PushState(finish_state);
}
auto want_param_finish_state = is_type
? State::BraceExprParameterFinishAsType
: State::BraceExprParameterFinishAsValue;
auto want_param_finish_state = is_type ? State::BraceExprParamFinishAsType
: State::BraceExprParamFinishAsValue;
if (param_finish_state != want_param_finish_state) {
HandleBraceExprParameterError(context, state, param_finish_state);
HandleBraceExprParamError(context, state, param_finish_state);
return;
}
@@ -134,25 +128,24 @@ static auto HandleBraceExprParameterAfterDesignator(Context& context,
context.PushState(State::Expr);
}
auto HandleBraceExprParameterAfterDesignatorAsType(Context& context) -> void {
HandleBraceExprParameterAfterDesignator(
context, State::BraceExprParameterFinishAsType);
auto HandleBraceExprParamAfterDesignatorAsType(Context& context) -> void {
HandleBraceExprParamAfterDesignator(context,
State::BraceExprParamFinishAsType);
}
auto HandleBraceExprParameterAfterDesignatorAsValue(Context& context) -> void {
HandleBraceExprParameterAfterDesignator(
context, State::BraceExprParameterFinishAsValue);
auto HandleBraceExprParamAfterDesignatorAsValue(Context& context) -> void {
HandleBraceExprParamAfterDesignator(context,
State::BraceExprParamFinishAsValue);
}
auto HandleBraceExprParameterAfterDesignatorAsUnknown(Context& context)
-> void {
HandleBraceExprParameterAfterDesignator(
context, State::BraceExprParameterFinishAsUnknown);
auto HandleBraceExprParamAfterDesignatorAsUnknown(Context& context) -> void {
HandleBraceExprParamAfterDesignator(context,
State::BraceExprParamFinishAsUnknown);
}
// Handles BraceExprParameterFinishAs(Type|Value|Unknown).
static auto HandleBraceExprParameterFinish(Context& context, NodeKind node_kind,
State param_state) -> void {
// Handles BraceExprParamFinishAs(Type|Value|Unknown).
static auto HandleBraceExprParamFinish(Context& context, NodeKind node_kind,
State param_state) -> void {
auto state = context.PopState();
if (state.has_error) {
@@ -170,19 +163,19 @@ static auto HandleBraceExprParameterFinish(Context& context, NodeKind node_kind,
}
}
auto HandleBraceExprParameterFinishAsType(Context& context) -> void {
HandleBraceExprParameterFinish(context, NodeKind::StructFieldType,
State::BraceExprParameterAsType);
auto HandleBraceExprParamFinishAsType(Context& context) -> void {
HandleBraceExprParamFinish(context, NodeKind::StructFieldType,
State::BraceExprParamAsType);
}
auto HandleBraceExprParameterFinishAsValue(Context& context) -> void {
HandleBraceExprParameterFinish(context, NodeKind::StructFieldValue,
State::BraceExprParameterAsValue);
auto HandleBraceExprParamFinishAsValue(Context& context) -> void {
HandleBraceExprParamFinish(context, NodeKind::StructFieldValue,
State::BraceExprParamAsValue);
}
auto HandleBraceExprParameterFinishAsUnknown(Context& context) -> void {
HandleBraceExprParameterFinish(context, NodeKind::StructFieldUnknown,
State::BraceExprParameterAsUnknown);
auto HandleBraceExprParamFinishAsUnknown(Context& context) -> void {
HandleBraceExprParamFinish(context, NodeKind::StructFieldUnknown,
State::BraceExprParamAsUnknown);
}
// Handles BraceExprFinishAs(Type|Value|Unknown).