Make a .def file for ObjCSelectorFamily

Author: beccadax

include/swift/AST/Identifier.h

@@ -592,19 +592,10 @@ class DeclName {
                             "only for use within the debugger");
 };
 
-/// Apply a macro FAMILY(Name, Prefix) to all ObjC selector families.
-#define FOREACH_OBJC_SELECTOR_FAMILY(FAMILY)       \
-  FAMILY(Alloc, "alloc")                           \
-  FAMILY(Copy, "copy")                             \
-  FAMILY(Init, "init")                             \
-  FAMILY(MutableCopy, "mutableCopy")               \
-  FAMILY(New, "new")
-
 enum class ObjCSelectorFamily : unsigned {
   None,
-#define GET_LABEL(LABEL, PREFIX) LABEL,
-FOREACH_OBJC_SELECTOR_FAMILY(GET_LABEL)
-#undef GET_LABEL
+#define OBJC_SELECTOR_FAMILY(LABEL, PREFIX) LABEL,
+#include "swift/AST/ObjCSelectorFamily.def"
 };
 
 /// Represents an Objective-C selector.

include/swift/AST/ObjCSelectorFamily.def

@@ -0,0 +1,29 @@
+//===--- ObjCSelectorFamily.def - Objective-C Selector Families - C++ ---*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines macros used for macro-metaprogramming with Objective-C
+// selector families, categories of Objective-C methods with special ARC
+// semantics.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef OBJC_SELECTOR_FAMILY
+#define OBJC_SELECTOR_FAMILY(LABEL, PREFIX)
+#endif
+
+OBJC_SELECTOR_FAMILY(Alloc, "alloc")
+OBJC_SELECTOR_FAMILY(Copy, "copy")
+OBJC_SELECTOR_FAMILY(Init, "init")
+OBJC_SELECTOR_FAMILY(MutableCopy, "mutableCopy")
+OBJC_SELECTOR_FAMILY(New, "new")
+
+#undef OBJC_SELECTOR_FAMILY

lib/AST/Identifier.cpp

@@ -218,10 +218,9 @@ ObjCSelectorFamily ObjCSelector::getSelectorFamily() const {
   };
 
   if (false) /*for #define purposes*/;
-#define CHECK_PREFIX(LABEL, PREFIX) \
-else if (hasPrefix(text, PREFIX)) return ObjCSelectorFamily::LABEL;
-  FOREACH_OBJC_SELECTOR_FAMILY(CHECK_PREFIX)
-#undef CHECK_PREFIX
+#define OBJC_SELECTOR_FAMILY(LABEL, PREFIX) \
+  else if (hasPrefix(text, PREFIX)) return ObjCSelectorFamily::LABEL;
+#include "swift/AST/ObjCSelectorFamily.def"
   else return ObjCSelectorFamily::None;
 }