From 5563df30b9c8d1fe87a54baae0d6bd86642563f4 Mon Sep 17 00:00:00 2001
From: rdivacky <rdivacky@FreeBSD.org>
Date: Fri, 23 Oct 2009 14:22:18 +0000
Subject: Update clang to r84949.
---
lib/Basic/IdentifierTable.cpp | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
(limited to 'lib/Basic/IdentifierTable.cpp')
diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index 93c260f..16aa0c5 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -16,6 +16,7 @@
#include "clang/Basic/LangOptions.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/DenseMap.h"
+#include "llvm/Support/raw_ostream.h"
#include <cstdio>
using namespace clang;
@@ -153,7 +154,7 @@ tok::PPKeywordKind IdentifierInfo::getPPKeywordID() const {
unsigned Len = getLength();
if (Len < 2) return tok::pp_not_keyword;
- const char *Name = getName();
+ const char *Name = getNameStart();
switch (HASH(Len, Name[0], Name[2])) {
default: return tok::pp_not_keyword;
CASE( 2, 'i', '\0', if);
@@ -301,24 +302,15 @@ IdentifierInfo *Selector::getIdentifierInfoForSlot(unsigned argIndex) const {
}
std::string MultiKeywordSelector::getName() const {
- std::string Result;
- unsigned Length = 0;
+ llvm::SmallString<256> Str;
+ llvm::raw_svector_ostream OS(Str);
for (keyword_iterator I = keyword_begin(), E = keyword_end(); I != E; ++I) {
if (*I)
- Length += (*I)->getLength();
- ++Length; // :
+ OS << (*I)->getName();
+ OS << ':';
}
- Result.reserve(Length);
-
- for (keyword_iterator I = keyword_begin(), E = keyword_end(); I != E; ++I) {
- if (*I)
- Result.insert(Result.end(), (*I)->getName(),
- (*I)->getName()+(*I)->getLength());
- Result.push_back(':');
- }
-
- return Result;
+ return OS.str();
}
std::string Selector::getAsString() const {
@@ -332,9 +324,10 @@ std::string Selector::getAsString() const {
if (getNumArgs() == 0)
return II->getName();
- std::string Res = II ? II->getName() : "";
- Res += ":";
- return Res;
+ if (!II)
+ return ":";
+
+ return II->getName().str() + ":";
}
// We have a multiple keyword selector (no embedded flags).
--
cgit v1.1