ASTGen: Translate import declarations

Author: AnthonyLatsis

include/swift/AST/CASTBridging.h

@@ -256,12 +256,6 @@ BridgedIdentifier ASTContext_getIdentifier(BridgedASTContext cContext,
 _Bool ASTContext_langOptsHasFeature(BridgedASTContext cContext,
                                     BridgedFeature feature);
 
-void *ImportDecl_create(BridgedASTContext cContext,
-                        BridgedDeclContext cDeclContext,
-                        BridgedSourceLoc cImportLoc, char kind,
-                        BridgedSourceLoc cKindLoc, BridgedArrayRef path,
-                        BridgedArrayRef cPathLocs);
-
 void *TopLevelCodeDecl_createStmt(BridgedASTContext cContext,
                                   BridgedDeclContext cDeclContext,
                                   BridgedSourceLoc cStartLoc, void *element,
@@ -440,6 +434,24 @@ void *OperatorDecl_create(BridgedASTContext cContext,
                           BridgedIdentifier cPrecedenceGroupName,
                           BridgedSourceLoc cPrecedenceGroupLoc);
 
+typedef enum ENUM_EXTENSIBILITY_ATTR(open) {
+  BridgedImportKindModule,
+  BridgedImportKindType,
+  BridgedImportKindStruct,
+  BridgedImportKindClass,
+  BridgedImportKindEnum,
+  BridgedImportKindProtocol,
+  BridgedImportKindVar,
+  BridgedImportKindFunc,
+} BridgedImportKind;
+
+void *ImportDecl_create(BridgedASTContext cContext,
+                        BridgedDeclContext cDeclContext,
+                        BridgedSourceLoc cImportKeywordLoc,
+                        BridgedImportKind cImportKind,
+                        BridgedSourceLoc cImportKindLoc,
+                        BridgedArrayRef cImportPathElements);
+
 void *GenericParamList_create(BridgedASTContext cContext,
                               BridgedSourceLoc cLeftAngleLoc,
                               BridgedArrayRef cParameters,

lib/AST/CASTBridging.cpp

@@ -192,29 +192,6 @@ bool ASTContext_langOptsHasFeature(BridgedASTContext cContext,
   return convertASTContext(cContext).LangOpts.hasFeature((Feature)feature);
 }
 
-void *ImportDecl_create(BridgedASTContext cContext,
-                        BridgedDeclContext cDeclContext,
-                        BridgedSourceLoc cImportLoc, char kind,
-                        BridgedSourceLoc cKindLoc, BridgedArrayRef path,
-                        BridgedArrayRef cPathLocs) {
-  assert(path.numElements == cPathLocs.numElements);
-  ASTContext &context = convertASTContext(cContext);
-  DeclContext *declContext = convertDeclContext(cDeclContext);
-
-  ImportPath::Builder importPath;
-  for (auto p : llvm::zip(convertArrayRef<Identifier>(path),
-                          convertArrayRef<SourceLoc>(cPathLocs))) {
-    Identifier ident;
-    SourceLoc loc;
-    std::tie(ident, loc) = p;
-    importPath.push_back(ident, loc);
-  }
-  return ImportDecl::create(context, declContext, convertSourceLoc(cImportLoc),
-                            static_cast<ImportKind>(kind),
-                            convertSourceLoc(cKindLoc),
-                            std::move(importPath).get());
-}
-
 BridgedSourceLoc SourceLoc_advanced(BridgedSourceLoc cLoc, SwiftInt len) {
   SourceLoc loc = convertSourceLoc(cLoc).getAdvancedLoc(len);
   return {loc.getOpaquePointerValue()};
@@ -830,6 +807,28 @@ void *OperatorDecl_create(BridgedASTContext cContext,
   return static_cast<Decl *>(decl);
 }
 
+void *ImportDecl_create(BridgedASTContext cContext,
+                        BridgedDeclContext cDeclContext,
+                        BridgedSourceLoc cImportKeywordLoc,
+                        BridgedImportKind cImportKind,
+                        BridgedSourceLoc cImportKindLoc,
+                        BridgedArrayRef cImportPathElements) {
+  ImportPath::Builder builder;
+  for (auto &element :
+       convertArrayRef<BridgedIdentifierAndSourceLoc>(cImportPathElements)) {
+    builder.push_back(convertIdentifier(element.name),
+                      convertSourceLoc(element.nameLoc));
+  }
+
+  ASTContext &context = convertASTContext(cContext);
+  auto *decl = ImportDecl::create(
+      context, convertDeclContext(cDeclContext),
+      convertSourceLoc(cImportKeywordLoc), static_cast<ImportKind>(cImportKind),
+      convertSourceLoc(cImportKindLoc), std::move(builder).get());
+
+  return static_cast<Decl *>(decl);
+}
+
 void *OptionalTypeRepr_create(BridgedASTContext cContext, void *base,
                               BridgedSourceLoc cQuestionLoc) {
   ASTContext &context = convertASTContext(cContext);

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -350,6 +350,52 @@ extension ASTGenVisitor {
   }
 }
 
+// MARK: - ImportDecl
+
+extension BridgedImportKind {
+  fileprivate init?(from tokenKind: TokenKind) {
+    switch tokenKind {
+    case .keyword(.typealias): self = .type
+    case .keyword(.struct): self = .struct
+    case .keyword(.class): self = .class
+    case .keyword(.enum): self = .enum
+    case .keyword(.protocol): self = .protocol
+    case .keyword(.var), .keyword(.let): self = .var
+    case .keyword(.func): self = .func
+    default: return nil
+    }
+  }
+}
+
+extension ASTGenVisitor {
+  func visit(_ node: ImportDeclSyntax) -> ASTNode {
+    let importKind: BridgedImportKind
+    if let specifier = node.importKindSpecifier {
+      if let value = BridgedImportKind(from: specifier.tokenKind) {
+        importKind = value
+      } else {
+        self.diagnose(Diagnostic(node: specifier, message: UnexpectedTokenKindError(token: specifier)))
+        importKind = .module
+      }
+    } else {
+      importKind = .module
+    }
+
+    return .decl(
+      ImportDecl_create(
+        self.ctx,
+        self.declContext,
+        self.bridgedSourceLoc(for: node.importKeyword),
+        importKind,
+        self.bridgedSourceLoc(for: node.importKindSpecifier),
+        node.path.lazy.map {
+          $0.name.bridgedIdentifierAndSourceLoc(in: self) as BridgedIdentifierAndSourceLoc
+        }.bridgedArray(in: self)
+      )
+    )
+  }
+}
+
 extension ASTGenVisitor {
   @inline(__always)
   func visit(_ node: MemberBlockItemListSyntax) -> BridgedArrayRef {

test/ASTGen/verify-parse.swift

@@ -14,6 +14,16 @@
 
 // NB: Ridiculous formatting to test that we do not include leading trivia in locations.
 
+import
+Swift
+import typealias Swift.Codable
+import enum Swift.Optional
+import struct Swift.Array
+import class Swift.KeyPath
+import protocol Swift.Sequence
+import func Swift.max
+import var Swift._playgroundPrintHook
+
 func
 test1
 (