mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
[CS] NFC: Rename PackEnvironments -> PackElementExpansions
IMO "environment" is confusable for GenericEnvironment, make it clearer it's referring to the parent PackExpansionExpr.
This commit is contained in:
@@ -191,10 +191,10 @@ SolverTrail::Change::RecordedOpenedPackExpansionType(PackExpansionType *expansio
|
||||
return result;
|
||||
}
|
||||
|
||||
SolverTrail::Change
|
||||
SolverTrail::Change::RecordedPackEnvironment(PackElementExpr *packElement) {
|
||||
SolverTrail::Change SolverTrail::Change::RecordedPackElementExpansion(
|
||||
PackElementExpr *packElement) {
|
||||
Change result;
|
||||
result.Kind = ChangeKind::RecordedPackEnvironment;
|
||||
result.Kind = ChangeKind::RecordedPackElementExpansion;
|
||||
result.TheElement = packElement;
|
||||
return result;
|
||||
}
|
||||
@@ -426,8 +426,8 @@ void SolverTrail::Change::undo(ConstraintSystem &cs) const {
|
||||
cs.removeOpenedPackExpansionType(TheExpansion);
|
||||
break;
|
||||
|
||||
case ChangeKind::RecordedPackEnvironment:
|
||||
cs.removePackEnvironment(TheElement);
|
||||
case ChangeKind::RecordedPackElementExpansion:
|
||||
cs.removePackElementExpansion(TheElement);
|
||||
break;
|
||||
|
||||
case ChangeKind::RecordedNodeType:
|
||||
@@ -694,9 +694,9 @@ void SolverTrail::Change::dump(llvm::raw_ostream &out,
|
||||
out << ")\n";
|
||||
break;
|
||||
|
||||
case ChangeKind::RecordedPackEnvironment:
|
||||
case ChangeKind::RecordedPackElementExpansion:
|
||||
// FIXME: Print short form of PackExpansionExpr
|
||||
out << "(RecordedPackEnvironment ";
|
||||
out << "(RecordedPackElementExpansion ";
|
||||
simple_display(out, TheElement);
|
||||
out << "\n";
|
||||
break;
|
||||
@@ -971,4 +971,4 @@ void SolverTrail::dump(raw_ostream &OS, unsigned fromIndex,
|
||||
unsigned indent) const {
|
||||
for (unsigned i = fromIndex; i < Changes.size(); ++i)
|
||||
Changes[i].dump(OS, CS, indent);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user