Merge pull request #1176 from ahoppen/ahoppen/attributes

Re-model attribute parsing

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/AttributeKinds.swift.gyb

@@ -86,37 +86,6 @@ public let TYPE_ATTR_KINDS = [
 % end
 ]
 
-/// Schema for `DeclAttribute`s:
-///
-/// - Attribute name.
-/// - C++ class name without the 'Attr' suffix
-/// - Options for the attribute, including:
-///    * the declarations the attribute can appear on
-///    * whether duplicates are allowed
-/// - Unique attribute identifier used for serialization. This
-///   can never be changed.
-///
-/// SimpleDeclAttribute is the same, but the class becomes
-/// SimpleDeclAttr<DAK_##NAME> on the C++ side.
-///
-/// Please help ease code review/audits:
-/// - Please place the "OnXYZ" flags together on the next line.
-/// - Please place the non-OnXYZ flags together on the next to last line.
-/// - Please place the unique code number on the last line.
-/// - Please sort attributes by serialization number.
-/// - Please create a "NOTE" comment if a unique number is skipped.
-///
-/// If you're adding a new kind of "attribute" that is spelled without a leading
-/// '@' symbol, add an entry to the `DECL_MODIFIER_KINDS` array instead.
-///
-/// If you're adding a new underscored attribute here, please document it in
-/// docs/ReferenceGuides/UnderscoredAttributes.md.
-public let DECL_ATTR_KINDS: [Attribute] = [
-% for attr in DECL_ATTR_KINDS:
-  ${make_swift_attribute(attr)},
-% end
-]
-
 /// Schema for declaration modifiers:
 ///
 /// - Modifier name.

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -38,61 +38,30 @@ public let KEYWORDS: [KeywordSpec] = [
   // Please keep these sorted alphabetically
 
   KeywordSpec("__consuming"),
-  KeywordSpec("__objc_bridged"),
   KeywordSpec("__owned"),
-  KeywordSpec("__raw_doc_comment"),
   KeywordSpec("__setter_access"),
   KeywordSpec("__shared"),
-  KeywordSpec("__synthesized_protocol"),
   KeywordSpec("_alignment"),
-  KeywordSpec("_alwaysEmitConformanceMetadata"),
-  KeywordSpec("_alwaysEmitIntoClient"),
-  KeywordSpec("_assemblyVision"),
   KeywordSpec("_backDeploy"),
   KeywordSpec("_borrow"),
-  KeywordSpec("_borrowed"),
   KeywordSpec("_cdecl"),
-  KeywordSpec("_clangImporterSynthesizedType"),
   KeywordSpec("_Class"),
   KeywordSpec("_compilerInitialized"),
   KeywordSpec("_const"),
-  KeywordSpec("_custom"),
-  KeywordSpec("_disfavoredOverload"),
   KeywordSpec("_documentation"),
   KeywordSpec("_dynamicReplacement"),
-  KeywordSpec("_eagerMove"),
   KeywordSpec("_effects"),
-  KeywordSpec("_exported"),
   KeywordSpec("_expose"),
-  KeywordSpec("_fixed_layout"),
-  KeywordSpec("_forbidSerializingReference"),
   KeywordSpec("_forward"),
-  KeywordSpec("_frozen"),
-  KeywordSpec("_hasInitialValue"),
-  KeywordSpec("_hasMissingDesignatedInitializers"),
-  KeywordSpec("_hasStorage"),
-  KeywordSpec("_implementationOnly"),
   KeywordSpec("_implements"),
-  KeywordSpec("_implicitSelfCapture"),
-  KeywordSpec("_inheritActorContext"),
-  KeywordSpec("_inheritsConvenienceInitializers"),
   KeywordSpec("_linear"),
   KeywordSpec("_local"),
-  KeywordSpec("_marker"),
   KeywordSpec("_modify"),
   KeywordSpec("_move"),
-  KeywordSpec("_moveOnly"),
   KeywordSpec("_NativeClass"),
   KeywordSpec("_NativeRefCountedObject"),
-  KeywordSpec("_noAllocation"),
-  KeywordSpec("_noEagerMove"),
-  KeywordSpec("_noImplicitCopy"),
-  KeywordSpec("_noLocks"),
   KeywordSpec("_noMetadata"),
-  KeywordSpec("_nonEphemeral"),
-  KeywordSpec("_nonoverride"),
   KeywordSpec("_nonSendable"),
-  KeywordSpec("_objc_non_lazy_realization"),
   KeywordSpec("_objcImplementation"),
   KeywordSpec("_objcRuntimeName"),
   KeywordSpec("_opaqueReturnTypeOf"),
@@ -103,25 +72,17 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("_projectedValueProperty"),
   KeywordSpec("_read"),
   KeywordSpec("_RefCountedObject"),
-  KeywordSpec("_restatedObjCConformance"),
   KeywordSpec("_semantics"),
-  KeywordSpec("_show_in_interface"),
   KeywordSpec("_silgen_name"),
   KeywordSpec("_specialize"),
-  KeywordSpec("_specializeExtension"),
   KeywordSpec("_spi"),
   KeywordSpec("_spi_available"),
-  KeywordSpec("_spiOnly"),
-  KeywordSpec("_staticInitializeObjCMetadata"),
   KeywordSpec("_swift_native_objc_runtime_base"),
-  KeywordSpec("_transparent"),
   KeywordSpec("_Trivial"),
   KeywordSpec("_TrivialAtMost"),
   KeywordSpec("_typeEraser"),
   KeywordSpec("_unavailableFromAsync"),
   KeywordSpec("_UnknownLayout"),
-  KeywordSpec("_unsafeInheritExecutor"),
-  KeywordSpec("_weakLinked"),
   KeywordSpec("actor"),
   KeywordSpec("addressWithNativeOwner"),
   KeywordSpec("addressWithOwner"),
@@ -136,6 +97,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("availability"),
   KeywordSpec("available"),
   KeywordSpec("await"),
+  KeywordSpec("before"),
   KeywordSpec("break", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("case", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("catch", isLexerClassified: true, requiresLeadingSpace: true),
@@ -150,12 +112,9 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("derivative"),
   KeywordSpec("didSet"),
   KeywordSpec("differentiable"),
-  KeywordSpec("discardableResult"),
   KeywordSpec("distributed"),
   KeywordSpec("do", isLexerClassified: true),
   KeywordSpec("dynamic"),
-  KeywordSpec("dynamicCallable"),
-  KeywordSpec("dynamicMemberLookup"),
   KeywordSpec("each"),
   KeywordSpec("else", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("enum", isLexerClassified: true, requiresTrailingSpace: true),
@@ -168,25 +127,16 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("fileprivate", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("final"),
   KeywordSpec("for", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("frozen"),
   KeywordSpec("func", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("get"),
-  KeywordSpec("GKInspectable"),
-  KeywordSpec("globalActor"),
   KeywordSpec("guard", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("higherThan"),
-  KeywordSpec("IBAction"),
-  KeywordSpec("IBDesignable"),
-  KeywordSpec("IBInspectable"),
-  KeywordSpec("IBOutlet"),
-  KeywordSpec("IBSegueAction"),
   KeywordSpec("if", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("import", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("in", isLexerClassified: true, requiresLeadingSpace: true, requiresTrailingSpace: true),
   KeywordSpec("indirect"),
   KeywordSpec("infix"),
   KeywordSpec("init", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("inlinable"),
   KeywordSpec("inline"),
   KeywordSpec("inout", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("internal", isLexerClassified: true, requiresTrailingSpace: true),
@@ -196,11 +146,11 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("kind"),
   KeywordSpec("lazy"),
   KeywordSpec("let", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("LLDBDebuggerFunction"),
   KeywordSpec("lowerThan"),
   KeywordSpec("macro"),
-  KeywordSpec("main"),
   KeywordSpec("message"),
+  KeywordSpec("metadata"),
+  KeywordSpec("module"),
   KeywordSpec("mutableAddressWithNativeOwner"),
   KeywordSpec("mutableAddressWithOwner"),
   KeywordSpec("mutating"),
@@ -210,12 +160,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("noescape"),
   KeywordSpec("nonisolated"),
   KeywordSpec("nonmutating"),
-  KeywordSpec("nonobjc"),
-  KeywordSpec("NSApplicationMain"),
-  KeywordSpec("NSCopying"),
-  KeywordSpec("NSManaged"),
   KeywordSpec("objc"),
-  KeywordSpec("objcMembers"),
   KeywordSpec("obsoleted"),
   KeywordSpec("of"),
   KeywordSpec("open"),
@@ -225,29 +170,25 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("package"),
   KeywordSpec("postfix"),
   KeywordSpec("precedencegroup", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("preconcurrency"),
   KeywordSpec("prefix"),
   KeywordSpec("private", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("propertyWrapper"),
   KeywordSpec("Protocol"),
   KeywordSpec("protocol", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("public", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("reasync"),
   KeywordSpec("renamed"),
   KeywordSpec("repeat", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("required"),
-  KeywordSpec("requires_stored_property_inits"),
-  KeywordSpec("resultBuilder"),
   KeywordSpec("rethrows", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("return", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("reverse"),
-  KeywordSpec("runtimeMetadata"),
   KeywordSpec("safe"),
   KeywordSpec("self", isLexerClassified: true),
   KeywordSpec("Self", isLexerClassified: true),
   KeywordSpec("Sendable"),
   KeywordSpec("set"),
   KeywordSpec("some"),
+  KeywordSpec("sourceFile"),
   KeywordSpec("spi"),
   KeywordSpec("spiModule"),
   KeywordSpec("static", isLexerClassified: true, requiresTrailingSpace: true),
@@ -257,27 +198,21 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("swift"),
   KeywordSpec("switch", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("target"),
-  KeywordSpec("testable"),
   KeywordSpec("throw", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("throws", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("transpose"),
   KeywordSpec("true", isLexerClassified: true),
   KeywordSpec("try", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("Type"),
   KeywordSpec("typealias", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("typeWrapper"),
-  KeywordSpec("typeWrapperIgnored"),
-  KeywordSpec("UIApplicationMain"),
   KeywordSpec("unavailable"),
   KeywordSpec("unchecked"),
   KeywordSpec("unowned"),
   KeywordSpec("unsafe"),
-  KeywordSpec("unsafe_no_objc_tagged_pointer"),
   KeywordSpec("unsafeAddress"),
   KeywordSpec("unsafeMutableAddress"),
-  KeywordSpec("usableFromInline"),
   KeywordSpec("var", isLexerClassified: true, requiresTrailingSpace: true),
-  KeywordSpec("warn_unqualified_access"),
+  KeywordSpec("visibility"),
   KeywordSpec("weak"),
   KeywordSpec("where", isLexerClassified: true, requiresLeadingSpace: true, requiresTrailingSpace: true),
   KeywordSpec("while", isLexerClassified: true, requiresTrailingSpace: true),