From e6688e653ffdf88d60612e135de2f4456f0bbbcb Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 28 Sep 2009 03:51:44 +0000 Subject: Determinism is for wimps. llvm-svn: 82962 --- clang/lib/Sema/SemaCodeComplete.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'clang/lib/Sema/SemaCodeComplete.cpp') diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 4c46696d1df..7a916ef0360 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -14,6 +14,7 @@ #include "clang/Sema/CodeCompleteConsumer.h" #include "clang/AST/ExprCXX.h" #include "llvm/ADT/SmallPtrSet.h" +#include "llvm/ADT/StringExtras.h" #include #include #include @@ -948,6 +949,14 @@ namespace { struct SortCodeCompleteResult { typedef CodeCompleteConsumer::Result Result; + bool isEarlierDeclarationName(DeclarationName X, DeclarationName Y) const { + if (X.getNameKind() != Y.getNameKind()) + return X.getNameKind() < Y.getNameKind(); + + return llvm::LowercaseString(X.getAsString()) + < llvm::LowercaseString(Y.getAsString()); + } + bool operator()(const Result &X, const Result &Y) const { // Sort first by rank. if (X.Rank < Y.Rank) @@ -973,7 +982,8 @@ namespace { switch (X.Kind) { case Result::RK_Declaration: // Order based on the declaration names. - return X.Declaration->getDeclName() < Y.Declaration->getDeclName(); + return isEarlierDeclarationName(X.Declaration->getDeclName(), + Y.Declaration->getDeclName()); case Result::RK_Keyword: return strcmp(X.Keyword, Y.Keyword) == -1; -- cgit v1.2.3