From 0d98a2b7d2e042ab19c95faaec04dcd7a20956ec Mon Sep 17 00:00:00 2001 From: Argiris Kirtzidis Date: Tue, 11 Jan 2011 19:45:16 +0000 Subject: [PATCH] [analyzer] Add 'bool ignorePrefix' parameter to cocoa::deriveNamingConvention to control whether the prefix should be ignored. E.g. if ignorePrefix is true, "_init" and "init" selectors will both be result in InitRule, but if ignorePrefix is false, only "init" will return InitRule. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@123262 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Analysis/DomainSpecific/CocoaConventions.h | 2 +- lib/Analysis/CocoaConventions.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/clang/Analysis/DomainSpecific/CocoaConventions.h b/include/clang/Analysis/DomainSpecific/CocoaConventions.h index 18e81fed7..7e6e38154 100644 --- a/include/clang/Analysis/DomainSpecific/CocoaConventions.h +++ b/include/clang/Analysis/DomainSpecific/CocoaConventions.h @@ -22,7 +22,7 @@ namespace cocoa { enum NamingConvention { NoConvention, CreateRule, InitRule }; - NamingConvention deriveNamingConvention(Selector S); + NamingConvention deriveNamingConvention(Selector S, bool ignorePrefix = true); static inline bool followsFundamentalRule(Selector S) { return deriveNamingConvention(S) == CreateRule; diff --git a/lib/Analysis/CocoaConventions.cpp b/lib/Analysis/CocoaConventions.cpp index 2c263cada..422652544 100644 --- a/lib/Analysis/CocoaConventions.cpp +++ b/lib/Analysis/CocoaConventions.cpp @@ -54,7 +54,8 @@ static const char* parseWord(const char* s) { return s; } -cocoa::NamingConvention cocoa::deriveNamingConvention(Selector S) { +cocoa::NamingConvention cocoa::deriveNamingConvention(Selector S, + bool ignorePrefix) { IdentifierInfo *II = S.getIdentifierInfoForSlot(0); if (!II) @@ -62,6 +63,7 @@ cocoa::NamingConvention cocoa::deriveNamingConvention(Selector S) { const char *s = II->getNameStart(); + const char *orig = s; // A method/function name may contain a prefix. We don't know it is there, // however, until we encounter the first '_'. while (*s != '\0') { @@ -73,6 +75,9 @@ cocoa::NamingConvention cocoa::deriveNamingConvention(Selector S) { break; } + if (!ignorePrefix && s != orig) + return NoConvention; + // Parse the first word, and look for specific keywords. const char *wordEnd = parseWord(s); assert(wordEnd > s); -- 2.11.4.GIT