carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-29 09:44:56 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Refactor Expression to use std::variant instead of a union (#586)

Browse Source
This commit is contained in:
Geoff Romer
2021-06-22 12:19:49 -07:00
committed by GitHub
parent 0a7895e218
commit 1916258e9b
5 changed files with 131 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/interpreter.cpp
+4 -4
View File
@@ -619,7 +619,7 @@ void StepLvalue() {
PrintExp(exp);
std::cout << " --->" << std::endl;
}
switch (exp->tag) {
switch (exp->tag()) {
case ExpressionKind::Variable: {
// { {x :: C, E, F} :: S, H}
// -> { {E(x) :: C, E, F} :: S, H}
@@ -686,7 +686,7 @@ void StepExp() {
PrintExp(exp);
std::cout << " --->" << std::endl;
}
switch (exp->tag) {
switch (exp->tag()) {
case ExpressionKind::PatternVariable: {
frame->todo.Push(MakeExpAct(exp->GetPatternVariable().type));
act->pos++;
@@ -1076,7 +1076,7 @@ void HandleValue() {
}
case ActionKind::LValAction: {
const Expression* exp = act->u.exp;
switch (exp->tag) {
switch (exp->tag()) {
case ExpressionKind::GetField: {
// { v :: [].f :: C, E, F} :: S, H}
// -> { { &v.f :: C, E, F} :: S, H }
@@ -1133,7 +1133,7 @@ void HandleValue() {
}
case ActionKind::ExpressionAction: {
const Expression* exp = act->u.exp;
switch (exp->tag) {
switch (exp->tag()) {
case ExpressionKind::PatternVariable: {
auto v = Value::MakeVarPatVal(*exp->GetPatternVariable().name,
act->results[0]);