Skip to content

Fix recently introduced typos #820

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.

Sign up for GitHub

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 30, 2015
Merged

Fix recently introduced typos #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions include/swift/Basic/PointerIntEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace swift {
/// \tparam PtrTraits The pointer traits of PointerTy
/// \tparam ScribbleMemory Instead of freeing any malloced memory, scribble the
/// memory. This enables us to test that memory is properly being
/// deallocated. Should only be set to true during unittesting.
/// deallocated. Should only be set to true during unit testing.
template <typename EnumTy, typename PointerTy, unsigned NumPointerKindBits,
unsigned NumIndexKindBits,
typename PtrTraits = llvm::PointerLikeTypeTraits<PointerTy>,
Expand Down Expand Up @@ -153,7 +153,7 @@ class PointerIntEnum {
}

PointerIntEnum &operator=(const PointerIntEnum &P) {
// If we already haev a raw kind, we need to free memory.
// If we already have a raw kind, we need to free memory.
if (getRawKind() == EnumTy::LargeIndex)
freeMemory();

Expand Down Expand Up @@ -197,7 +197,7 @@ class PointerIntEnum {
/// Convenience method for getting the raw underlying kind.
EnumTy getKind() const {
// First grab the bits of projection excluding the top 3 bits. If these bits
// take ona value <= 4095, then we have a small index.
// take on a value <= 4095, then we have a small index.
if ((Index & IndexKindOffsetBitMask) <= MaxSmallIndex) {
return EnumTy(unsigned(Index >> IndexKindBitOffset));
}
Expand Down Expand Up @@ -252,7 +252,7 @@ class PointerIntEnum {
/// lower bits of the malloced large index.
EnumTy getRawKind() const {
// First grab the bits of projection excluding the top 3 bits. If these bits
// take ona value <= 2047, then we have a small index.
// take on a value <= 2047, then we have a small index.
if ((Index & IndexKindOffsetBitMask) <= MaxSmallIndex) {
return EnumTy(unsigned(Index >> IndexKindBitOffset));
}
Expand Down
6 changes: 3 additions & 3 deletions include/swift/SIL/Projection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ class NewProjection {
NumPointerKindBits, NumIndexKindBits>;
/// A pointer sized type that is used to store the kind of projection that is
/// being represented and also all of the necessary information to convert a
/// base SILTyepe to a derived field SILType.
/// base SILType to a derived field SILType.
ValueTy Value;

public:
Expand Down Expand Up @@ -535,7 +535,7 @@ class NewProjectionPath {
/// to an address derived type.
bool isAddressProjectionPath() const;

/// Returns true if this is an projection path that takes an object base type
/// Returns true if this is a projection path that takes an object base type
/// to an object derived type.
bool isObjectProjectionPath() const;

Expand All @@ -547,7 +547,7 @@ class NewProjectionPath {

/// If this is an address projection path and \p Base is a SILValue with the
/// object version of said type, use \p B and \p Loc to recreate the stored
/// address projection path as a object projection path from \p Base. Return
/// address projection path as an object projection path from \p Base. Return
/// the SILValue at the end of the path.
SILValue createObjectProjections(SILBuilder &B, SILLocation Loc,
SILValue Base);
Expand Down