Skip to content

Commit 134eb63

Browse files
Fixed typo.
Handled issue #162 squashed multiple typo fix commits
1 parent 872dc69 commit 134eb63

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/Sema/CSGen.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static ValueDecl *findReferencedDecl(Expr *expr, SourceLoc &loc) {
5353
}
5454

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

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

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

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

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

lib/Sema/TypeCheckDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2930,7 +2930,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
29302930

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

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

0 commit comments

Comments
 (0)