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

Refactor name property into FunctionDeclaration (#2555)

Browse Source 
As per the `TODO` comment in the file, the `CallableDeclaration::name` property was refactored into `FunctionDeclaration`, which is currently the only namable callable declaration kind. I was able to rely on the existing `GetName` function to replace call sites of the accessor function with nearly identical swaps.

Fixes #2531
This commit is contained in:
Calvin
2023-01-28 12:00:49 -08:00
committed by GitHub
parent a89aba2698
commit 981427588b
5 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/ast/declaration.cpp
+5 -3
View File
@@ -156,7 +156,7 @@ void Declaration::PrintID(llvm::raw_ostream& out) const {
out << "fn " << cast<FunctionDeclaration>(*this).name();
break;
case DeclarationKind::DestructorDeclaration:
out << cast<DestructorDeclaration>(*this).name();
out << *GetName(*this);
break;
case DeclarationKind::ClassDeclaration: {
const auto& class_decl = cast<ClassDeclaration>(*this);
@@ -224,7 +224,7 @@ auto GetName(const Declaration& declaration)
case DeclarationKind::FunctionDeclaration:
return cast<FunctionDeclaration>(declaration).name();
case DeclarationKind::DestructorDeclaration:
return cast<DestructorDeclaration>(declaration).name();
return "destructor";
case DeclarationKind::ClassDeclaration:
return cast<ClassDeclaration>(declaration).name();
case DeclarationKind::MixinDeclaration: {
@@ -368,7 +368,9 @@ auto FunctionDeclaration::Create(Nonnull<Arena*> arena,
}
void CallableDeclaration::PrintDepth(int depth, llvm::raw_ostream& out) const {
out << "fn " << name_ << " ";
auto name = GetName(*this);
CARBON_CHECK(name) << "Unexpected missing name for `" << *this << "`.";
out << "fn " << *name << " ";
if (!deduced_parameters_.empty()) {
out << "[";
llvm::ListSeparator sep;