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 "PatternVariable" names for clarity (#630)

Browse Source 
Pretty much any names will be awkward, since these types represent cases where an `Expression` is not an expression, and a `Value` is not a value, but we can at least be more explicit about the fact that they represent bindings rather than variable usages.
This commit is contained in:
Geoff Romer
2021-07-09 10:11:01 -07:00
committed by GitHub
parent 4f1b2198ff
commit b3d4c56ef2
7 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/interpreter.cpp
+9 -9
View File
@@ -124,7 +124,7 @@ auto CopyVal(const Value* val, int line_num) -> const Value* {
return Value::MakeContinuationType();
case ValKind::StructType:
case ValKind::ChoiceType:
case ValKind::PatternVariableValue:
case ValKind::BindingPlaceholderValue:
case ValKind::AlternativeConstructorValue:
return val; // no need to copy these because they are immutable?
// No, they need to be copied so they don't get killed. -Jeremy
@@ -448,10 +448,10 @@ auto PatternMatch(const Value* p, const Value* v, Env values,
std::list<std::string>* vars, int line_num)
-> std::optional<Env> {
switch (p->tag) {
case ValKind::PatternVariableValue: {
case ValKind::BindingPlaceholderValue: {
Address a = state->heap.AllocateValue(CopyVal(v, line_num));
vars->push_back(*p->GetPatternVariableValue().name);
values.Set(*p->GetPatternVariableValue().name, a);
vars->push_back(*p->GetBindingPlaceholderValue().name);
values.Set(*p->GetBindingPlaceholderValue().name, a);
return values;
}
case ValKind::TupleValue:
@@ -715,7 +715,7 @@ void StepLvalue() {
case ExpressionKind::FunctionTypeLiteral:
case ExpressionKind::AutoTypeLiteral:
case ExpressionKind::ContinuationTypeLiteral:
case ExpressionKind::PatternVariableExpression: {
case ExpressionKind::BindingExpression: {
frame->todo.Pop();
frame->todo.Push(MakeExpToLvalAct());
frame->todo.Push(MakeExpAct(exp));
@@ -735,13 +735,13 @@ void StepExp() {
std::cout << " --->" << std::endl;
}
switch (exp->tag()) {
case ExpressionKind::PatternVariableExpression: {
case ExpressionKind::BindingExpression: {
if (act->pos == 0) {
frame->todo.Push(MakeExpAct(exp->GetPatternVariableExpression().type));
frame->todo.Push(MakeExpAct(exp->GetBindingExpression().type));
act->pos++;
} else {
auto v = Value::MakePatternVariableValue(
exp->GetPatternVariableExpression().name, act->results[0]);
auto v = Value::MakeBindingPlaceholderValue(
exp->GetBindingExpression().name, act->results[0]);
frame->todo.Pop(1);
frame->todo.Push(MakeValAct(v));
}