averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove VarargBaseType from TuplePatternElt and introduce a bit in TuplePattern to indicate if there is a vararg.

Browse Source 
The semantics of varargs (only for the last element) make it more appropriate as a property of the TuplePattern.
Also free the Parser from needing to construct synthetic types (ArraySlice for type of vararg element) to
accommodate the TypeChecker and move the logic to the TypeChecker. This will be more beneficial when the parser stops
creating types in general.

Swift SVN r6271
This commit is contained in:
Argyrios Kyrtzidis
2013-07-15 20:21:30 +00:00
parent 189ffc49a5
commit 37dc84e13c
12 changed files with 129 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/AST/Pattern.cpp
View File

@@ -187,9 +187,11 @@ Pattern *Pattern::clone(ASTContext &context) const {
elts.reserve(tuple->getNumFields());
for (const auto &elt : tuple->getFields())
elts.push_back(TuplePatternElt(elt.getPattern()->clone(context),
elt.getInit(), elt.getVarargBaseType()));
elt.getInit()));
result = TuplePattern::create(context, tuple->getLParenLoc(), elts,
tuple->getRParenLoc());
tuple->getRParenLoc(),
tuple->hasVararg(),
tuple->getEllipsisLoc());
break;
}
@@ -266,43 +268,33 @@ Identifier Pattern::getBoundName() const {
return Identifier();
}
void TuplePatternElt::revertToNonVariadic() {
assert(VarargBaseType && "Not a variadic element");
// Fix the pattern.
auto typedPattern = cast<TypedPattern>(ThePattern);
typedPattern->getTypeLoc()
= TypeLoc(VarargBaseType, typedPattern->getTypeLoc().getSourceRange(),
typedPattern->getTypeLoc().getTypeRepr());
// Clear out the variadic base type.
VarargBaseType = Type();
}
/// Allocate a new pattern that matches a tuple.
TuplePattern *TuplePattern::create(ASTContext &C, SourceLoc lp,
ArrayRef<TuplePatternElt> elts,
SourceLoc rp) {
ArrayRef<TuplePatternElt> elts, SourceLoc rp,
bool hasVararg, SourceLoc ellipsis) {
unsigned n = elts.size();
void *buffer = C.Allocate(sizeof(TuplePattern) + n * sizeof(TuplePatternElt),
void *buffer = C.Allocate(sizeof(TuplePattern) + n * sizeof(TuplePatternElt) +
(hasVararg ? sizeof(SourceLoc) : 0),
alignof(TuplePattern));
TuplePattern *pattern = ::new(buffer) TuplePattern(lp, n, rp);
TuplePattern *pattern = ::new(buffer) TuplePattern(lp, n, rp, hasVararg,
ellipsis);
memcpy(pattern->getFieldsBuffer(), elts.data(), n * sizeof(TuplePatternElt));
return pattern;
}
Pattern *TuplePattern::createSimple(ASTContext &C, SourceLoc lp,
ArrayRef<TuplePatternElt> elements,
SourceLoc rp) {
SourceLoc rp,
bool hasVararg, SourceLoc ellipsis) {
if (elements.size() == 1 &&
elements[0].getInit() == nullptr &&
elements[0].getPattern()->getBoundName().empty() &&
!elements[0].isVararg()) {
!hasVararg) {
auto &first = const_cast<TuplePatternElt&>(elements.front());
return new (C) ParenPattern(lp, first.getPattern(), rp);
}
return create(C, lp, elements, rp);
return create(C, lp, elements, rp, hasVararg, ellipsis);
}
SourceRange TypedPattern::getSourceRange() const {