<div dir="ltr">Could remove some more redundancy here (at least from the latter two, possibly from the first too) with a template:<br><br>template<typename A, typename B, typename C, A NMSymbol::* AF, B NMSymbol::* BF, C NMSymbol::* CF><br>static bool compare(const NMSymbol &LHS, const NMSymbol &RHS) {<br> return make_tuple(LHS.*AF, LHS.*BF, LHS.*CF) < make_tuple(RHS.*AF, RHS.*BF, RHS.*CF);<br>}<br><br>But perhaps it's not worth the bother. I think it might be /slightly/ clearer what ordering is being implemented, but that's certainly debatable.</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jul 6, 2015 at 11:48 AM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Mon Jul 6 13:48:47 2015<br>
New Revision: 241484<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D241484-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=46-tTzKD0ZtHX7niooMSvb7DvQ0SfEVLzkttAXJ1Weg&s=GESnitaMqwozMHiOnVOvLJcuxTOVw8pVlmvKjcJpD1I&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=241484&view=rev</a><br>
Log:<br>
Reduce code duplication. NFC.<br>
<br>
Modified:<br>
llvm/trunk/tools/llvm-nm/llvm-nm.cpp<br>
<br>
Modified: llvm/trunk/tools/llvm-nm/llvm-nm.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_tools_llvm-2Dnm_llvm-2Dnm.cpp-3Frev-3D241484-26r1-3D241483-26r2-3D241484-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=46-tTzKD0ZtHX7niooMSvb7DvQ0SfEVLzkttAXJ1Weg&s=feP5t_AIWcPxYHZaC0BTcjmxtvd-NmN5gB3X-TgN13s&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-nm/llvm-nm.cpp?rev=241484&r1=241483&r2=241484&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)<br>
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Mon Jul 6 13:48:47 2015<br>
@@ -185,60 +185,31 @@ struct NMSymbol {<br>
}<br>
<br>
static bool compareSymbolAddress(const NMSymbol &A, const NMSymbol &B) {<br>
- if (!ReverseSort) {<br>
- if (A.Address < B.Address)<br>
- return true;<br>
- if (A.Address == B.Address && A.Name < B.Name)<br>
- return true;<br>
- if (A.Address == B.Address && A.Name == B.Name && A.Size < B.Size)<br>
- return true;<br>
- return false;<br>
- }<br>
-<br>
- if (A.Address > B.Address)<br>
+ if (A.Address < B.Address)<br>
return true;<br>
- if (A.Address == B.Address && A.Name > B.Name)<br>
+ if (A.Address == B.Address && A.Name < B.Name)<br>
return true;<br>
- if (A.Address == B.Address && A.Name == B.Name && A.Size > B.Size)<br>
+ if (A.Address == B.Address && A.Name == B.Name && A.Size < B.Size)<br>
return true;<br>
return false;<br>
}<br>
<br>
static bool compareSymbolSize(const NMSymbol &A, const NMSymbol &B) {<br>
- if (!ReverseSort) {<br>
- if (A.Size < B.Size)<br>
- return true;<br>
- if (A.Size == B.Size && A.Name < B.Name)<br>
- return true;<br>
- if (A.Size == B.Size && A.Name == B.Name && A.Address < B.Address)<br>
- return true;<br>
- return false;<br>
- }<br>
-<br>
- if (A.Size > B.Size)<br>
+ if (A.Size < B.Size)<br>
return true;<br>
- if (A.Size == B.Size && A.Name > B.Name)<br>
+ if (A.Size == B.Size && A.Name < B.Name)<br>
return true;<br>
- if (A.Size == B.Size && A.Name == B.Name && A.Address > B.Address)<br>
+ if (A.Size == B.Size && A.Name == B.Name && A.Address < B.Address)<br>
return true;<br>
return false;<br>
}<br>
<br>
static bool compareSymbolName(const NMSymbol &A, const NMSymbol &B) {<br>
- if (!ReverseSort) {<br>
- if (A.Name < B.Name)<br>
- return true;<br>
- if (A.Name == B.Name && A.Size < B.Size)<br>
- return true;<br>
- if (A.Name == B.Name && A.Size == B.Size && A.Address < B.Address)<br>
- return true;<br>
- return false;<br>
- }<br>
- if (A.Name > B.Name)<br>
+ if (A.Name < B.Name)<br>
return true;<br>
- if (A.Name == B.Name && A.Size > B.Size)<br>
+ if (A.Name == B.Name && A.Size < B.Size)<br>
return true;<br>
- if (A.Name == B.Name && A.Size == B.Size && A.Address > B.Address)<br>
+ if (A.Name == B.Name && A.Size == B.Size && A.Address < B.Address)<br>
return true;<br>
return false;<br>
}<br>
@@ -526,12 +497,17 @@ static void sortAndPrintSymbolList(Symbo<br>
std::string ArchiveName,<br>
std::string ArchitectureName) {<br>
if (!NoSort) {<br>
+ std::function<bool(const NMSymbol &, const NMSymbol &)> Cmp;<br>
if (NumericSort)<br>
- std::sort(SymbolList.begin(), SymbolList.end(), compareSymbolAddress);<br>
+ Cmp = compareSymbolAddress;<br>
else if (SizeSort)<br>
- std::sort(SymbolList.begin(), SymbolList.end(), compareSymbolSize);<br>
+ Cmp = compareSymbolSize;<br>
else<br>
- std::sort(SymbolList.begin(), SymbolList.end(), compareSymbolName);<br>
+ Cmp = compareSymbolName;<br>
+<br>
+ if (ReverseSort)<br>
+ Cmp = [=](const NMSymbol &A, const NMSymbol &B) { return !Cmp(A, B); };<br>
+ std::sort(SymbolList.begin(), SymbolList.end(), Cmp);<br>
}<br>
<br>
if (!PrintFileName) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>