mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-03 18:25:49 +01:00
Rename some classes to match the design better (#1287)
* `FieldAccessExpression` -> `SimpleMemberAccessExpression`
* Member `aggregate` -> `object`
* Member `field` -> `member`
* `CompoundFieldAccessExpression` -> `CompoundMemberAccessExpression`
* `GetField` -> `GetMember`
As discussed in #1233.
This commit is contained in:
@@ -141,13 +141,14 @@ auto TuplePatternFromParenContents(Nonnull<Arena*> arena,
|
||||
// Used by AlternativePattern for constructor initialization. Produces a helpful
|
||||
// error for incorrect expressions, rather than letting a default cast error
|
||||
// apply.
|
||||
auto AlternativePattern::RequireFieldAccess(Nonnull<Expression*> alternative)
|
||||
-> ErrorOr<Nonnull<FieldAccessExpression*>> {
|
||||
if (alternative->kind() != ExpressionKind::FieldAccessExpression) {
|
||||
auto AlternativePattern::RequireSimpleMemberAccess(
|
||||
Nonnull<Expression*> alternative)
|
||||
-> ErrorOr<Nonnull<SimpleMemberAccessExpression*>> {
|
||||
if (alternative->kind() != ExpressionKind::SimpleMemberAccessExpression) {
|
||||
return ProgramError(alternative->source_loc())
|
||||
<< "Alternative pattern must have the form of a field access.";
|
||||
}
|
||||
return &cast<FieldAccessExpression>(*alternative);
|
||||
return &cast<SimpleMemberAccessExpression>(*alternative);
|
||||
}
|
||||
|
||||
auto ParenExpressionToParenPattern(Nonnull<Arena*> arena,
|
||||
|
||||
Reference in New Issue
Block a user