ASTBridging: Bridge swift::Associativity directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -1672,12 +1672,6 @@ BridgedOperatorDecl BridgedOperatorDecl_createParsed(
     BridgedSourceLoc cColonLoc, BridgedIdentifier cPrecedenceGroupName,
     BridgedSourceLoc cPrecedenceGroupLoc);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedAssociativity {
-  BridgedAssociativityNone,
-  BridgedAssociativityLeft,
-  BridgedAssociativityRight,
-};
-
 SWIFT_NAME("BridgedPrecedenceGroupDecl.createParsed(declContext:"
            "precedencegroupKeywordLoc:name:nameLoc:leftBraceLoc:"
            "associativityLabelLoc:associativityValueLoc:associativity:"
@@ -1689,8 +1683,8 @@ BridgedPrecedenceGroupDecl BridgedPrecedenceGroupDecl_createParsed(
     BridgedSourceLoc cPrecedencegroupKeywordLoc, BridgedIdentifier cName,
     BridgedSourceLoc cNameLoc, BridgedSourceLoc cLeftBraceLoc,
     BridgedSourceLoc cAssociativityKeywordLoc,
-    BridgedSourceLoc cAssociativityValueLoc,
-    BridgedAssociativity cAssociativity, BridgedSourceLoc cAssignmentKeywordLoc,
+    BridgedSourceLoc cAssociativityValueLoc, swift::Associativity associativity,
+    BridgedSourceLoc cAssignmentKeywordLoc,
     BridgedSourceLoc cAssignmentValueLoc, bool isAssignment,
     BridgedSourceLoc cHigherThanKeywordLoc, BridgedArrayRef cHigherThanNames,
     BridgedSourceLoc cLowerThanKeywordLoc, BridgedArrayRef cLowerThanNames,

include/swift/AST/AttrKind.h

@@ -29,19 +29,19 @@ class StringRef;
 namespace swift {
 
 /// The associativity of a binary operator.
-enum class Associativity : uint8_t {
+enum class ENUM_EXTENSIBILITY_ATTR(closed) Associativity : uint8_t {
   /// Non-associative operators cannot be written next to other
   /// operators with the same precedence.  Relational operators are
   /// typically non-associative.
-  None,
+  None SWIFT_NAME("none"),
 
   /// Left-associative operators associate to the left if written next
   /// to other left-associative operators of the same precedence.
-  Left,
+  Left SWIFT_NAME("left"),
 
   /// Right-associative operators associate to the right if written
   /// next to other right-associative operators of the same precedence.
-  Right
+  Right SWIFT_NAME("right")
 };
 
 /// Returns the in-source spelling of the given associativity.

lib/AST/Bridging/DeclBridging.cpp

@@ -586,8 +586,8 @@ BridgedPrecedenceGroupDecl BridgedPrecedenceGroupDecl_createParsed(
     BridgedSourceLoc cPrecedencegroupKeywordLoc, BridgedIdentifier cName,
     BridgedSourceLoc cNameLoc, BridgedSourceLoc cLeftBraceLoc,
     BridgedSourceLoc cAssociativityKeywordLoc,
-    BridgedSourceLoc cAssociativityValueLoc,
-    BridgedAssociativity cAssociativity, BridgedSourceLoc cAssignmentKeywordLoc,
+    BridgedSourceLoc cAssociativityValueLoc, swift::Associativity associativity,
+    BridgedSourceLoc cAssignmentKeywordLoc,
     BridgedSourceLoc cAssignmentValueLoc, bool isAssignment,
     BridgedSourceLoc cHigherThanKeywordLoc, BridgedArrayRef cHigherThanNames,
     BridgedSourceLoc cLowerThanKeywordLoc, BridgedArrayRef cLowerThanNames,
@@ -609,9 +609,9 @@ BridgedPrecedenceGroupDecl BridgedPrecedenceGroupDecl_createParsed(
       cDeclContext.unbridged(), cPrecedencegroupKeywordLoc.unbridged(),
       cNameLoc.unbridged(), cName.unbridged(), cLeftBraceLoc.unbridged(),
       cAssociativityKeywordLoc.unbridged(), cAssociativityValueLoc.unbridged(),
-      static_cast<Associativity>(cAssociativity),
-      cAssignmentKeywordLoc.unbridged(), cAssignmentValueLoc.unbridged(),
-      isAssignment, cHigherThanKeywordLoc.unbridged(), higherThanNames,
+      associativity, cAssignmentKeywordLoc.unbridged(),
+      cAssignmentValueLoc.unbridged(), isAssignment,
+      cHigherThanKeywordLoc.unbridged(), higherThanNames,
       cLowerThanKeywordLoc.unbridged(), lowerThanNames,
       cRightBraceLoc.unbridged());
 }

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -927,7 +927,7 @@ extension ASTGenVisitor {
 
 // MARK: - PrecedenceGroupDecl
 
-extension BridgedAssociativity {
+extension swift.Associativity {
   fileprivate init?(from keyword: Keyword?) {
     switch keyword {
     case .none?: self = .none
@@ -991,9 +991,9 @@ extension ASTGenVisitor {
       }
     }
 
-    let associativityValue: BridgedAssociativity
+    let associativityValue: swift.Associativity
     if let token = body.associativity?.value {
-      if let value = BridgedAssociativity(from: token.keywordKind) {
+      if let value = swift.Associativity(from: token.keywordKind) {
         associativityValue = value
       } else {
         self.diagnose(.unexpectedTokenKind(token: token))