6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-04 21:31:03 +00:00
Code Issues Projects Releases Wiki Activity

The key of a StringMap can contain nul's in it, so having first() return

Browse Source 
const char* doesn't make sense.  Have it return StringRef instead.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135167 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2011-07-14 18:31:43 +00:00
parent 154c535888
commit d7c027322e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/ADT/StringMap.h
View File

@ -140,7 +140,7 @@ public:
/// StringMapEntry object. /// StringMapEntry object.
const char *getKeyData() const {return reinterpret_cast<const char*>(this+1);} const char *getKeyData() const {return reinterpret_cast<const char*>(this+1);}
const char *first() const { return getKeyData(); } StringRef first() const { return StringRef(getKeyData(), getKeyLength()); }
/// Create - Create a StringMapEntry for the specified key and default /// Create - Create a StringMapEntry for the specified key and default
/// construct the value. /// construct the value.

6
unittests/ADT/StringMapTest.cpp
View File

@ -51,7 +51,7 @@ protected:
// Iterator tests // Iterator tests
StringMap<uint32_t>::iterator it = testMap.begin(); StringMap<uint32_t>::iterator it = testMap.begin();
EXPECT_STREQ(testKey, it->first()); EXPECT_STREQ(testKey, it->first().data());
EXPECT_EQ(testValue, it->second); EXPECT_EQ(testValue, it->second);
++it; ++it;
EXPECT_TRUE(it == testMap.end()); EXPECT_TRUE(it == testMap.end());
@ -157,7 +157,7 @@ TEST_F(StringMapTest, IterationTest) {
it != testMap.end(); ++it) { it != testMap.end(); ++it) {
std::stringstream ss; std::stringstream ss;
ss << "key_" << it->second; ss << "key_" << it->second;
ASSERT_STREQ(ss.str().c_str(), it->first()); ASSERT_STREQ(ss.str().c_str(), it->first().data());
visited[it->second] = true; visited[it->second] = true;
} }
@ -189,7 +189,7 @@ TEST_F(StringMapTest, StringMapEntryTest) {
StringMap<uint32_t>::value_type* entry = StringMap<uint32_t>::value_type* entry =
StringMap<uint32_t>::value_type::Create( StringMap<uint32_t>::value_type::Create(
testKeyFirst, testKeyFirst + testKeyLength, 1u); testKeyFirst, testKeyFirst + testKeyLength, 1u);
EXPECT_STREQ(testKey, entry->first()); EXPECT_STREQ(testKey, entry->first().data());
EXPECT_EQ(1u, entry->second); EXPECT_EQ(1u, entry->second);
free(entry); free(entry);
} }