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

Make NamedEntityInterface non-movable (#946)

Browse Source
This commit is contained in:
Geoff Romer
2021-11-10 09:33:00 -08:00
committed by GitHub
parent e8d9b7675b
commit a9bb06ca14
10 changed files with 82 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/declaration.cpp
+6 -5
View File
@@ -29,8 +29,9 @@ void Declaration::Print(llvm::raw_ostream& out) const {
case Kind::ChoiceDeclaration: {
const auto& choice = cast<ChoiceDeclaration>(*this);
out << "choice " << choice.name() << " {\n";
for (const auto& alt : choice.alternatives()) {
out << "alt " << alt.name() << " " << alt.signature() << ";\n";
for (Nonnull<const ChoiceDeclaration::Alternative*> alt :
choice.alternatives()) {
out << "alt " << alt->name() << " " << alt->signature() << ";\n";
}
out << "}\n";
break;
@@ -49,12 +50,12 @@ void FunctionDeclaration::PrintDepth(int depth, llvm::raw_ostream& out) const {
if (!deduced_parameters_.empty()) {
out << "[";
unsigned int i = 0;
for (const auto& deduced : deduced_parameters_) {
for (Nonnull<const GenericBinding*> deduced : deduced_parameters_) {
if (i != 0) {
out << ", ";
}
out << deduced.name() << ":! ";
deduced.type().Print(out);
out << deduced->name() << ":! ";
deduced->type().Print(out);
++i;
}
out << "]";
executable_semantics/ast/declaration.h
+7 -6
View File
@@ -107,7 +107,7 @@ struct GenericBinding : public NamedEntityInterface {
class FunctionDeclaration : public Declaration {
public:
FunctionDeclaration(SourceLocation source_loc, std::string name,
std::vector<GenericBinding> deduced_params,
std::vector<Nonnull<GenericBinding*>> deduced_params,
Nonnull<TuplePattern*> param_pattern,
Nonnull<Pattern*> return_type,
bool is_omitted_return_type,
@@ -127,7 +127,8 @@ class FunctionDeclaration : public Declaration {
void PrintDepth(int depth, llvm::raw_ostream& out) const;
auto name() const -> const std::string& { return name_; }
auto deduced_parameters() const -> llvm::ArrayRef<GenericBinding> {
auto deduced_parameters() const
-> llvm::ArrayRef<Nonnull<const GenericBinding*>> {
return deduced_parameters_;
}
auto param_pattern() const -> const TuplePattern& { return *param_pattern_; }
@@ -146,7 +147,7 @@ class FunctionDeclaration : public Declaration {
private:
std::string name_;
std::vector<GenericBinding> deduced_parameters_;
std::vector<Nonnull<GenericBinding*>> deduced_parameters_;
Nonnull<TuplePattern*> param_pattern_;
Nonnull<Pattern*> return_type_;
bool is_omitted_return_type_;
@@ -204,7 +205,7 @@ class ChoiceDeclaration : public Declaration {
};
ChoiceDeclaration(SourceLocation source_loc, std::string name,
std::vector<Alternative> alternatives)
std::vector<Nonnull<Alternative*>> alternatives)
: Declaration(Kind::ChoiceDeclaration, source_loc),
name_(std::move(name)),
alternatives_(std::move(alternatives)) {}
@@ -214,7 +215,7 @@ class ChoiceDeclaration : public Declaration {
}
auto name() const -> const std::string& { return name_; }
auto alternatives() const -> llvm::ArrayRef<Alternative> {
auto alternatives() const -> llvm::ArrayRef<Nonnull<const Alternative*>> {
return alternatives_;
}
@@ -224,7 +225,7 @@ class ChoiceDeclaration : public Declaration {
private:
std::string name_;
std::vector<Alternative> alternatives_;
std::vector<Nonnull<Alternative*>> alternatives_;
StaticScope static_scope_;
};
executable_semantics/ast/static_scope.h
+5
View File
@@ -33,7 +33,12 @@ class NamedEntityInterface {
Member,
};
NamedEntityInterface() = default;
virtual ~NamedEntityInterface() = default;
NamedEntityInterface(NamedEntityInterface&&) = delete;
auto operator=(NamedEntityInterface&&) -> NamedEntityInterface& = delete;
// TODO: This is unused, but is intended for casts after lookup.
virtual auto named_entity_kind() const -> NamedEntityKind = 0;
virtual auto source_loc() const -> SourceLocation = 0;