averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

1) Redesign DeclAttributes to be based around an array indexed by attribute, instead

Browse Source 
of having a ton of ad-hoc bools in it.  This allows us to consolidate a ton of 
   boilerplate, eliminating 250 lines of code:

 17 files changed, 435 insertions(+), 662 deletions(-)

2) This eliminates the special case for weak and unowned attributes, which previously
   didn't show up in Attr.def.

3) While we're at it, keep track of proper source locations for each attribute, and
   use these to emit diagnostics pointing at the attribute in question instead of at
   a funcdecl or the @ sign.

4) Fix axle attributes, which had vertex and fragment swapped.



Swift SVN r9263
This commit is contained in:
Chris Lattner
2013-10-13 01:25:50 +00:00
parent a718c8f57a
commit 09705dc7cd
13 changed files with 351 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Serialization/Serialization.cpp
View File

@@ -1149,7 +1149,7 @@ void Serializer::writeDecl(const Decl *D) {
auto theClass = cast<ClassDecl>(D);
DeclAttributes remainingAttrs = theClass->getAttrs();
remainingAttrs.ObjC = false;
remainingAttrs.clearAttribute(AK_objc);
assert(remainingAttrs.empty() && "unhandled class attrs");
const Decl *DC = getDeclForContext(theClass->getDeclContext());
@@ -1175,8 +1175,8 @@ void Serializer::writeDecl(const Decl *D) {
auto proto = cast<ProtocolDecl>(D);
DeclAttributes remainingAttrs = proto->getAttrs();
remainingAttrs.ClassProtocol = false;
remainingAttrs.ObjC = false;
remainingAttrs.clearAttribute(AK_class_protocol);
remainingAttrs.clearAttribute(AK_objc);
assert(remainingAttrs.empty() && "unhandled protocol attrs");
@@ -1206,8 +1206,8 @@ void Serializer::writeDecl(const Decl *D) {
DeclAttributes remainingAttrs = var->getAttrs();
// FIXME: We need some representation of these for source fidelity.
remainingAttrs.ObjC = false;
remainingAttrs.IBOutlet = false;
remainingAttrs.clearAttribute(AK_objc);
remainingAttrs.clearAttribute(AK_iboutlet);
assert(remainingAttrs.empty() && "unhandled var attrs");
@@ -1233,17 +1233,18 @@ void Serializer::writeDecl(const Decl *D) {
DeclAttributes remainingAttrs = fn->getAttrs();
// FIXME: We need some representation of these for source fidelity.
remainingAttrs.ExplicitPrefix = false;
remainingAttrs.ExplicitPostfix = false;
remainingAttrs.ExplicitInfix = false;
remainingAttrs.Assignment = false;
remainingAttrs.Conversion = false;
remainingAttrs.clearAttribute(AK_prefix);
remainingAttrs.clearAttribute(AK_postfix);
remainingAttrs.clearAttribute(AK_infix);
remainingAttrs.clearAttribute(AK_assignment);
remainingAttrs.clearAttribute(AK_conversion);
remainingAttrs.AsmName = {};
remainingAttrs.NoReturn = false;
remainingAttrs.Thin = false;
remainingAttrs.ObjC = false;
remainingAttrs.IBAction = false;
remainingAttrs.Transparent = false;
remainingAttrs.clearAttribute(AK_asmname);
remainingAttrs.clearAttribute(AK_noreturn);
remainingAttrs.clearAttribute(AK_thin);
remainingAttrs.clearAttribute(AK_objc);
remainingAttrs.clearAttribute(AK_ibaction);
remainingAttrs.clearAttribute(AK_transparent);
assert(remainingAttrs.empty() && "unhandled func attrs");
@@ -1306,7 +1307,7 @@ void Serializer::writeDecl(const Decl *D) {
auto subscript = cast<SubscriptDecl>(D);
DeclAttributes remainingAttrs = subscript->getAttrs();
remainingAttrs.ObjC = false;
remainingAttrs.clearAttribute(AK_objc);
assert(remainingAttrs.empty() && "unhandled subscript attrs");
const Decl *DC = getDeclForContext(subscript->getDeclContext());
@@ -1331,8 +1332,8 @@ void Serializer::writeDecl(const Decl *D) {
auto ctor = cast<ConstructorDecl>(D);
DeclAttributes remainingAttrs = ctor->getAttrs();
remainingAttrs.ObjC = false;
remainingAttrs.Transparent = false;
remainingAttrs.clearAttribute(AK_objc);
remainingAttrs.clearAttribute(AK_transparent);
assert(remainingAttrs.empty() && "unhandled constructor attrs");
@@ -1359,7 +1360,7 @@ void Serializer::writeDecl(const Decl *D) {
auto dtor = cast<DestructorDecl>(D);
DeclAttributes remainingAttrs = dtor->getAttrs();
remainingAttrs.ObjC = false;
remainingAttrs.clearAttribute(AK_objc);
assert(remainingAttrs.empty() && "unhandled destructor attrs");
const Decl *DC = getDeclForContext(dtor->getDeclContext());