Skip to content

Fixed typo #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/Sema/CSGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static ValueDecl *findReferencedDecl(Expr *expr, SourceLoc &loc) {
}

/// \brief Return 'true' if the decl in question refers to an operator that
/// could be added to the global scope via a delayed protcol conformance.
/// could be added to the global scope via a delayed protocol conformance.
/// Currently, this is only true for '==', which is added via an Equatable
/// conformance.
static bool isDelayedOperatorDecl(ValueDecl *vd) {
Expand Down Expand Up @@ -337,7 +337,7 @@ namespace {
/// of the overload set and call arguments.
///
/// \param expr The application.
/// \param isFavored Determine wheth the given overload is favored.
/// \param isFavored Determine whether the given overload is favored.
/// \param createReplacements If provided, a function that creates a set of
/// replacement fallback constraints.
/// \param mustConsider If provided, a function to detect the presence of
Expand Down Expand Up @@ -2664,7 +2664,7 @@ Expr *ConstraintSystem::generateConstraints(Expr *expr) {
// Remove implicit conversions from the expression.
expr = expr->walk(SanitizeExpr(getTypeChecker()));

// Wall the expression to associate labeled argumets.
// Wall the expression to associate labeled arguments.
expr->walk(ArgumentLabelWalker(*this, expr));

// Walk the expression, generating constraints.
Expand Down Expand Up @@ -2740,7 +2740,7 @@ class InferUnresolvedMemberConstraintGenerator : public ConstraintGenerator {
return ConstraintGenerator::visitUnresolvedMemberExpr(Expr);
}
// Otherwise, create a type variable saying we know nothing about this expr.
assert(!VT && "cannot reassign type viriable.");
assert(!VT && "cannot reassign type variable.");
return VT = createFreeTypeVariableType(Expr);
}

Expand All @@ -2750,7 +2750,7 @@ class InferUnresolvedMemberConstraintGenerator : public ConstraintGenerator {
return ConstraintGenerator::visitParenExpr(Expr);
}
// Otherwise, create a type variable saying we know nothing about this expr.
assert(!VT && "cannot reassign type viriable.");
assert(!VT && "cannot reassign type variable.");
return VT = createFreeTypeVariableType(Expr);
}

Expand All @@ -2760,7 +2760,7 @@ class InferUnresolvedMemberConstraintGenerator : public ConstraintGenerator {
return ConstraintGenerator::visitTupleExpr(Expr);
}
// Otherwise, create a type variable saying we know nothing about this expr.
assert(!VT && "cannot reassign type viriable.");
assert(!VT && "cannot reassign type variable.");
return VT = createFreeTypeVariableType(Expr);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/TypeCheckDecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2930,7 +2930,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {

if (!IsSecondPass) {
for (unsigned i = 0, e = PBD->getNumPatternEntries(); i != e; ++i) {
// Type check each VarDecl in that his PatternBinding handles.
// Type check each VarDecl that this PatternBinding handles.
visitBoundVars(PBD->getPattern(i));

// If we have a type but no initializer, check whether the type is
Expand Down