From: David Blaikie Date: Thu, 20 Oct 2011 01:45:20 +0000 (+0000) Subject: Fix all 80 col violations in include/clang/Basic, plus any trailing whitespace in... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70042f5d1ca378138f90b7b9384023701f5d03d8;p=clang Fix all 80 col violations in include/clang/Basic, plus any trailing whitespace in the files I'm touching anyway. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142564 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/ExpressionTraits.h b/include/clang/Basic/ExpressionTraits.h index 403a59a8d1..f70931247d 100644 --- a/include/clang/Basic/ExpressionTraits.h +++ b/include/clang/Basic/ExpressionTraits.h @@ -1,4 +1,4 @@ -//===--- ExpressionTraits.h - C++ Expression Traits Support Enumerations ----*- C++ -*-===// +//===--- ExpressionTraits.h - C++ Expression Traits Support Enumerations --===// // // The LLVM Compiler Infrastructure // diff --git a/include/clang/Basic/FileManager.h b/include/clang/Basic/FileManager.h index ea8ed9f02f..d9fe41ac2a 100644 --- a/include/clang/Basic/FileManager.h +++ b/include/clang/Basic/FileManager.h @@ -39,7 +39,7 @@ namespace sys { class Path; } namespace clang { class FileManager; class FileSystemStatCache; - + /// DirectoryEntry - Cached information about one directory (either on /// the disk or in the virtual file system). /// @@ -64,12 +64,12 @@ class FileEntry { dev_t Device; // ID for the device containing the file. ino_t Inode; // Inode number for the file. mode_t FileMode; // The file mode as returned by 'stat'. - + /// FD - The file descriptor for the file entry if it is opened and owned /// by the FileEntry. If not, this is set to -1. mutable int FD; friend class FileManager; - + public: FileEntry(dev_t device, ino_t inode, mode_t m) : Name(0), Device(device), Inode(inode), FileMode(m), FD(-1) {} @@ -80,7 +80,7 @@ public: memcpy(this, &FE, sizeof(FE)); assert(FD == -1 && "Cannot copy a file-owning FileEntry"); } - + void operator=(const FileEntry &FE) { memcpy(this, &FE, sizeof(FE)); assert(FD == -1 && "Cannot assign a file-owning FileEntry"); @@ -116,7 +116,8 @@ class FileManager : public llvm::RefCountedBase { class UniqueDirContainer; class UniqueFileContainer; - /// UniqueRealDirs/UniqueRealFiles - Cache for existing real directories/files. + /// UniqueRealDirs/UniqueRealFiles - Cache for existing real + /// directories/files. /// UniqueDirContainer &UniqueRealDirs; UniqueFileContainer &UniqueRealFiles; @@ -224,7 +225,7 @@ public: /// file to the corresponding FileEntry pointer. void GetUniqueIDMapping( SmallVectorImpl &UIDToFiles) const; - + void PrintStats() const; }; diff --git a/include/clang/Basic/OnDiskHashTable.h b/include/clang/Basic/OnDiskHashTable.h index 7328b1a6bb..8028a73326 100644 --- a/include/clang/Basic/OnDiskHashTable.h +++ b/include/clang/Basic/OnDiskHashTable.h @@ -356,7 +356,7 @@ public: friend bool operator!=(const key_iterator& X, const key_iterator &Y) { return X.NumEntriesLeft != Y.NumEntriesLeft; } - + key_iterator& operator++() { // Preincrement if (!NumItemsInBucketLeft) { // 'Items' starts with a 16-bit unsigned integer representing the @@ -421,7 +421,7 @@ public: bool operator!=(const item_iterator& X) const { return X.NumEntriesLeft != NumEntriesLeft; } - + item_iterator& operator++() { // Preincrement if (!NumItemsInBucketLeft) { // 'Items' starts with a 16-bit unsigned integer representing the @@ -449,7 +449,7 @@ public: LocalPtr += 4; // Skip the hash. // Determine the length of the key and the data. - const std::pair& L = Info::ReadKeyDataLength(LocalPtr); + const std::pair& L =Info::ReadKeyDataLength(LocalPtr); // Read the key. const internal_key_type& Key = @@ -458,14 +458,14 @@ public: InfoObj->ReadData(Key, LocalPtr + L.first, L.second)); } }; - + item_iterator item_begin() { return item_iterator(Base + 4, getNumEntries(), &InfoObj); } item_iterator item_end() { return item_iterator(); } Info &getInfoObj() { return InfoObj; } - + static OnDiskChainedHashTable* Create(const unsigned char* buckets, const unsigned char* const base, const Info &InfoObj = Info()) { diff --git a/include/clang/Basic/PartialDiagnostic.h b/include/clang/Basic/PartialDiagnostic.h index c6ca989765..ffebc2f99f 100644 --- a/include/clang/Basic/PartialDiagnostic.h +++ b/include/clang/Basic/PartialDiagnostic.h @@ -29,84 +29,84 @@ public: Storage() : NumDiagArgs(0), NumDiagRanges(0), NumFixItHints(0) { } enum { - /// MaxArguments - The maximum number of arguments we can hold. We + /// MaxArguments - The maximum number of arguments we can hold. We /// currently only support up to 10 arguments (%0-%9). /// A single diagnostic with more than that almost certainly has to /// be simplified anyway. MaxArguments = DiagnosticsEngine::MaxArguments }; - + /// NumDiagArgs - This contains the number of entries in Arguments. unsigned char NumDiagArgs; - + /// NumDiagRanges - This is the number of ranges in the DiagRanges array. unsigned char NumDiagRanges; /// \brief The number of code modifications hints in the /// FixItHints array. unsigned char NumFixItHints; - + /// DiagArgumentsKind - This is an array of ArgumentKind::ArgumentKind enum /// values, with one for each argument. This specifies whether the argument /// is in DiagArgumentsStr or in DiagArguments. unsigned char DiagArgumentsKind[MaxArguments]; - - /// DiagArgumentsVal - The values for the various substitution positions. - /// This is used when the argument is not an std::string. The specific value + + /// DiagArgumentsVal - The values for the various substitution positions. + /// This is used when the argument is not an std::string. The specific value /// is mangled into an intptr_t and the interpretation depends on exactly /// what sort of argument kind it is. intptr_t DiagArgumentsVal[MaxArguments]; - + /// \brief The values for the various substitution positions that have /// string arguments. std::string DiagArgumentsStr[MaxArguments]; - + /// DiagRanges - The list of ranges added to this diagnostic. It currently /// only support 10 ranges, could easily be extended if needed. CharSourceRange DiagRanges[10]; - + enum { MaxFixItHints = DiagnosticsEngine::MaxFixItHints }; - + /// FixItHints - If valid, provides a hint with some code /// to insert, remove, or modify at a particular position. - FixItHint FixItHints[MaxFixItHints]; + FixItHint FixItHints[MaxFixItHints]; }; - /// \brief An allocator for Storage objects, which uses a small cache to + /// \brief An allocator for Storage objects, which uses a small cache to /// objects, used to reduce malloc()/free() traffic for partial diagnostics. class StorageAllocator { static const unsigned NumCached = 16; Storage Cached[NumCached]; Storage *FreeList[NumCached]; unsigned NumFreeListEntries; - + public: StorageAllocator(); ~StorageAllocator(); - + /// \brief Allocate new storage. Storage *Allocate() { if (NumFreeListEntries == 0) return new Storage; - + Storage *Result = FreeList[--NumFreeListEntries]; Result->NumDiagArgs = 0; Result->NumDiagRanges = 0; Result->NumFixItHints = 0; return Result; } - + /// \brief Free the given storage object. void Deallocate(Storage *S) { if (S >= Cached && S <= Cached + NumCached) { FreeList[NumFreeListEntries++] = S; return; } - + delete S; } }; - + private: // NOTE: Sema assumes that PartialDiagnostic is location-invariant // in the sense that its bits can be safely memcpy'ed and destructed @@ -114,18 +114,18 @@ private: /// DiagID - The diagnostic ID. mutable unsigned DiagID; - + /// DiagStorage - Storage for args and ranges. mutable Storage *DiagStorage; /// \brief Allocator used to allocate storage for this diagnostic. StorageAllocator *Allocator; - + /// \brief Retrieve storage for this particular diagnostic. Storage *getStorage() const { if (DiagStorage) return DiagStorage; - + if (Allocator) DiagStorage = Allocator->Allocate(); else { @@ -134,32 +134,32 @@ private: } return DiagStorage; } - - void freeStorage() { + + void freeStorage() { if (!DiagStorage) return; - + if (Allocator) Allocator->Deallocate(DiagStorage); else if (Allocator != reinterpret_cast(~uintptr_t(0))) delete DiagStorage; DiagStorage = 0; } - + void AddSourceRange(const CharSourceRange &R) const { if (!DiagStorage) DiagStorage = getStorage(); - assert(DiagStorage->NumDiagRanges < + assert(DiagStorage->NumDiagRanges < llvm::array_lengthof(DiagStorage->DiagRanges) && "Too many arguments to diagnostic!"); DiagStorage->DiagRanges[DiagStorage->NumDiagRanges++] = R; - } + } void AddFixItHint(const FixItHint &Hint) const { if (Hint.isNull()) return; - + if (!DiagStorage) DiagStorage = getStorage(); @@ -170,12 +170,12 @@ private: DiagStorage->FixItHints[DiagStorage->NumFixItHints++] = Hint; } - + public: PartialDiagnostic(unsigned DiagID, StorageAllocator &Allocator) : DiagID(DiagID), DiagStorage(0), Allocator(&Allocator) { } - - PartialDiagnostic(const PartialDiagnostic &Other) + + PartialDiagnostic(const PartialDiagnostic &Other) : DiagID(Other.DiagID), DiagStorage(0), Allocator(Other.Allocator) { if (Other.DiagStorage) { @@ -184,14 +184,14 @@ public: } } - PartialDiagnostic(const PartialDiagnostic &Other, Storage *DiagStorage) - : DiagID(Other.DiagID), DiagStorage(DiagStorage), + PartialDiagnostic(const PartialDiagnostic &Other, Storage *DiagStorage) + : DiagID(Other.DiagID), DiagStorage(DiagStorage), Allocator(reinterpret_cast(~uintptr_t(0))) { if (Other.DiagStorage) *this->DiagStorage = *Other.DiagStorage; } - + PartialDiagnostic(const Diagnostic &Other, StorageAllocator &Allocator) : DiagID(Other.getID()), DiagStorage(0), Allocator(&Allocator) { @@ -202,22 +202,22 @@ public: else AddTaggedVal(Other.getRawArg(I), Other.getArgKind(I)); } - + // Copy source ranges. for (unsigned I = 0, N = Other.getNumRanges(); I != N; ++I) AddSourceRange(Other.getRange(I)); - + // Copy fix-its. for (unsigned I = 0, N = Other.getNumFixItHints(); I != N; ++I) AddFixItHint(Other.getFixItHint(I)); } - + PartialDiagnostic &operator=(const PartialDiagnostic &Other) { DiagID = Other.DiagID; if (Other.DiagStorage) { if (!DiagStorage) DiagStorage = getStorage(); - + *DiagStorage = *Other.DiagStorage; } else { freeStorage(); @@ -245,7 +245,7 @@ public: void AddString(StringRef V) const { if (!DiagStorage) DiagStorage = getStorage(); - + assert(DiagStorage->NumDiagArgs < Storage::MaxArguments && "Too many arguments to diagnostic!"); DiagStorage->DiagArgumentsKind[DiagStorage->NumDiagArgs] @@ -256,7 +256,7 @@ public: void Emit(const DiagnosticBuilder &DB) const { if (!DiagStorage) return; - + // Add all arguments. for (unsigned i = 0, e = DiagStorage->NumDiagArgs; i != e; ++i) { if ((DiagnosticsEngine::ArgumentKind)DiagStorage->DiagArgumentsKind[i] @@ -266,25 +266,25 @@ public: DB.AddTaggedVal(DiagStorage->DiagArgumentsVal[i], (DiagnosticsEngine::ArgumentKind)DiagStorage->DiagArgumentsKind[i]); } - + // Add all ranges. for (unsigned i = 0, e = DiagStorage->NumDiagRanges; i != e; ++i) DB.AddSourceRange(DiagStorage->DiagRanges[i]); - + // Add all fix-its. for (unsigned i = 0, e = DiagStorage->NumFixItHints; i != e; ++i) DB.AddFixItHint(DiagStorage->FixItHints[i]); } - + /// \brief Clear out this partial diagnostic, giving it a new diagnostic ID /// and removing all of its arguments, ranges, and fix-it hints. void Reset(unsigned DiagID = 0) { this->DiagID = DiagID; freeStorage(); } - + bool hasStorage() const { return DiagStorage != 0; } - + friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, unsigned I) { PD.AddTaggedVal(I, DiagnosticsEngine::ak_uint); @@ -306,11 +306,11 @@ public: friend inline const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, StringRef S) { - + PD.AddString(S); return PD; } - + friend inline const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, const SourceRange &R) { PD.AddSourceRange(CharSourceRange::getTokenRange(R)); @@ -322,13 +322,13 @@ public: PD.AddSourceRange(R); return PD; } - + friend const PartialDiagnostic &operator<<(const PartialDiagnostic &PD, const FixItHint &Hint) { PD.AddFixItHint(Hint); return PD; } - + }; inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB, @@ -336,7 +336,7 @@ inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB, PD.Emit(DB); return DB; } - + /// \brief A partial diagnostic along with the source location where this /// diagnostic occurs. typedef std::pair PartialDiagnosticAt; diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index 52b5c4512e..591d905317 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -569,7 +569,7 @@ class SourceManager : public llvm::RefCountedBase { /// source location. typedef std::map MacroArgsMap; - mutable llvm::DenseMap MacroArgsCacheMap; + mutable llvm::DenseMap MacroArgsCacheMap; // SourceManager doesn't support copy construction. explicit SourceManager(const SourceManager&); @@ -1205,7 +1205,8 @@ public: unsigned loaded_sloc_entry_size() const { return LoadedSLocEntryTable.size();} /// \brief Get a loaded SLocEntry. This is exposed for indexing. - const SrcMgr::SLocEntry &getLoadedSLocEntry(unsigned Index, bool *Invalid=0) const { + const SrcMgr::SLocEntry &getLoadedSLocEntry(unsigned Index, + bool *Invalid = 0) const { assert(Index < LoadedSLocEntryTable.size() && "Invalid index"); if (!SLocEntryLoaded[Index]) ExternalSLocEntries->ReadSLocEntry(-(static_cast(Index) + 2)); diff --git a/include/clang/Basic/Version.h b/include/clang/Basic/Version.h index 15cdf1fa02..96be5475c6 100644 --- a/include/clang/Basic/Version.h +++ b/include/clang/Basic/Version.h @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// // -// This header defines version macros and version-related utility functions +// This header defines version macros and version-related utility functions // for Clang. // //===----------------------------------------------------------------------===// @@ -29,7 +29,8 @@ /// \brief A string that describes the Clang version number, e.g., /// "1.0". #define CLANG_VERSION_STRING \ - CLANG_MAKE_VERSION_STRING(CLANG_VERSION_MAJOR,CLANG_VERSION_MINOR,CLANG_VERSION_PATCHLEVEL) + CLANG_MAKE_VERSION_STRING(CLANG_VERSION_MAJOR,CLANG_VERSION_MINOR, \ + CLANG_VERSION_PATCHLEVEL) #else /// \brief Helper macro for CLANG_VERSION_STRING. #define CLANG_MAKE_VERSION_STRING(X,Y) CLANG_MAKE_VERSION_STRING2(X.Y) @@ -41,21 +42,21 @@ #endif namespace clang { - /// \brief Retrieves the repository path (e.g., Subversion path) that + /// \brief Retrieves the repository path (e.g., Subversion path) that /// identifies the particular Clang branch, tag, or trunk from which this /// Clang was built. std::string getClangRepositoryPath(); - + /// \brief Retrieves the repository revision number (or identifer) from which /// this Clang was built. std::string getClangRevision(); - + /// \brief Retrieves the full repository version that is an amalgamation of /// the information in getClangRepositoryPath() and getClangRevision(). std::string getClangFullRepositoryVersion(); - + /// \brief Retrieves a string representing the complete clang version, - /// which includes the clang version number, the repository version, + /// which includes the clang version number, the repository version, /// and the vendor tag. std::string getClangFullVersion();