Teach the parser to deal with multiple spellings for the same

attribute, rather than requiring multiple cases in consumers of this
information.

llvm-svn: 156666
This commit is contained in:
Douglas Gregor 2012-05-11 23:37:49 +00:00
parent a39c9bceeb
commit 87a170c1e6
3 changed files with 16 additions and 10 deletions

View File

@ -101,6 +101,8 @@ class Attr {
bit SemaHandler = 1;
// Set to true for attributes that are completely ignored.
bit Ignored = 0;
// Set to true if each of the spellings is a distinct attribute.
bit DistinctSpellings = 0;
// Any additional text that should be included verbatim in the class.
code AdditionalMembers = [{}];
}
@ -530,6 +532,7 @@ def Override : InheritableAttr {
def Ownership : InheritableAttr {
let Spellings = ["ownership_holds", "ownership_returns", "ownership_takes"];
let DistinctSpellings = 1;
let Args = [EnumArgument<"OwnKind", "OwnershipKind",
["ownership_holds", "ownership_returns", "ownership_takes"],
["Holds", "Returns", "Takes"]>,

View File

@ -3792,7 +3792,6 @@ static void ProcessInheritableDeclAttr(Sema &S, Scope *scope, Decl *D,
// by ProcessNonInheritableDeclAttr.
break;
case AttributeList::AT_alias: handleAliasAttr (S, D, Attr); break;
case AttributeList::AT_align:
case AttributeList::AT_aligned: handleAlignedAttr (S, D, Attr); break;
case AttributeList::AT_always_inline:
handleAlwaysInlineAttr (S, D, Attr); break;

View File

@ -1062,7 +1062,8 @@ void ClangAttrParsedAttrListEmitter::run(raw_ostream &OS) {
Record &Attr = **I;
bool SemaHandler = Attr.getValueAsBit("SemaHandler");
bool DistinctSpellings = Attr.getValueAsBit("DistinctSpellings");
if (SemaHandler) {
std::vector<StringRef> Spellings =
getValueAsListOfStrings(Attr, "Spellings");
@ -1079,6 +1080,9 @@ void ClangAttrParsedAttrListEmitter::run(raw_ostream &OS) {
ProcessedAttrs.insert(AttrName);
OS << "PARSED_ATTR(" << AttrName << ")\n";
if (!DistinctSpellings)
break;
}
}
}
@ -1097,23 +1101,23 @@ void ClangAttrParsedAttrKindsEmitter::run(raw_ostream &OS) {
bool SemaHandler = Attr.getValueAsBit("SemaHandler");
bool Ignored = Attr.getValueAsBit("Ignored");
bool DistinctSpellings = Attr.getValueAsBit("DistinctSpellings");
if (SemaHandler || Ignored) {
std::vector<StringRef> Spellings =
getValueAsListOfStrings(Attr, "Spellings");
for (std::vector<StringRef>::const_iterator I = Spellings.begin(),
E = Spellings.end(); I != E; ++I) {
StringRef AttrName = *I, Spelling = *I;
AttrName = NormalizeAttrName(AttrName);
Spelling = NormalizeAttrSpelling(Spelling);
StringRef AttrName = NormalizeAttrName(DistinctSpellings
? *I
: Spellings.front());
StringRef Spelling = NormalizeAttrSpelling(*I);
if (SemaHandler)
Matches.push_back(
StringMatcher::StringPair(Spelling,
std::string("return AttributeList::AT_") +
AttrName.str() + ";"));
StringMatcher::StringPair(
Spelling,
std::string("return AttributeList::AT_")+AttrName.str() + ";"));
else
Matches.push_back(
StringMatcher::StringPair(