From 75fb496fc6b1ef5301d7262f40a842a2385f3930 Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Thu, 31 Jan 2008 12:10:41 +0000 Subject: [PATCH] Whitespace cleanup git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@46611 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/StringMap.h | 105 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index 48476a3c367..407cb1f1238 100644 --- a/include/llvm/ADT/StringMap.h +++ b/include/llvm/ADT/StringMap.h @@ -26,7 +26,7 @@ namespace llvm { class StringMapEntry; /// StringMapEntryInitializer - This datatype can be partially specialized for -/// various datatypes in a stringmap to allow them to be initialized when an +/// various datatypes in a stringmap to allow them to be initialized when an /// entry is default constructed for the map. template class StringMapEntryInitializer { @@ -35,17 +35,17 @@ public: static void Initialize(StringMapEntry &T, InitTy InitVal) { } }; - - + + /// StringMapEntryBase - Shared base class of StringMapEntry instances. class StringMapEntryBase { unsigned StrLen; public: explicit StringMapEntryBase(unsigned Len) : StrLen(Len) {} - + unsigned getKeyLength() const { return StrLen; } }; - + /// StringMapImpl - This is the base class of StringMap that is shared among /// all of its instantiations. class StringMapImpl { @@ -56,11 +56,11 @@ public: /// FullHashValue - This remembers the full hash value of the key for /// easy scanning. unsigned FullHashValue; - + /// Item - This is a pointer to the actual item object. StringMapEntryBase *Item; }; - + protected: ItemBucket *TheTable; unsigned NumBuckets; @@ -77,7 +77,7 @@ protected: } StringMapImpl(unsigned InitSize, unsigned ItemSize); void RehashTable(); - + /// ShouldRehash - Return true if the table should be rehashed after a new /// element was recently inserted. bool ShouldRehash() const { @@ -87,14 +87,14 @@ protected: return NumItems*4 > NumBuckets*3 || NumBuckets-(NumItems+NumTombstones) < NumBuckets/8; } - + /// LookupBucketFor - Look up the bucket that the specified string should end /// up in. If it already exists as a key in the map, the Item pointer for the /// specified bucket will be non-null. Otherwise, it will be null. In either /// case, the FullHashValue field of the bucket will be set to the hash value /// of the string. unsigned LookupBucketFor(const char *KeyStart, const char *KeyEnd); - + /// FindKey - Look up the bucket that contains the specified key. If it exists /// in the map, return the bucket number of the key. Otherwise return -1. /// This does not modify the map. @@ -113,7 +113,7 @@ public: static StringMapEntryBase *getTombstoneVal() { return (StringMapEntryBase*)-1; } - + unsigned getNumBuckets() const { return NumBuckets; } unsigned getNumItems() const { return NumItems; } @@ -135,14 +135,14 @@ public: const ValueTy &getValue() const { return Val; } ValueTy &getValue() { return Val; } - + void setValue(const ValueTy &V) { Val = V; } - + /// getKeyData - Return the start of the string data that is the key for this /// value. The string data is always stored immediately after the /// StringMapEntry object. const char *getKeyData() const {return reinterpret_cast(this+1);} - + /// Create - Create a StringMapEntry for the specified key and default /// construct the value. template @@ -150,37 +150,37 @@ public: AllocatorTy &Allocator, InitType InitVal) { unsigned KeyLength = KeyEnd-KeyStart; - + // Okay, the item doesn't already exist, and 'Bucket' is the bucket to fill // in. Allocate a new item with space for the string at the end and a null // terminator. - + unsigned AllocSize = sizeof(StringMapEntry)+KeyLength+1; unsigned Alignment = alignof(); - + StringMapEntry *NewItem = static_cast(Allocator.Allocate(AllocSize,Alignment)); - + // Default construct the value. new (NewItem) StringMapEntry(KeyLength); - + // Copy the string information. char *StrBuffer = const_cast(NewItem->getKeyData()); memcpy(StrBuffer, KeyStart, KeyLength); StrBuffer[KeyLength] = 0; // Null terminate for convenience of clients. - + // Initialize the value if the client wants to. StringMapEntryInitializer::Initialize(*NewItem, InitVal); return NewItem; } - + template static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd, AllocatorTy &Allocator) { return Create(KeyStart, KeyEnd, Allocator, (void*)0); } - - + + /// Create - Create a StringMapEntry with normal malloc/free. template static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd, @@ -192,20 +192,20 @@ public: static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd) { return Create(KeyStart, KeyEnd, (void*)0); } - + /// GetStringMapEntryFromValue - Given a value that is known to be embedded /// into a StringMapEntry, return the StringMapEntry itself. static StringMapEntry &GetStringMapEntryFromValue(ValueTy &V) { StringMapEntry *EPtr = 0; - char *Ptr = reinterpret_cast(&V) - - (reinterpret_cast(&EPtr->Val) - + char *Ptr = reinterpret_cast(&V) - + (reinterpret_cast(&EPtr->Val) - reinterpret_cast(EPtr)); return *reinterpret_cast(Ptr); } static const StringMapEntry &GetStringMapEntryFromValue(const ValueTy &V) { return GetStringMapEntryFromValue(const_cast(V)); } - + /// Destroy - Destroy this StringMapEntry, releasing memory back to the /// specified allocator. template @@ -214,7 +214,7 @@ public: this->~StringMapEntry(); Allocator.Deallocate(this); } - + /// Destroy this object, releasing memory back to the malloc allocator. void Destroy() { MallocAllocator A; @@ -235,13 +235,13 @@ public: StringMap() : StringMapImpl(sizeof(MapEntryTy)) {} explicit StringMap(unsigned InitialSize) : StringMapImpl(InitialSize, sizeof(MapEntryTy)) {} - + AllocatorTy &getAllocator() { return Allocator; } const AllocatorTy &getAllocator() const { return Allocator; } typedef StringMapConstIterator const_iterator; typedef StringMapIterator iterator; - + iterator begin() { return iterator(TheTable, NumBuckets == 0); } @@ -254,7 +254,7 @@ public: const_iterator end() const { return const_iterator(TheTable+NumBuckets, true); } - + iterator find(const char *KeyStart, const char *KeyEnd) { int Bucket = FindKey(KeyStart, KeyEnd); if (Bucket == -1) return end(); @@ -266,7 +266,7 @@ public: if (Bucket == -1) return end(); return const_iterator(TheTable+Bucket); } - + /// insert - Insert the specified key/value pair into the map. If the key /// already exists in the map, return false and ignore the request, otherwise /// insert it and return true. @@ -275,63 +275,63 @@ public: LookupBucketFor(KeyValue->getKeyData(), KeyValue->getKeyData()+KeyValue->getKeyLength()); ItemBucket &Bucket = TheTable[BucketNo]; - if (Bucket.Item && Bucket.Item != getTombstoneVal()) + if (Bucket.Item && Bucket.Item != getTombstoneVal()) return false; // Already exists in map. - + if (Bucket.Item == getTombstoneVal()) --NumTombstones; Bucket.Item = KeyValue; ++NumItems; - + if (ShouldRehash()) RehashTable(); return true; } - + /// GetOrCreateValue - Look up the specified key in the table. If a value /// exists, return it. Otherwise, default construct a value, insert it, and /// return. template - StringMapEntry &GetOrCreateValue(const char *KeyStart, + StringMapEntry &GetOrCreateValue(const char *KeyStart, const char *KeyEnd, InitTy Val) { unsigned BucketNo = LookupBucketFor(KeyStart, KeyEnd); ItemBucket &Bucket = TheTable[BucketNo]; if (Bucket.Item && Bucket.Item != getTombstoneVal()) return *static_cast(Bucket.Item); - + MapEntryTy *NewItem = MapEntryTy::Create(KeyStart, KeyEnd, Allocator, Val); - + if (Bucket.Item == getTombstoneVal()) --NumTombstones; ++NumItems; - + // Fill in the bucket for the hash table. The FullHashValue was already // filled in by LookupBucketFor. Bucket.Item = NewItem; - + if (ShouldRehash()) RehashTable(); return *NewItem; } - - StringMapEntry &GetOrCreateValue(const char *KeyStart, + + StringMapEntry &GetOrCreateValue(const char *KeyStart, const char *KeyEnd) { return GetOrCreateValue(KeyStart, KeyEnd, (void*)0); } - + /// remove - Remove the specified key/value pair from the map, but do not /// erase it. This aborts if the key is not in the map. void remove(MapEntryTy *KeyValue) { RemoveKey(KeyValue); } - + void erase(iterator I) { MapEntryTy &V = *I; remove(&V); V.Destroy(Allocator); } - + ~StringMap() { for (ItemBucket *I = TheTable, *E = TheTable+NumBuckets; I != E; ++I) { if (I->Item && I->Item != getTombstoneVal()) @@ -343,7 +343,7 @@ private: StringMap(const StringMap &); // FIXME: Implement. void operator=(const StringMap &); // FIXME: Implement. }; - + template class StringMapConstIterator { @@ -355,21 +355,21 @@ public: : Ptr(Bucket) { if (!NoAdvance) AdvancePastEmptyBuckets(); } - + const StringMapEntry &operator*() const { return *static_cast*>(Ptr->Item); } const StringMapEntry *operator->() const { return static_cast*>(Ptr->Item); } - + bool operator==(const StringMapConstIterator &RHS) const { return Ptr == RHS.Ptr; } bool operator!=(const StringMapConstIterator &RHS) const { return Ptr != RHS.Ptr; } - + inline StringMapConstIterator& operator++() { // Preincrement ++Ptr; AdvancePastEmptyBuckets(); @@ -378,7 +378,7 @@ public: StringMapConstIterator operator++(int) { // Postincrement StringMapConstIterator tmp = *this; ++*this; return tmp; } - + private: void AdvancePastEmptyBuckets() { while (Ptr->Item == 0 || Ptr->Item == StringMapImpl::getTombstoneVal()) @@ -388,7 +388,7 @@ private: template class StringMapIterator : public StringMapConstIterator { -public: +public: explicit StringMapIterator(StringMapImpl::ItemBucket *Bucket, bool NoAdvance = false) : StringMapConstIterator(Bucket, NoAdvance) { @@ -404,4 +404,3 @@ public: } #endif -