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

Rename struct to class per #651 (#765)

Browse Source
This commit is contained in:
Jon Meow
2021-08-19 12:15:20 -07:00
committed by GitHub
parent 47325be112
commit 367f9e4e94
24 changed files with 82 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/ast/declaration.h
+8 -8
View File
@@ -9,10 +9,10 @@
#include <string>
#include "common/ostream.h"
#include "executable_semantics/ast/class_definition.h"
#include "executable_semantics/ast/function_definition.h"
#include "executable_semantics/ast/member.h"
#include "executable_semantics/ast/pattern.h"
#include "executable_semantics/ast/struct_definition.h"
#include "llvm/Support/Compiler.h"
namespace Carbon {
@@ -29,7 +29,7 @@ class Declaration {
public:
enum class Kind {
FunctionDeclaration,
StructDeclaration,
ClassDeclaration,
ChoiceDeclaration,
VariableDeclaration,
};
@@ -72,22 +72,22 @@ class FunctionDeclaration : public Declaration {
const FunctionDefinition* definition;
};
class StructDeclaration : public Declaration {
class ClassDeclaration : public Declaration {
public:
StructDeclaration(int line_num, std::string name, std::list<Member*> members)
: Declaration(Kind::StructDeclaration, line_num),
ClassDeclaration(int line_num, std::string name, std::list<Member*> members)
: Declaration(Kind::ClassDeclaration, line_num),
definition({.line_num = line_num,
.name = std::move(name),
.members = std::move(members)}) {}
static auto classof(const Declaration* decl) -> bool {
return decl->Tag() == Kind::StructDeclaration;
return decl->Tag() == Kind::ClassDeclaration;
}
auto Definition() const -> const StructDefinition& { return definition; }
auto Definition() const -> const ClassDefinition& { return definition; }
private:
StructDefinition definition;
ClassDefinition definition;
};
class ChoiceDeclaration : public Declaration {