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

Handle use-before-declare in static name lookup (#967)

Browse Source 
Also remove inheritance from NamedEntity for some classes that don't need it.
This commit is contained in:
Geoff Romer
2021-12-03 13:52:31 -08:00
committed by GitHub
parent b83f00225a
commit f75b4d322f
14 changed files with 163 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/declaration.h
+5 -25
View File
@@ -21,8 +21,6 @@
namespace Carbon {
class StaticScope;
// Abstract base class of all AST nodes representing patterns.
//
// Declaration and its derived classes support LLVM-style RTTI, including
@@ -31,7 +29,7 @@ class StaticScope;
// every concrete derived class must have a corresponding enumerator
// in `Kind`; see https://llvm.org/docs/HowToSetUpLLVMStyleRTTI.html for
// details.
class Declaration : public virtual AstNode, public NamedEntity {
class Declaration : public virtual AstNode {
public:
~Declaration() override = 0;
@@ -177,7 +175,7 @@ class ReturnTerm {
SourceLocation source_loc_;
};
class FunctionDeclaration : public Declaration {
class FunctionDeclaration : public Declaration, public NamedEntity {
public:
FunctionDeclaration(SourceLocation source_loc, std::string name,
std::vector<Nonnull<GenericBinding*>> deduced_params,
@@ -212,20 +210,15 @@ class FunctionDeclaration : public Declaration {
auto body() const -> std::optional<Nonnull<const Block*>> { return body_; }
auto body() -> std::optional<Nonnull<Block*>> { return body_; }
// Only contains function parameters. Scoped variables are in the body.
auto static_scope() const -> const StaticScope& { return static_scope_; }
auto static_scope() -> StaticScope& { return static_scope_; }
private:
std::string name_;
std::vector<Nonnull<GenericBinding*>> deduced_parameters_;
Nonnull<TuplePattern*> param_pattern_;
ReturnTerm return_term_;
std::optional<Nonnull<Block*>> body_;
StaticScope static_scope_;
};
class ClassDeclaration : public Declaration {
class ClassDeclaration : public Declaration, public NamedEntity {
public:
ClassDeclaration(SourceLocation source_loc, std::string name,
std::vector<Nonnull<Member*>> members)
@@ -240,17 +233,12 @@ class ClassDeclaration : public Declaration {
auto name() const -> const std::string& { return name_; }
auto members() const -> llvm::ArrayRef<Nonnull<Member*>> { return members_; }
// Contains class members. Scoped variables are in the body.
auto static_scope() const -> const StaticScope& { return static_scope_; }
auto static_scope() -> StaticScope& { return static_scope_; }
private:
std::string name_;
std::vector<Nonnull<Member*>> members_;
StaticScope static_scope_;
};
class AlternativeSignature : public virtual AstNode, public NamedEntity {
class AlternativeSignature : public virtual AstNode {
public:
AlternativeSignature(SourceLocation source_loc, std::string name,
Nonnull<Expression*> signature)
@@ -273,7 +261,7 @@ class AlternativeSignature : public virtual AstNode, public NamedEntity {
Nonnull<Expression*> signature_;
};
class ChoiceDeclaration : public Declaration {
class ChoiceDeclaration : public Declaration, public NamedEntity {
public:
ChoiceDeclaration(SourceLocation source_loc, std::string name,
std::vector<Nonnull<AlternativeSignature*>> alternatives)
@@ -294,20 +282,12 @@ class ChoiceDeclaration : public Declaration {
return alternatives_;
}
// Contains the alternatives.
auto static_scope() const -> const StaticScope& { return static_scope_; }
auto static_scope() -> StaticScope& { return static_scope_; }
private:
std::string name_;
std::vector<Nonnull<AlternativeSignature*>> alternatives_;
StaticScope static_scope_;
};
// Global variable definition implements the Declaration concept.
//
// TODO: this should not inherit from NamedEntity, because names should
// always resolve to the underlying binding, not the VariableDeclaration.
class VariableDeclaration : public Declaration {
public:
VariableDeclaration(SourceLocation source_loc,