Merge pull request #2100 from practicalswift/gardening-20160408

[gardening] Fix typos. Remove double spaces. Remove tabs in C++ code.

Author: practicalswift

lib/Basic/Platform.cpp

@@ -93,7 +93,7 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
 
   if (triple.isOSFreeBSD())
     return "freebsd";
-	
+
   if (triple.isOSWindows())
     return  "windows";
 

lib/ClangImporter/CFTypeInfo.h

@@ -19,8 +19,8 @@
 #include "llvm/ADT/PointerUnion.h"
 
 namespace clang {
-	class RecordDecl;
-	class TypedefNameDecl;
+  class RecordDecl;
+  class TypedefNameDecl;
 }
 
 namespace swift {

lib/IRGen/GenCast.cpp

@@ -736,7 +736,7 @@ void irgen::emitScalarCheckedCast(IRGenFunction &IGF,
   if (auto sourceOptObjectType =
         sourceType.getAnyOptionalObjectType(*IGF.IGM.SILMod, optKind)) {
 
-    // Translate the value from an enum represention to a possibly-null
+    // Translate the value from an enum representation to a possibly-null
     // representation.  Note that we assume that this projection is safe
     // for the particular case of an optional class-reference or metatype
     // value.
@@ -820,4 +820,4 @@ void irgen::emitScalarCheckedCast(IRGenFunction &IGF,
 
   llvm::Value *result = emitClassDowncast(IGF, instance, targetType, mode);
   out.add(result);
-}
+}

lib/Option/SanitizerOptions.cpp

@@ -77,7 +77,7 @@ SanitizerKind swift::parseSanitizerArgValues(const llvm::opt::Arg *A,
       Triple.getTriple());
   }
   // Thread Sanitizer only works on OS X and the simulators. It's only supported
-  // on 64 bit arcitectures.
+  // on 64 bit architectures.
   if (kind == SanitizerKind::Thread &&
       (!(Triple.isMacOSX() || tripleIsAnySimulator(Triple)) ||
        !Triple.isArch64Bit())) {

lib/SIL/SILGlobalVariable.cpp

@@ -48,7 +48,7 @@ SILGlobalVariable::SILGlobalVariable(SILModule &Module, SILLinkage Linkage,
     Location(Loc),
     Linkage(unsigned(Linkage)),
     Fragile(IsFragile),
-	VDecl(Decl) {
+    VDecl(Decl) {
   IsDeclaration = isAvailableExternally(Linkage);
   setLet(Decl ? Decl->isLet() : false);
   InitializerF = nullptr;

stdlib/public/core/Arrays.swift.gyb

@@ -541,7 +541,7 @@ extension ${Self} : RangeReplaceableCollection, _ArrayProtocol {
       _buffer = ${Self}._allocateBufferUninitialized(minimumCapacity: count)
       _buffer.count = count
     }
-    // Can’t store count here because the buffer might be pointing to the
+    // Can't store count here because the buffer might be pointing to the
     // shared empty array.
   }
 

stdlib/public/stubs/Stubs.cpp

@@ -276,13 +276,13 @@ __muloti4(ti_int a, ti_int b, int* overflow)
     if (a == MIN)
     {
         if (b != 0 && b != 1)
-	    *overflow = 1;
-	return result;
+            *overflow = 1;
+        return result;
     }
     if (b == MIN)
     {
         if (a != 0 && a != 1)
-	    *overflow = 1;
+            *overflow = 1;
         return result;
     }
     ti_int sa = a >> (N - 1);

test/1_stdlib/Inputs/DictionaryKeyValueTypesObjC.swift

@@ -5,7 +5,7 @@ import Foundation
 
 // FIXME: Should go into the standard library.
 public extension _ObjectiveCBridgeable {
-  static  func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
+  static func _unconditionallyBridgeFromObjectiveC(_ source: _ObjectiveCType?)
       -> Self {
     var result: Self? = nil
     _forceBridgeFromObjectiveC(source!, result: &result)
@@ -101,7 +101,7 @@ class TestObjCKeyTy : NSObject, NSCopying {
     return value.description
   }
 
-  override  func isEqual(_ object: AnyObject!) -> Bool {
+  override func isEqual(_ object: AnyObject!) -> Bool {
     if let other = object {
       if let otherObjcKey = other as? TestObjCKeyTy {
         return self.value == otherObjcKey.value
@@ -182,7 +182,7 @@ class TestObjCEquatableValueTy : NSObject {
     serial = -serial
   }
 
-  override  func isEqual(_ object: AnyObject!) -> Bool {
+  override func isEqual(_ object: AnyObject!) -> Bool {
     if let other = object {
       if let otherObjcKey = other as? TestObjCEquatableValueTy {
         return self.value == otherObjcKey.value
@@ -242,15 +242,15 @@ struct TestBridgedKeyTy
     return TestObjCKeyTy(value)
   }
 
-  static  func _forceBridgeFromObjectiveC(
+  static func _forceBridgeFromObjectiveC(
     _ x: TestObjCKeyTy,
     result: inout TestBridgedKeyTy?
   ) {
     _bridgedKeyBridgeOperations.fetchAndAdd(1)
     result = TestBridgedKeyTy(x.value)
   }
 
-  static  func _conditionallyBridgeFromObjectiveC(
+  static func _conditionallyBridgeFromObjectiveC(
     _ x: TestObjCKeyTy,
     result: inout TestBridgedKeyTy?
   ) -> Bool {
@@ -303,15 +303,15 @@ struct TestBridgedValueTy : CustomStringConvertible, _ObjectiveCBridgeable {
     return TestObjCValueTy(value)
   }
 
-  static  func _forceBridgeFromObjectiveC(
+  static func _forceBridgeFromObjectiveC(
     _ x: TestObjCValueTy,
     result: inout TestBridgedValueTy?
   ) {
     TestBridgedValueTy.bridgeOperations += 1
     result = TestBridgedValueTy(x.value)
   }
 
-  static  func _conditionallyBridgeFromObjectiveC(
+  static func _conditionallyBridgeFromObjectiveC(
     _ x: TestObjCValueTy,
     result: inout TestBridgedValueTy?
   ) -> Bool {
@@ -357,15 +357,15 @@ struct TestBridgedEquatableValueTy
     return TestObjCEquatableValueTy(value)
   }
 
-  static  func _forceBridgeFromObjectiveC(
+  static func _forceBridgeFromObjectiveC(
     _ x: TestObjCEquatableValueTy,
     result: inout TestBridgedEquatableValueTy?
   ) {
     _bridgedEquatableValueBridgeOperations.fetchAndAdd(1)
     result = TestBridgedEquatableValueTy(x.value)
   }
 
-  static  func _conditionallyBridgeFromObjectiveC(
+  static func _conditionallyBridgeFromObjectiveC(
     _ x: TestObjCEquatableValueTy,
     result: inout TestBridgedEquatableValueTy?
   ) -> Bool {

test/ClangModules/Inputs/enum-error.h

@@ -5,9 +5,9 @@
 @class NSString;
 extern NSString *const TestErrorDomain;
 typedef NS_ERROR_ENUM(int, TestError, TestErrorDomain) {
-	TENone,
-	TEOne,
-	TETwo,
+  TENone,
+  TEOne,
+  TETwo,
 };
 
 TestError getErr();

test/IDE/Inputs/custom-modules/InferImportAsMember.h

@@ -95,7 +95,7 @@ static void IAMStruct1DoSomething(struct IAMMutableStruct1 iamStruct1);
 
 typedef struct TDStruct TDStruct;
 struct TDStruct {
-	double x;
+  double x;
 };
 // FIXME: the below doesn't appear in the output
 const TDStruct TDStructCreateWithFloat(float Float);

test/IDE/Inputs/mock-sdk/Bar.framework/Headers/Bar.h

@@ -13,7 +13,7 @@ enum BarForwardDeclaredEnum {
 #define BAR_MACRO_1 0
 
 typedef struct {
-	int count;
+  int count;
 } SomeItemSet;
 
 typedef SomeItemSet SomeEnvironment;

test/IRGen/Inputs/StaticInline.h

@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
 
 static inline NSString *staticInlineFun() {
-	return [[NSLocale currentLocale] localeIdentifier];
+  return [[NSLocale currentLocale] localeIdentifier];
 }

test/Inputs/clang-importer-sdk/usr/include/Foundation.h

@@ -397,19 +397,19 @@ typedef NS_ENUM(NSUInteger, NSPostingStyle) {
 };
 
 typedef NS_ENUM(NSUInteger, NSXMLNodeKind) {
-	NSXMLInvalidKind = 0,
-	NSXMLDocumentKind,
-	NSXMLElementKind,
-	NSXMLAttributeKind,
-	NSXMLNamespaceKind,
-	NSXMLProcessingInstructionKind,
-	NSXMLCommentKind,
-	NSXMLTextKind,
-	NSXMLDTDKind __attribute__((swift_name("DTDKind"))),
-	NSXMLEntityDeclarationKind,
-	NSXMLAttributeDeclarationKind,
-	NSXMLElementDeclarationKind,
-	NSXMLNotationDeclarationKind
+  NSXMLInvalidKind = 0,
+  NSXMLDocumentKind,
+  NSXMLElementKind,
+  NSXMLAttributeKind,
+  NSXMLNamespaceKind,
+  NSXMLProcessingInstructionKind,
+  NSXMLCommentKind,
+  NSXMLTextKind,
+  NSXMLDTDKind __attribute__((swift_name("DTDKind"))),
+  NSXMLEntityDeclarationKind,
+  NSXMLAttributeDeclarationKind,
+  NSXMLElementDeclarationKind,
+  NSXMLNotationDeclarationKind
 };
 
 // From CoreFoundation
@@ -566,7 +566,7 @@ typedef NS_OPTIONS(NSInteger, AlertBuzzes) {
 typedef NS_OPTIONS(NSUInteger, NSBitmapFormat) {
   NSAlphaFirstBitmapFormat            = 1 << 0, // 0 means is alpha last (RGBA, CMYKA, etc.)
   NSAlphaNonpremultipliedBitmapFormat = 1 << 1, // 0 means is premultiplied
-  NSFloatingPointSamplesBitmapFormat  = 1 << 2,	// 0 is integer
+  NSFloatingPointSamplesBitmapFormat  = 1 << 2, // 0 is integer
 
   NS16BitLittleEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 8),
   NS32BitLittleEndianBitmapFormat /*NS_ENUM_AVAILABLE_MAC(10_51)*/ = (1 << 9),
@@ -582,7 +582,7 @@ typedef NS_OPTIONS(NSUInteger, NSBitmapFormatReversed) {
 
   NSAlphaFirstBitmapFormatR            = 1 << 0, // 0 means is alpha last (RGBA, CMYKA, etc.)
   NSAlphaNonpremultipliedBitmapFormatR = 1 << 1, // 0 means is premultiplied
-  NSFloatingPointSamplesBitmapFormatR  = 1 << 2,	// 0 is integer
+  NSFloatingPointSamplesBitmapFormatR  = 1 << 2, // 0 is integer
 };
 
 typedef NS_OPTIONS(NSUInteger, NSBitmapFormat2) {

test/Inputs/clang-importer-sdk/usr/include/user_objc.h

@@ -35,7 +35,7 @@ typedef CF_OPTIONS(UInt32, AudioComponentInstantiationOptions) {
 typedef CF_OPTIONS(UInt32, AudioComponentFlags) {
   kAudioComponentFlag_Unsearchable    = 1,
   kAudioComponentFlag_SandboxSafe     = 2,
-  kAudioComponentFlag_IsV3AudioUnit	= 4
+  kAudioComponentFlag_IsV3AudioUnit   = 4
 };
 
 // ...and this one has both complications.

test/SIL/Parser/nonatomic_reference_counting.sil

@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s
 
-// Check that all refernce counting instructions can take the [nonatomic]
+// Check that all reference counting instructions can take the [nonatomic]
 // attribute. SIL parser should be able to parse this attribute and
 // SIL printer should properly print it.
 

test/SourceKit/Inputs/libIDE-mock-sdk/Bar.framework/Headers/Bar.h

@@ -13,7 +13,7 @@ enum BarForwardDeclaredEnum {
 #define BAR_MACRO_1 0
 
 typedef struct {
-	int count;
+  int count;
 } SomeItemSet;
 
 typedef SomeItemSet SomeEnvironment;

test/SourceKit/InterfaceGen/Inputs/header2.h

@@ -1,5 +1,5 @@
 
 typedef struct {
-	long width;
-	long height;
+  long width;
+  long height;
 } NUPixelSize;

tools/SourceKit/lib/SwiftLang/SwiftInterfaceGenContext.h

@@ -31,7 +31,7 @@ namespace SourceKit {
   typedef IntrusiveRefCntPtr<ASTUnit> ASTUnitRef;
 
 class SwiftInterfaceGenContext :
-		public swift::ThreadSafeRefCountedBase<SwiftInterfaceGenContext> {
+  public swift::ThreadSafeRefCountedBase<SwiftInterfaceGenContext> {
 public:
   static SwiftInterfaceGenContextRef create(StringRef DocumentName,
                                             bool IsModule,

tools/sil-opt/SILOpt.cpp

@@ -98,7 +98,7 @@ Passes(llvm::cl::desc("Passes:"),
        llvm::cl::values(
 #define PASS(ID, NAME, DESCRIPTION) clEnumValN(PassKind::ID, NAME, DESCRIPTION),
 #include "swift/SILOptimizer/PassManager/Passes.def"
-			clEnumValEnd));
+       clEnumValEnd));
 
 static llvm::cl::opt<bool>
 PrintStats("print-stats", llvm::cl::desc("Print various statistics"));

utils/swift_build_support/tests/test_toolchain.py

@@ -31,7 +31,7 @@ def test_clang_available_on_this_platform(self):
 
 class HostToolchainTestCase(unittest.TestCase):
     def test_found_executables_match(self):
-        # Test that the raw incovation of _first_common_executables
+        # Test that the raw invocation of _first_common_executables
         # either returns None or matching paths.
         suffixes = ['', '-3.8', '-3.7', '-3.6']
         toolchain = host_toolchain(suffixes=suffixes)