maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove const_casts by propagating constness down to called functions. 

llvm-svn: 166287
This commit is contained in:
Dmitri Gribenko 2012-10-19 16:51:38 +00:00
parent a225ed8d2b
commit 923f305b2e
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/AST/Comment.h
View File

@ -706,8 +706,8 @@ public:
return getNumArgs() > 0;
}
StringRef getParamName(comments::FullComment *FC) const;
StringRef getParamName(const FullComment *FC) const;
StringRef getParamNameAsWritten() const {
return Args[0].Text;
}
@ -763,8 +763,8 @@ public:
return getNumArgs() > 0;
}
StringRef getParamName(comments::FullComment *FC) const;
StringRef getParamName(const FullComment *FC) const;
StringRef getParamNameAsWritten() const {
return Args[0].Text;
}

6
clang/lib/AST/Comment.cpp
View File

@ -305,12 +305,12 @@ void DeclInfo::fill() {
IsFilled = true;
}
StringRef ParamCommandComment::getParamName(comments::FullComment *FC) const {
StringRef ParamCommandComment::getParamName(const FullComment *FC) const {
assert(isParamIndexValid());
return FC->getThisDeclInfo()->ParamVars[getParamIndex()]->getName();
}
StringRef TParamCommandComment::getParamName(comments::FullComment *FC) const {
StringRef TParamCommandComment::getParamName(const FullComment *FC) const {
assert(isPositionValid());
const TemplateParameterList *TPL = FC->getThisDeclInfo()->TemplateParameters;
for (unsigned i = 0, e = getDepth(); i != e; ++i) {
@ -323,7 +323,7 @@ StringRef TParamCommandComment::getParamName(comments::FullComment *FC) const {
}
return "";
}
} // end namespace comments
} // end namespace clang

4
clang/lib/AST/CommentDumper.cpp
View File

@ -188,7 +188,7 @@ void CommentDumper::visitParamCommandComment(const ParamCommandComment *C) {
if (C->hasParamName()) {
if (C->isParamIndexValid())
OS << " Param=\"" << C->getParamName(const_cast<FullComment*>(FC)) << "\"";
OS << " Param=\"" << C->getParamName(FC) << "\"";
else
OS << " Param=\"" << C->getParamNameAsWritten() << "\"";
}
@ -202,7 +202,7 @@ void CommentDumper::visitTParamCommandComment(const TParamCommandComment *C) {
if (C->hasParamName()) {
if (C->isPositionValid())
OS << " Param=\"" << C->getParamName(const_cast<FullComment*>(FC)) << "\"";
OS << " Param=\"" << C->getParamName(FC) << "\"";
else
OS << " Param=\"" << C->getParamNameAsWritten() << "\"";
}

16
clang/tools/libclang/CXComment.cpp
View File

@ -536,7 +536,7 @@ class CommentASTToHTMLConverter :
public ConstCommentVisitor<CommentASTToHTMLConverter> {
public:
/// \param Str accumulator for HTML.
CommentASTToHTMLConverter(FullComment *FC,
CommentASTToHTMLConverter(const FullComment *FC,
SmallVectorImpl<char> &Str,
const CommandTraits &Traits) :
FC(FC), Result(Str), Traits(Traits)
@ -568,7 +568,7 @@ public:
void appendToResultWithHTMLEscaping(StringRef S);
private:
FullComment *FC;
const FullComment *FC;
/// Output stream for HTML.
llvm::raw_svector_ostream Result;
@ -844,8 +844,7 @@ CXString clang_FullComment_getAsHTML(CXComment CXC) {
return createCXString((const char *) 0);
SmallString<1024> HTML;
CommentASTToHTMLConverter Converter(const_cast<FullComment *>(FC),
HTML, getCommandTraits(CXC));
CommentASTToHTMLConverter Converter(FC, HTML, getCommandTraits(CXC));
Converter.visit(FC);
return createCXString(HTML.str(), /* DupString = */ true);
}
@ -857,7 +856,7 @@ class CommentASTToXMLConverter :
public ConstCommentVisitor<CommentASTToXMLConverter> {
public:
/// \param Str accumulator for XML.
CommentASTToXMLConverter(FullComment *FC,
CommentASTToXMLConverter(const FullComment *FC,
SmallVectorImpl<char> &Str,
const CommandTraits &Traits,
const SourceManager &SM) :
@ -884,8 +883,8 @@ public:
void appendToResultWithXMLEscaping(StringRef S);
private:
FullComment *FC;
const FullComment *FC;
/// Output stream for XML.
llvm::raw_svector_ostream Result;
@ -1325,8 +1324,7 @@ CXString clang_FullComment_getAsXML(CXComment CXC) {
SourceManager &SM = static_cast<ASTUnit *>(TU->TUData)->getSourceManager();
SmallString<1024> XML;
CommentASTToXMLConverter Converter(const_cast<FullComment *>(FC), XML,
getCommandTraits(CXC), SM);
CommentASTToXMLConverter Converter(FC, XML, getCommandTraits(CXC), SM);
Converter.visit(FC);
return createCXString(XML.str(), /* DupString = */ true);
}