[ASTGen] Generate SubscriptDecls

Author: hamishknight

include/swift/AST/ASTBridging.h

@@ -397,6 +397,12 @@ BridgedDeclContext BridgedPatternBindingInitializer_asDeclContext(
 // MARK: Decls
 //===----------------------------------------------------------------------===//
 
+enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedStaticSpelling {
+  BridgedStaticSpellingNone,
+  BridgedStaticSpellingStatic,
+  BridgedStaticSpellingClass
+};
+
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedAccessorKind {
 #define ACCESSOR(ID) BridgedAccessorKind##ID,
 #include "swift/AST/AccessorKinds.def"
@@ -631,6 +637,17 @@ BridgedImportDecl BridgedImportDecl_createParsed(
     BridgedSourceLoc cImportKeywordLoc, BridgedImportKind cImportKind,
     BridgedSourceLoc cImportKindLoc, BridgedArrayRef cImportPathElements);
 
+SWIFT_NAME("BridgedSubscriptDecl.createParsed(_:declContext:staticLoc:"
+           "staticSpelling:subscriptKeywordLoc:genericParamList:parameterList:"
+           "arrowLoc:returnType:)")
+BridgedSubscriptDecl BridgedSubscriptDecl_createParsed(
+    BridgedASTContext cContext, BridgedDeclContext cDeclContext,
+    BridgedSourceLoc cStaticLoc, BridgedStaticSpelling cStaticSpelling,
+    BridgedSourceLoc cSubscriptKeywordLoc,
+    BridgedNullableGenericParamList cGenericParamList,
+    BridgedParameterList cParamList, BridgedSourceLoc cArrowLoc,
+    BridgedTypeRepr returnType);
+
 SWIFT_NAME(
     "BridgedTopLevelCodeDecl.createParsed(_:declContext:startLoc:stmt:endLoc:)")
 BridgedTopLevelCodeDecl BridgedTopLevelCodeDecl_createStmt(
@@ -691,6 +708,15 @@ SWIFT_NAME("BridgedNominalTypeDecl.setParsedMembers(self:_:)")
 void BridgedNominalTypeDecl_setParsedMembers(BridgedNominalTypeDecl decl,
                                              BridgedArrayRef members);
 
+//===----------------------------------------------------------------------===//
+// MARK: SubscriptDecl
+//===----------------------------------------------------------------------===//
+
+SWIFT_NAME("getter:BridgedSubscriptDecl.asAbstractStorageDecl(self:)")
+BRIDGED_INLINE
+BridgedAbstractStorageDecl
+BridgedSubscriptDecl_asAbstractStorageDecl(BridgedSubscriptDecl decl);
+
 //===----------------------------------------------------------------------===//
 // MARK: VarDecl
 //===----------------------------------------------------------------------===//

include/swift/AST/ASTBridgingImpl.h

@@ -45,6 +45,15 @@ bool BridgedNominalTypeDecl_hasValueDeinit(BridgedNominalTypeDecl decl) {
   return decl.unbridged()->getValueTypeDestructor() != nullptr;
 }
 
+//===----------------------------------------------------------------------===//
+// MARK: BridgedSubscriptDecl
+//===----------------------------------------------------------------------===//
+
+BridgedAbstractStorageDecl
+BridgedSubscriptDecl_asAbstractStorageDecl(BridgedSubscriptDecl decl) {
+  return decl.unbridged();
+}
+
 //===----------------------------------------------------------------------===//
 // MARK: BridgedVarDecl
 //===----------------------------------------------------------------------===//

lib/AST/ASTBridging.cpp

@@ -48,6 +48,10 @@ static TypeAttrKind unbridged(BridgedTypeAttrKind kind) {
   }
 }
 
+static StaticSpellingKind unbridged(BridgedStaticSpelling kind) {
+  return static_cast<StaticSpellingKind>(kind);
+}
+
 static AccessorKind unbridged(BridgedAccessorKind kind) {
   return static_cast<AccessorKind>(kind);
 }
@@ -848,6 +852,20 @@ BridgedImportDecl BridgedImportDecl_createParsed(
       std::move(builder).get());
 }
 
+BridgedSubscriptDecl BridgedSubscriptDecl_createParsed(
+    BridgedASTContext cContext, BridgedDeclContext cDeclContext,
+    BridgedSourceLoc cStaticLoc, BridgedStaticSpelling cStaticSpelling,
+    BridgedSourceLoc cSubscriptKeywordLoc,
+    BridgedNullableGenericParamList cGenericParamList,
+    BridgedParameterList cParamList, BridgedSourceLoc cArrowLoc,
+    BridgedTypeRepr returnType) {
+  return SubscriptDecl::createParsed(
+      cContext.unbridged(), cStaticLoc.unbridged(), unbridged(cStaticSpelling),
+      cSubscriptKeywordLoc.unbridged(), cParamList.unbridged(),
+      cArrowLoc.unbridged(), returnType.unbridged(), cDeclContext.unbridged(),
+      cGenericParamList.unbridged());
+}
+
 BridgedTopLevelCodeDecl BridgedTopLevelCodeDecl_createStmt(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
     BridgedSourceLoc cStartLoc, BridgedStmt statement,

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -62,8 +62,8 @@ extension ASTGenVisitor {
       return self.generate(protocolDecl: node).asDecl
     case .structDecl(let node):
       return self.generate(structDecl: node).asDecl
-    case .subscriptDecl:
-      break
+    case .subscriptDecl(let node):
+      return self.generate(subscriptDecl: node).asDecl
     case .typeAliasDecl(let node):
       return self.generate(typeAliasDecl: node).asDecl
     case .variableDecl(let node):
@@ -479,6 +479,29 @@ extension ASTGenVisitor {
       isLet: isLet
     )
   }
+
+  func generate(subscriptDecl node: SubscriptDeclSyntax) -> BridgedSubscriptDecl {
+    // FIXME: Compute static
+    let staticLoc: BridgedSourceLoc = nil
+    let staticSpelling = BridgedStaticSpelling.none
+
+    let subscriptDecl = BridgedSubscriptDecl.createParsed(
+      self.ctx,
+      declContext: self.declContext,
+      staticLoc: staticLoc,
+      staticSpelling: staticSpelling,
+      subscriptKeywordLoc: self.generateSourceLoc(node.subscriptKeyword),
+      genericParamList: self.generate(genericParameterClause: node.genericParameterClause),
+      parameterList: self.generate(functionParameterClause: node.parameterClause, forSubscript: true),
+      arrowLoc: self.generateSourceLoc(node.returnClause.arrow),
+      returnType: self.generate(type: node.returnClause.type)
+    )
+    if let accessors = node.accessorBlock {
+      let storage = subscriptDecl.asAbstractStorageDecl
+      storage.setAccessors(generate(accessorBlock: accessors, for: storage))
+    }
+    return subscriptDecl
+  }
 }
 
 // MARK: - AbstractFunctionDecl

test/ASTGen/verify-parse.swift

@@ -191,6 +191,19 @@ extension TestVars {
   var inExt: Int { return 0 }
 }
 
+struct TestSubscripts {
+  subscript(x: Int) -> Int {
+    // FIXME: We don't yet handle single expression bodies.
+    return 0
+  }
+  subscript(y x: Int) -> Int {
+    get {
+      return 0
+    }
+    set(x) {}
+  }
+}
+
 protocol Proto1 {}
 protocol Proto2 {}