Skip to content

Bugfix - Few more typos #374

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 9, 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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Latest

* Field getters and setters are now created for named unions imported from C.
In addition, an initializer with a named parameter for the field is provided.
For example, given the following Objective-C `typdef`:
For example, given the following Objective-C `typedef`:

```objc
typedef union IntOrFloat {
Expand Down
2 changes: 1 addition & 1 deletion lib/AST/Type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2125,7 +2125,7 @@ Type ProtocolCompositionType::get(const ASTContext &C,
return Protocols.front()->getDeclaredType();

// Form the set of canonical protocol types from the protocol
// declarations, and use that to buid the canonical composition type.
// declarations, and use that to build the canonical composition type.
SmallVector<Type, 4> CanProtocolTypes;
std::transform(Protocols.begin(), Protocols.end(),
std::back_inserter(CanProtocolTypes),
Expand Down
4 changes: 2 additions & 2 deletions lib/Sema/CSDiag.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2060,7 +2060,7 @@ bool FailureDiagnosis::diagnoseConstraintFailure() {
if (isConversionConstraint(C))
return rankedConstraints.push_back({C, CR_ConversionConstraint});

// We occassionally end up with disjunction constraints containing an
// We occasionally end up with disjunction constraints containing an
// original constraint along with one considered with a fix. If we find
// this situation, add the original one to our list for diagnosis.
if (C->getKind() == ConstraintKind::Disjunction) {
Expand Down Expand Up @@ -2111,7 +2111,7 @@ bool FailureDiagnosis::diagnoseConstraintFailure() {
classifyConstraint(&C);

// Okay, now that we've classified all the constraints, sort them by their
// priority and priviledge the favored constraints.
// priority and privilege the favored constraints.
std::stable_sort(rankedConstraints.begin(), rankedConstraints.end(),
[&] (RCElt LHS, RCElt RHS) {
// Rank things by their kind as the highest priority.
Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/CSGen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2621,7 +2621,7 @@ namespace {
if (arg != call->getArg())
return;

// Dig out the function, looking through, parenthses, ?, and !.
// Dig out the function, looking through, parentheses, ?, and !.
auto fn = call->getFn();
do {
fn = fn->getSemanticsProvidingExpr();
Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/CSSimplify.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ matchCallArguments(ArrayRef<CallArgParam> args,
if (param.Variadic)
continue;

// Parameters with defaults can be unfilfilled.
// Parameters with defaults can be unfulfilled.
if (param.HasDefaultArgument)
continue;

Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/CSSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static Optional<Type> checkTypeOfBinding(ConstraintSystem &cs,
return type;
}

/// Reconsistitute type sugar, e.g., for array types, dictionary
/// Reconstitute type sugar, e.g., for array types, dictionary
/// types, optionals, etc.
static Type reconstituteSugar(Type type) {
if (auto boundGeneric = dyn_cast<BoundGenericType>(type.getPointer())) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/CodeSynthesis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,7 @@ static void synthesizeAddressedMaterializeForSet(FuncDecl *materializeForSet,
}();

// Initialize the callback storage with the owner value, which is
// the second elemenet of the addressor result.
// the second element of the addressor result.
Expr *owner = new (ctx) DeclRefExpr(tempDecl, SourceLoc(), IsImplicit);
owner = new (ctx) TupleElementExpr(owner, SourceLoc(), /*field index*/ 1,
SourceLoc(), Type());
Expand Down
2 changes: 1 addition & 1 deletion lib/Sema/ConstraintSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ struct MemberLookupResult {
Unsolved,

/// This result indicates that the member reference is erroneous, but was
/// already dianosed. Don't emit another error.
/// already diagnosed. Don't emit another error.
ErrorAlreadyDiagnosed,

/// This result indicates that the lookup produced candidate lists,
Expand Down