Merge pull request #1156 from apple/es-pkg-acl

Add 'package' access modifier contextual keyword
Resolves rdar://103462581

Author: elsh

CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeKinds.swift

@@ -1625,6 +1625,9 @@ public let DECL_MODIFIER_KINDS: [Attribute] = [
   DeclAttributeAlias(name: "public",
                 className: "AccessControl",
                 swiftName: "publicKeyword"),
+  ContextualDeclAttributeAlias(name: "package",
+                className: "AccessControl",
+                swiftName: "package"),
   ContextualDeclAttributeAlias(name: "open",
                 className: "AccessControl",
                 swiftName: "open"),

Sources/SwiftParser/Declarations.swift

@@ -21,7 +21,7 @@ extension DeclarationModifier {
       .nonmutating, .optional, .override, .postfix, .prefix, .reasync,
       .required, .rethrows, .staticKeyword, .weak:
       return false
-    case .fileprivateKeyword, .internalKeyword, .open, .privateKeyword,
+    case .fileprivateKeyword, .internalKeyword, .package, .open, .privateKeyword,
       .publicKeyword, .unowned:
       return true
     }

Sources/SwiftParser/Modifiers.swift

@@ -24,6 +24,8 @@ extension Parser {
         (.internalKeyword, _)?,
         (.publicKeyword, _)?:
         elements.append(parseAccessLevelModifier())
+      case (.package, _)?:
+        elements.append(parsePackageAccessLevelModifier())
       case (.open, _)?:
         elements.append(parseOpenAccessLevelModifier())
       case (.staticKeyword, let handle)?:
@@ -129,6 +131,17 @@ extension Parser {
     )
   }
 
+  mutating func parsePackageAccessLevelModifier() -> RawDeclModifierSyntax {
+    let (unexpectedBeforeName, name) = self.expectContextualKeyword("package")
+    let details = self.parseAccessModifierDetails()
+    return RawDeclModifierSyntax(
+      unexpectedBeforeName,
+      name: name,
+      detail: details,
+      arena: self.arena
+    )
+  }
+
   mutating func parseOpenAccessLevelModifier() -> RawDeclModifierSyntax {
     let (unexpectedBeforeName, name) = self.expectContextualKeyword("open")
     let details = self.parseAccessModifierDetails()

Sources/SwiftParser/RawTokenKindSubset.swift

@@ -201,6 +201,7 @@ enum ContextualDeclKeyword: SyntaxText, ContextualKeywords {
   case mutating = "mutating"
   case nonisolated = "nonisolated"
   case nonmutating = "nonmutating"
+  case package = "package"
   case open = "open"
   case optional = "optional"
   case override = "override"

Sources/SwiftParser/generated/DeclarationModifier.swift

@@ -55,6 +55,8 @@ enum DeclarationModifier: SyntaxText, ContextualKeywords, RawTokenKindSubset {
 
   case publicKeyword = "public"
 
+  case package = "package"
+  
   case open = "open"
 
   case __setter_access = "__setter_access"
@@ -142,6 +144,8 @@ enum DeclarationModifier: SyntaxText, ContextualKeywords, RawTokenKindSubset {
       return .internalKeyword
     case .publicKeyword: 
       return .publicKeyword
+    case .package: 
+      return .identifier
     case .open: 
       return .identifier
     case .__setter_access: 
@@ -199,6 +203,8 @@ enum DeclarationModifier: SyntaxText, ContextualKeywords, RawTokenKindSubset {
       return "convenience"
     case .override: 
       return "override"
+    case .package: 
+      return "package"
     case .open: 
       return "open"
     case .__setter_access: 

gyb_syntax_support/AttributeKinds.py

@@ -820,6 +820,7 @@ def __init__(self, name, swift_name=None):
     DeclAttributeAlias('fileprivate', 'AccessControl', swift_name='fileprivateKeyword'),
     DeclAttributeAlias('internal', 'AccessControl', swift_name='internalKeyword'),
     DeclAttributeAlias('public', 'AccessControl', swift_name='publicKeyword'),
+    ContextualDeclAttributeAlias('package', 'AccessControl'),
     ContextualDeclAttributeAlias('open', 'AccessControl'),
     DeclAttribute('__setter_access', 'SetterAccess',
                   OnVar,  OnSubscript,