moved some simple client calls from NamedDecl::getNameAsString to
NamedDecl::getName . Other calls are more complicated but I do intend to fix
them
http://reviews.llvm.org/D6132
Files:
examples/PrintFunctionNames/PrintFunctionNames.cpp
include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
lib/ARCMigrate/ObjCMT.cpp
lib/AST/ASTDiagnostic.cpp
lib/AST/ASTDumper.cpp
lib/Frontend/FrontendAction.cpp
lib/Sema/AnalysisBasedWarnings.cpp
lib/Sema/SemaDeclAttr.cpp
Index: examples/PrintFunctionNames/PrintFunctionNames.cpp
===================================================================
--- examples/PrintFunctionNames/PrintFunctionNames.cpp
+++ examples/PrintFunctionNames/PrintFunctionNames.cpp
@@ -27,7 +27,7 @@
for (DeclGroupRef::iterator i = DG.begin(), e = DG.end(); i != e; ++i) {
const Decl *D = *i;
if (const NamedDecl *ND = dyn_cast<NamedDecl>(D))
- llvm::errs() << "top-level-decl: \"" << ND->getNameAsString() << "\"\n";
+ llvm::errs() << "top-level-decl: \"" << ND->getName() << "\"\n";
}
return true;
Index: include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
===================================================================
--- include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
+++ include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
@@ -607,7 +607,7 @@
}
void printLiteralPtr(const LiteralPtr *E, StreamType &SS) {
- SS << E->clangDecl()->getNameAsString();
+ SS << E->clangDecl()->getName();
}
void printVariable(const Variable *V, StreamType &SS, bool IsVarDecl=false) {
Index: lib/ARCMigrate/ObjCMT.cpp
===================================================================
--- lib/ARCMigrate/ObjCMT.cpp
+++ lib/ARCMigrate/ObjCMT.cpp
@@ -481,7 +481,7 @@
// Property with no setter may be suggested as a 'readonly' property.
if (!Setter)
append_attr(PropertyString, "readonly", LParenAdded);
-
+
// Short circuit 'delegate' properties that contain the name "delegate" or
// "dataSource", or have exact name "target" to have 'assign' attribute.
Index: lib/AST/ASTDiagnostic.cpp
===================================================================
--- lib/AST/ASTDiagnostic.cpp
+++ lib/AST/ASTDiagnostic.cpp
@@ -1429,7 +1429,7 @@
if (!Tree.HasChildren()) {
// If we're dealing with a template specialization with zero
// arguments, there are no children; special-case this.
- OS << FromTD->getNameAsString() << "<>";
+ OS << FromTD->getName() << "<>";
return;
}
@@ -1437,7 +1437,7 @@
Tree.GetNode(FromQual, ToQual);
PrintQualifiers(FromQual, ToQual);
- OS << FromTD->getNameAsString() << '<';
+ OS << FromTD->getName() << '<';
Tree.MoveToChild();
unsigned NumElideArgs = 0;
do {
@@ -1595,7 +1595,7 @@
}
if (Same) {
- OS << "template " << FromTD->getNameAsString();
+ OS << "template " << FromTD->getName();
} else if (!PrintTree) {
OS << (FromDefault ? "(default) template " : "template ");
Bold();
Index: lib/AST/ASTDumper.cpp
===================================================================
--- lib/AST/ASTDumper.cpp
+++ lib/AST/ASTDumper.cpp
@@ -707,7 +707,7 @@
void ASTDumper::dumpName(const NamedDecl *ND) {
if (ND->getDeclName()) {
ColorScope Color(*this, DeclNameColor);
- OS << ' ' << ND->getNameAsString();
+ OS << ' ' << ND->getName();
}
}
@@ -1347,20 +1347,20 @@
void ASTDumper::VisitUsingDecl(const UsingDecl *D) {
OS << ' ';
D->getQualifier()->print(OS, D->getASTContext().getPrintingPolicy());
- OS << D->getNameAsString();
+ OS << D->getName();
}
void ASTDumper::VisitUnresolvedUsingTypenameDecl(
const UnresolvedUsingTypenameDecl *D) {
OS << ' ';
D->getQualifier()->print(OS, D->getASTContext().getPrintingPolicy());
- OS << D->getNameAsString();
+ OS << D->getName();
}
void ASTDumper::VisitUnresolvedUsingValueDecl(const UnresolvedUsingValueDecl *D) {
OS << ' ';
D->getQualifier()->print(OS, D->getASTContext().getPrintingPolicy());
- OS << D->getNameAsString();
+ OS << D->getName();
dumpType(D->getType());
}
Index: lib/Frontend/FrontendAction.cpp
===================================================================
--- lib/Frontend/FrontendAction.cpp
+++ lib/Frontend/FrontendAction.cpp
@@ -115,7 +115,7 @@
= Ctx.getDiagnostics().getCustomDiagID(DiagnosticsEngine::Error,
"%0 was deserialized");
Ctx.getDiagnostics().Report(Ctx.getFullLoc(D->getLocation()), DiagID)
- << ND->getNameAsString();
+ << ND->getName();
}
DelegatingDeserializationListener::DeclRead(ID, D);
Index: lib/Sema/AnalysisBasedWarnings.cpp
===================================================================
--- lib/Sema/AnalysisBasedWarnings.cpp
+++ lib/Sema/AnalysisBasedWarnings.cpp
@@ -1451,7 +1451,7 @@
if (Verbose && CurrentFunction) {
PartialDiagnosticAt FNote(CurrentFunction->getBody()->getLocStart(),
S.PDiag(diag::note_thread_warning_in_fun)
- << CurrentFunction->getNameAsString());
+ << CurrentFunction->getName());
return OptionalNotes(1, FNote);
}
return OptionalNotes();
@@ -1462,7 +1462,7 @@
if (Verbose && CurrentFunction) {
PartialDiagnosticAt FNote(CurrentFunction->getBody()->getLocStart(),
S.PDiag(diag::note_thread_warning_in_fun)
- << CurrentFunction->getNameAsString());
+ << CurrentFunction->getName());
ONS.push_back(FNote);
}
return ONS;
@@ -1476,7 +1476,7 @@
if (Verbose && CurrentFunction) {
PartialDiagnosticAt FNote(CurrentFunction->getBody()->getLocStart(),
S.PDiag(diag::note_thread_warning_in_fun)
- << CurrentFunction->getNameAsString());
+ << CurrentFunction->getName());
ONS.push_back(FNote);
}
return ONS;
@@ -1592,7 +1592,7 @@
diag::warn_variable_requires_any_lock:
diag::warn_var_deref_requires_any_lock;
PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID)
- << D->getNameAsString() << getLockKindFromAccessKind(AK));
+ << D->getName() << getLockKindFromAccessKind(AK));
Warnings.push_back(DelayedDiag(Warning, getNotes()));
}
@@ -1620,14 +1620,14 @@
break;
}
PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) << Kind
- << D->getNameAsString()
+ << D->getName()
<< LockName << LK);
PartialDiagnosticAt Note(Loc, S.PDiag(diag::note_found_mutex_near_match)
<< *PossibleMatch);
if (Verbose && POK == POK_VarAccess) {
PartialDiagnosticAt VNote(D->getLocation(),
S.PDiag(diag::note_guarded_by_declared_here)
- << D->getNameAsString());
+ << D->getName());
Warnings.push_back(DelayedDiag(Warning, getNotes(Note, VNote)));
} else
Warnings.push_back(DelayedDiag(Warning, getNotes(Note)));
@@ -1650,12 +1650,12 @@
break;
}
PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) << Kind
- << D->getNameAsString()
+ << D->getName()
<< LockName << LK);
if (Verbose && POK == POK_VarAccess) {
PartialDiagnosticAt Note(D->getLocation(),
S.PDiag(diag::note_guarded_by_declared_here)
- << D->getNameAsString());
+ << D->getName());
Warnings.push_back(DelayedDiag(Warning, getNotes(Note)));
} else
Warnings.push_back(DelayedDiag(Warning, getNotes()));
Index: lib/Sema/SemaDeclAttr.cpp
===================================================================
--- lib/Sema/SemaDeclAttr.cpp
+++ lib/Sema/SemaDeclAttr.cpp
@@ -2991,7 +2991,7 @@
Diag(Range.getBegin(), diag::err_mismatched_ms_inheritance)
<< 0 /*definition*/;
Diag(RD->getDefinition()->getLocation(), diag::note_defined_here)
- << RD->getNameAsString();
+ << RD->getName();
return true;
}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
