<div dir="ltr">Thanks for all these fixups!<div><br></div><div>Tiny note:<br><div><br></div><div><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">- StringRef line = (*I).trim();</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">+ StringRef Line = (*I).trim();</span></div><div><font color="#000000" face="arial, sans-serif"><br></font></div><div><font color="#000000" face="arial, sans-serif">I think you can simplify `(*I).trim()` to `I->trim()`.</font></div>
<div><font color="#000000" face="arial, sans-serif"><br></font></div><div><font color="#000000" face="arial, sans-serif">-- Sean Silva<br></font><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 9, 2013 at 6:52 AM, John Thompson <span dir="ltr"><<a href="mailto:John.Thompson.JTSoftware@gmail.com" target="_blank">John.Thompson.JTSoftware@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: jtsoftware<br>
Date: Fri Aug 9 08:52:09 2013<br>
New Revision: 188070<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=188070&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=188070&view=rev</a><br>
Log:<br>
Fixed coding convention naming issue - variable names start with uppercase.<br>
<br>
Modified:<br>
clang-tools-extra/trunk/modularize/Modularize.cpp<br>
<br>
Modified: clang-tools-extra/trunk/modularize/Modularize.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Modularize.cpp?rev=188070&r1=188069&r2=188070&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Modularize.cpp?rev=188070&r1=188069&r2=188070&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/modularize/Modularize.cpp (original)<br>
+++ clang-tools-extra/trunk/modularize/Modularize.cpp Fri Aug 9 08:52:09 2013<br>
@@ -175,45 +175,45 @@ cl::opt<std::string> HeaderPrefix(<br>
" the files are considered to be relative to the header list file."));<br>
<br>
// Read the header list file and collect the header file names.<br>
-error_code getHeaderFileNames(SmallVectorImpl<std::string> &headerFileNames,<br>
- StringRef listFileName, StringRef headerPrefix) {<br>
+error_code getHeaderFileNames(SmallVectorImpl<std::string> &HeaderFileNames,<br>
+ StringRef ListFileName, StringRef HeaderPrefix) {<br>
<br>
// By default, use the path component of the list file name.<br>
- SmallString<256> headerDirectory(listFileName);<br>
- sys::path::remove_filename(headerDirectory);<br>
+ SmallString<256> HeaderDirectory(ListFileName);<br>
+ sys::path::remove_filename(HeaderDirectory);<br>
<br>
// Get the prefix if we have one.<br>
- if (headerPrefix.size() != 0)<br>
- headerDirectory = headerPrefix;<br>
+ if (HeaderPrefix.size() != 0)<br>
+ HeaderDirectory = HeaderPrefix;<br>
<br>
// Read the header list file into a buffer.<br>
OwningPtr<MemoryBuffer> listBuffer;<br>
- if (error_code ec = MemoryBuffer::getFile(listFileName, listBuffer)) {<br>
+ if (error_code ec = MemoryBuffer::getFile(ListFileName, listBuffer)) {<br>
return ec;<br>
}<br>
<br>
// Parse the header list into strings.<br>
- SmallVector<StringRef, 32> strings;<br>
- listBuffer->getBuffer().split(strings, "\n", -1, false);<br>
+ SmallVector<StringRef, 32> Strings;<br>
+ listBuffer->getBuffer().split(Strings, "\n", -1, false);<br>
<br>
// Collect the header file names from the string list.<br>
- for (SmallVectorImpl<StringRef>::iterator I = strings.begin(),<br>
- E = strings.end();<br>
+ for (SmallVectorImpl<StringRef>::iterator I = Strings.begin(),<br>
+ E = Strings.end();<br>
I != E; ++I) {<br>
- StringRef line = (*I).trim();<br>
+ StringRef Line = (*I).trim();<br>
// Ignore comments and empty lines.<br>
- if (line.empty() || (line[0] == '#'))<br>
+ if (Line.empty() || (Line[0] == '#'))<br>
continue;<br>
- SmallString<256> headerFileName;<br>
+ SmallString<256> HeaderFileName;<br>
// Prepend header file name prefix if it's not absolute.<br>
- if (sys::path::is_absolute(line))<br>
- headerFileName = line;<br>
+ if (sys::path::is_absolute(Line))<br>
+ HeaderFileName = Line;<br>
else {<br>
- headerFileName = headerDirectory;<br>
- sys::path::append(headerFileName, line);<br>
+ HeaderFileName = HeaderDirectory;<br>
+ sys::path::append(HeaderFileName, Line);<br>
}<br>
// Save the resulting header file path.<br>
- headerFileNames.push_back(headerFileName.str());<br>
+ HeaderFileNames.push_back(HeaderFileName.str());<br>
}<br>
<br>
return error_code::success();<br>
@@ -513,10 +513,10 @@ private:<br>
PreprocessorTracker &PPTracker;<br>
};<br>
<br>
-int main(int argc, const char **argv) {<br>
+int main(int Argc, const char **Argv) {<br>
<br>
// This causes options to be parsed.<br>
- cl::ParseCommandLineOptions(argc, argv, "modularize.\n");<br>
+ cl::ParseCommandLineOptions(Argc, Argv, "modularize.\n");<br>
<br>
// No go if we have no header list file.<br>
if (ListFileName.size() == 0) {<br>
@@ -526,9 +526,9 @@ int main(int argc, const char **argv) {<br>
<br>
// Get header file names.<br>
SmallVector<std::string, 32> Headers;<br>
- if (error_code ec = getHeaderFileNames(Headers, ListFileName, HeaderPrefix)) {<br>
- errs() << argv[0] << ": error: Unable to get header list '" << ListFileName<br>
- << "': " << ec.message() << '\n';<br>
+ if (error_code EC = getHeaderFileNames(Headers, ListFileName, HeaderPrefix)) {<br>
+ errs() << Argv[0] << ": error: Unable to get header list '" << ListFileName<br>
+ << "': " << EC.message() << '\n';<br>
return 1;<br>
}<br>
<br>
@@ -552,10 +552,10 @@ int main(int argc, const char **argv) {<br>
typedef SmallVector<Location, 8> LocationArray;<br>
typedef SmallVector<LocationArray, Entry::EK_NumberOfKinds> EntryBinArray;<br>
EntryBinArray EntryBins;<br>
- int kindIndex;<br>
- for (kindIndex = 0; kindIndex < Entry::EK_NumberOfKinds; ++kindIndex) {<br>
- LocationArray array;<br>
- EntryBins.push_back(array);<br>
+ int KindIndex;<br>
+ for (KindIndex = 0; KindIndex < Entry::EK_NumberOfKinds; ++KindIndex) {<br>
+ LocationArray Array;<br>
+ EntryBins.push_back(Array);<br>
}<br>
<br>
// Check for the same entity being defined in multiple places.<br>
@@ -575,15 +575,15 @@ int main(int argc, const char **argv) {<br>
EntryBins[E->second[I].Kind].push_back(E->second[I].Loc);<br>
}<br>
// Report any duplicate entity definition errors.<br>
- int kindIndex = 0;<br>
+ int KindIndex = 0;<br>
for (EntryBinArray::iterator DI = EntryBins.begin(), DE = EntryBins.end();<br>
- DI != DE; ++DI, ++kindIndex) {<br>
- int eCount = DI->size();<br>
+ DI != DE; ++DI, ++KindIndex) {<br>
+ int ECount = DI->size();<br>
// If only 1 occurance, skip;<br>
- if (eCount <= 1)<br>
+ if (ECount <= 1)<br>
continue;<br>
LocationArray::iterator FI = DI->begin();<br>
- StringRef kindName = Entry::getKindName((Entry::EntryKind)kindIndex);<br>
+ StringRef kindName = Entry::getKindName((Entry::EntryKind)KindIndex);<br>
errs() << "error: " << kindName << " '" << E->first()<br>
<< "' defined at multiple locations:\n";<br>
for (LocationArray::iterator FE = DI->end(); FI != FE; ++FI) {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div></div></div>