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

Comment AST nodes: rename getXXXCount() methods to getNumXXXs() to be in line with Statement AST nodes. 

llvm-svn: 160182
This commit is contained in:
Dmitri Gribenko 2012-07-13 19:02:42 +00:00
parent 4b7b5aa0bc
commit 619e75eb96
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,7 @@ public:
getLocEnd()); getLocEnd());
} }
unsigned getArgCount() const { unsigned getNumArgs() const {
return Args.size(); return Args.size();
} }
@ -354,7 +354,7 @@ public:
child_iterator child_end() const { return NULL; } child_iterator child_end() const { return NULL; }
unsigned getAttrCount() const { unsigned getNumAttrs() const {
return Attributes.size(); return Attributes.size();
} }
@ -532,7 +532,7 @@ public:
getLocStart().getLocWithOffset(1 + Name.size())); getLocStart().getLocWithOffset(1 + Name.size()));
} }
unsigned getArgCount() const { unsigned getNumArgs() const {
return Args.size(); return Args.size();
} }
@ -611,7 +611,7 @@ public:
} }
bool hasParamName() const { bool hasParamName() const {
return getArgCount() > 0; return getNumArgs() > 0;
} }
StringRef getParamName() const { StringRef getParamName() const {
@ -708,7 +708,7 @@ public:
return CloseName; return CloseName;
} }
unsigned getLineCount() const { unsigned getNumLines() const {
return Lines.size(); return Lines.size();
} }

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

@ -106,7 +106,7 @@ void CommentDumper::visitTextComment(const TextComment *C) {
void CommentDumper::visitInlineCommandComment(const InlineCommandComment *C) { void CommentDumper::visitInlineCommandComment(const InlineCommandComment *C) {
dumpComment(C); dumpComment(C);
for (unsigned i = 0, e = C->getArgCount(); i != e; ++i) for (unsigned i = 0, e = C->getNumArgs(); i != e; ++i)
OS << " Arg[" << i << "]=\"" << C->getArgText(i) << "\""; OS << " Arg[" << i << "]=\"" << C->getArgText(i) << "\"";
} }
@ -114,9 +114,9 @@ void CommentDumper::visitHTMLStartTagComment(const HTMLStartTagComment *C) {
dumpComment(C); dumpComment(C);
OS << " Name=\"" << C->getTagName() << "\""; OS << " Name=\"" << C->getTagName() << "\"";
if (C->getAttrCount() != 0) { if (C->getNumAttrs() != 0) {
OS << " Attrs: "; OS << " Attrs: ";
for (unsigned i = 0, e = C->getAttrCount(); i != e; ++i) { for (unsigned i = 0, e = C->getNumAttrs(); i != e; ++i) {
const HTMLStartTagComment::Attribute &Attr = C->getAttr(i); const HTMLStartTagComment::Attribute &Attr = C->getAttr(i);
OS << " \"" << Attr.Name << "=\"" << Attr.Value << "\""; OS << " \"" << Attr.Name << "=\"" << Attr.Value << "\"";
} }

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

@ -130,7 +130,7 @@ ParamCommandComment *Sema::actOnParamCommandParamNameArg(
SourceLocation ArgLocEnd, SourceLocation ArgLocEnd,
StringRef Arg) { StringRef Arg) {
// Parser will not feed us more arguments than needed. // Parser will not feed us more arguments than needed.
assert(Command->getArgCount() == 0); assert(Command->getNumArgs() == 0);
if (!Command->isDirectionExplicit()) { if (!Command->isDirectionExplicit()) {
// User didn't provide a direction argument. // User didn't provide a direction argument.
@ -362,8 +362,8 @@ void Sema::checkBlockCommandEmptyParagraph(BlockCommandComment *Command) {
ParagraphComment *Paragraph = Command->getParagraph(); ParagraphComment *Paragraph = Command->getParagraph();
if (Paragraph->isWhitespace()) { if (Paragraph->isWhitespace()) {
SourceLocation DiagLoc; SourceLocation DiagLoc;
if (Command->getArgCount() > 0) if (Command->getNumArgs() > 0)
DiagLoc = Command->getArgRange(Command->getArgCount() - 1).getEnd(); DiagLoc = Command->getArgRange(Command->getNumArgs() - 1).getEnd();
if (!DiagLoc.isValid()) if (!DiagLoc.isValid())
DiagLoc = Command->getCommandNameRange().getEnd(); DiagLoc = Command->getCommandNameRange().getEnd();
Diag(DiagLoc, diag::warn_doc_block_command_empty_paragraph) Diag(DiagLoc, diag::warn_doc_block_command_empty_paragraph)

30
clang/unittests/AST/CommentParser.cpp
View File

@ -244,9 +244,9 @@ struct NoArgs {};
if (!AR) if (!AR)
return AR; return AR;
if (ICC->getArgCount() != 0) if (ICC->getNumArgs() != 0)
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "InlineCommandComment has " << ICC->getArgCount() << " arg(s), " << "InlineCommandComment has " << ICC->getNumArgs() << " arg(s), "
"expected 0"; "expected 0";
return ::testing::AssertionSuccess(); return ::testing::AssertionSuccess();
@ -261,9 +261,9 @@ struct NoArgs {};
if (!AR) if (!AR)
return AR; return AR;
if (ICC->getArgCount() != 1) if (ICC->getNumArgs() != 1)
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "InlineCommandComment has " << ICC->getArgCount() << " arg(s), " << "InlineCommandComment has " << ICC->getNumArgs() << " arg(s), "
"expected 1"; "expected 1";
StringRef ActualArg = ICC->getArgText(0); StringRef ActualArg = ICC->getArgText(0);
@ -326,9 +326,9 @@ struct NoAttrs {};
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "HTMLStartTagComment is self-closing"; << "HTMLStartTagComment is self-closing";
if (HST->getAttrCount() != 0) if (HST->getNumAttrs() != 0)
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "HTMLStartTagComment has " << HST->getAttrCount() << " attr(s), " << "HTMLStartTagComment has " << HST->getNumAttrs() << " attr(s), "
"expected 0"; "expected 0";
return ::testing::AssertionSuccess(); return ::testing::AssertionSuccess();
@ -348,9 +348,9 @@ struct NoAttrs {};
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "HTMLStartTagComment is self-closing"; << "HTMLStartTagComment is self-closing";
if (HST->getAttrCount() != 1) if (HST->getNumAttrs() != 1)
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "HTMLStartTagComment has " << HST->getAttrCount() << " attr(s), " << "HTMLStartTagComment has " << HST->getNumAttrs() << " attr(s), "
"expected 1"; "expected 1";
StringRef ActualName = HST->getAttr(0).Name; StringRef ActualName = HST->getAttr(0).Name;
@ -413,9 +413,9 @@ struct NoLines {};
if (!AR) if (!AR)
return AR; return AR;
if (VBC->getLineCount() != 0) if (VBC->getNumLines() != 0)
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "VerbatimBlockComment has " << VBC->getLineCount() << " lines(s), " << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
"expected 0"; "expected 0";
return ::testing::AssertionSuccess(); return ::testing::AssertionSuccess();
@ -430,9 +430,9 @@ struct NoLines {};
if (!AR) if (!AR)
return AR; return AR;
if (VBC->getLineCount() != 1) if (VBC->getNumLines() != 1)
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "VerbatimBlockComment has " << VBC->getLineCount() << " lines(s), " << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
"expected 1"; "expected 1";
StringRef ActualLine0 = VBC->getText(0); StringRef ActualLine0 = VBC->getText(0);
@ -454,9 +454,9 @@ struct NoLines {};
if (!AR) if (!AR)
return AR; return AR;
if (VBC->getLineCount() != 2) if (VBC->getNumLines() != 2)
return ::testing::AssertionFailure() return ::testing::AssertionFailure()
<< "VerbatimBlockComment has " << VBC->getLineCount() << " lines(s), " << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
"expected 2"; "expected 2";
StringRef ActualLine0 = VBC->getText(0); StringRef ActualLine0 = VBC->getText(0);
@ -1110,7 +1110,7 @@ TEST_F(CommentParserTest, VerbatimBlock6) {
{ {
VerbatimBlockComment *VBC; VerbatimBlockComment *VBC;
ASSERT_TRUE(HasVerbatimBlockAt(FC, 1, VBC, "verbatim")); ASSERT_TRUE(HasVerbatimBlockAt(FC, 1, VBC, "verbatim"));
ASSERT_EQ(4U, VBC->getLineCount()); ASSERT_EQ(4U, VBC->getNumLines());
ASSERT_EQ(" Aaa", VBC->getText(0)); ASSERT_EQ(" Aaa", VBC->getText(0));
ASSERT_EQ("", VBC->getText(1)); ASSERT_EQ("", VBC->getText(1));
ASSERT_EQ(" Bbb", VBC->getText(2)); ASSERT_EQ(" Bbb", VBC->getText(2));