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

Switch Member to use inheritance+cast (#713)

Browse Source
This commit is contained in:
Jon Meow
2021-08-06 15:27:31 -07:00
committed by GitHub
parent 6164cdfd6d
commit 4e0307efbc
5 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/interpreter.cpp
+3 -3
View File
@@ -132,9 +132,9 @@ void InitEnv(const Declaration& d, Env* env) {
VarValues fields;
VarValues methods;
for (const Member* m : struct_def.members) {
switch (m->tag()) {
case MemberKind::FieldMember: {
const BindingPattern* binding = m->GetFieldMember().binding;
switch (m->Tag()) {
case Member::Kind::FieldMember: {
const BindingPattern* binding = cast<FieldMember>(*m).Binding();
const Expression* type_expression =
cast<ExpressionPattern>(binding->Type())->Expression();
auto type = InterpExp(Env(), type_expression);
executable_semantics/interpreter/typecheck.cpp
+5 -5
View File
@@ -896,9 +896,9 @@ static auto TypeOfStructDef(const StructDefinition* sd, TypeEnv /*types*/,
VarValues fields;
VarValues methods;
for (const Member* m : sd->members) {
switch (m->tag()) {
case MemberKind::FieldMember: {
const BindingPattern* binding = m->GetFieldMember().binding;
switch (m->Tag()) {
case Member::Kind::FieldMember: {
const BindingPattern* binding = cast<FieldMember>(*m).Binding();
if (!binding->Name().has_value()) {
FATAL_COMPILATION_ERROR(binding->LineNumber())
<< "Struct members must have names";
@@ -950,8 +950,8 @@ auto MakeTypeChecked(const Declaration& d, const TypeEnv& types,
cast<StructDeclaration>(d).Definition();
std::list<Member*> fields;
for (Member* m : struct_def.members) {
switch (m->tag()) {
case MemberKind::FieldMember:
switch (m->Tag()) {
case Member::Kind::FieldMember:
// TODO: Interpret the type expression and store the result.
fields.push_back(m);
break;