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

Move the @optional attribute to being a SIMPLE_DECL_ATTR, which

Browse Source 
simplifies a bunch of code, makes them more consistent with the
other attributes, and is generally the newfangled way to do things.



Swift SVN r19779
This commit is contained in:
Chris Lattner
2014-07-10 04:34:00 +00:00
parent 64c6d32a99
commit 35dcc3aa10
17 changed files with 75 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Serialization/Serialization.cpp
View File

@@ -1732,7 +1732,7 @@ void Serializer::writeDecl(const Decl *D) {
case DeclKind::Var: {
auto var = cast<VarDecl>(D);
checkAllowedAttributes<
AK_optional, AK_unowned, AK_unowned_unsafe, AK_weak, AK_transparent
AK_unowned, AK_unowned_unsafe, AK_weak, AK_transparent
>(var);
verifyAttrSerializable(var);
@@ -1768,7 +1768,6 @@ void Serializer::writeDecl(const Decl *D) {
addDeclRef(DC),
var->isImplicit(),
var->isObjC(),
var->getAttrs().isOptional(),
var->isStatic(),
var->isLet(),
uint8_t(storageKind),
@@ -1807,8 +1806,7 @@ void Serializer::writeDecl(const Decl *D) {
case DeclKind::Func: {
auto fn = cast<FuncDecl>(D);
checkAllowedAttributes<
AK_conversion, AK_infix,
AK_optional, AK_postfix, AK_prefix, AK_transparent,
AK_conversion, AK_infix, AK_postfix, AK_prefix, AK_transparent,
AK_mutating
>(fn);
verifyAttrSerializable(fn);
@@ -1834,7 +1832,6 @@ void Serializer::writeDecl(const Decl *D) {
fn->isTransparent(),
fn->isMutating(),
fn->hasDynamicSelf(),
fn->getAttrs().isOptional(),
fn->getBodyParamPatterns().size(),
addTypeRef(fn->getType()),
addTypeRef(fn->getInterfaceType()),
@@ -1873,7 +1870,7 @@ void Serializer::writeDecl(const Decl *D) {
case DeclKind::Subscript: {
auto subscript = cast<SubscriptDecl>(D);
checkAllowedAttributes<AK_optional>(subscript);
checkAllowedAttributes<>(subscript);
verifyAttrSerializable(subscript);
const Decl *DC = getDeclForContext(subscript->getDeclContext());
@@ -1890,7 +1887,6 @@ void Serializer::writeDecl(const Decl *D) {
addDeclRef(DC),
subscript->isImplicit(),
subscript->isObjC(),
subscript->getAttrs().isOptional(),
addTypeRef(subscript->getType()),
addTypeRef(subscript->getElementType()),
addTypeRef(subscript->getInterfaceType()),