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

Use abbreviation "decl" instead of "declaration" (#3382)

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.
This commit is contained in:
josh11b
2023-11-10 10:43:25 +00:00
committed by GitHub
parent 11ca083855
commit 5020fdb3be
229 changed files with 565 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/context.cpp
+20 -22
View File
@@ -391,33 +391,33 @@ auto Context::ConsumeListToken(NodeKind comma_kind, Lex::TokenKind close_kind,
}
}
auto Context::GetDeclarationContext() -> DeclarationContext {
// i == 0 is the file-level DeclarationScopeLoop. Additionally, i == 1 can be
// skipped because it will never be a DeclarationScopeLoop.
auto Context::GetDeclContext() -> DeclContext {
// i == 0 is the file-level DeclScopeLoop. Additionally, i == 1 can be
// skipped because it will never be a DeclScopeLoop.
for (int i = state_stack_.size() - 1; i > 1; --i) {
// The declaration context is always the state _above_ a
// DeclarationScopeLoop.
if (state_stack_[i].state == State::DeclarationScopeLoop) {
// DeclScopeLoop.
if (state_stack_[i].state == State::DeclScopeLoop) {
switch (state_stack_[i - 1].state) {
case State::TypeDefinitionFinishAsClass:
return DeclarationContext::Class;
return DeclContext::Class;
case State::TypeDefinitionFinishAsInterface:
return DeclarationContext::Interface;
return DeclContext::Interface;
case State::TypeDefinitionFinishAsNamedConstraint:
return DeclarationContext::NamedConstraint;
return DeclContext::NamedConstraint;
default:
llvm_unreachable("Missing handling for a declaration scope");
}
}
}
CARBON_CHECK(!state_stack_.empty() &&
state_stack_[0].state == State::DeclarationScopeLoop);
return DeclarationContext::File;
state_stack_[0].state == State::DeclScopeLoop);
return DeclContext::File;
}
auto Context::RecoverFromDeclarationError(StateStackEntry state,
NodeKind parse_node_kind,
bool skip_past_likely_end) -> void {
auto Context::RecoverFromDeclError(StateStackEntry state,
NodeKind parse_node_kind,
bool skip_past_likely_end) -> void {
auto token = state.token;
if (skip_past_likely_end) {
if (auto semi = SkipPastLikelyEnd(token)) {
@@ -428,21 +428,19 @@ auto Context::RecoverFromDeclarationError(StateStackEntry state,
/*has_error=*/true);
}
auto Context::EmitExpectedDeclarationSemi(Lex::TokenKind expected_kind)
-> void {
CARBON_DIAGNOSTIC(ExpectedDeclarationSemi, Error,
auto Context::EmitExpectedDeclSemi(Lex::TokenKind expected_kind) -> void {
CARBON_DIAGNOSTIC(ExpectedDeclSemi, Error,
"`{0}` declarations must end with a `;`.", Lex::TokenKind);
emitter().Emit(*position(), ExpectedDeclarationSemi, expected_kind);
emitter().Emit(*position(), ExpectedDeclSemi, expected_kind);
}
auto Context::EmitExpectedDeclarationSemiOrDefinition(
Lex::TokenKind expected_kind) -> void {
CARBON_DIAGNOSTIC(ExpectedDeclarationSemiOrDefinition, Error,
auto Context::EmitExpectedDeclSemiOrDefinition(Lex::TokenKind expected_kind)
-> void {
CARBON_DIAGNOSTIC(ExpectedDeclSemiOrDefinition, Error,
"`{0}` declarations must either end with a `;` or "
"have a `{{ ... }` block for a definition.",
Lex::TokenKind);
emitter().Emit(*position(), ExpectedDeclarationSemiOrDefinition,
expected_kind);
emitter().Emit(*position(), ExpectedDeclSemiOrDefinition, expected_kind);
}
auto Context::PrintForStackDump(llvm::raw_ostream& output) const -> void {