[ASTGen] Move getIdentifier() etc to ASTGenVisitor

Now that `getIdentifier()` has some logic in it. It's not a simple
bridging.

Author: rintaro

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -14,7 +14,7 @@ import ASTBridging
 import BasicBridging
 import ParseBridging
 // Needed to use BumpPtrAllocator
-@_spi(BumpPtrAllocator) import SwiftSyntax
+@_spi(BumpPtrAllocator) @_spi(RawSyntax) import SwiftSyntax
 
 import struct SwiftDiagnostics.Diagnostic
 
@@ -106,7 +106,7 @@ struct ASTGenVisitor {
     var out = [BridgedDecl]()
 
     for element in node.statements {
-      let loc = element.bridgedSourceLoc(in: self)
+      let loc = self.bridgedSourceLoc(syntax: element)
       let swiftASTNodes = generate(codeBlockItem: element)
       switch swiftASTNodes {
       case .decl(let d):
@@ -138,6 +138,73 @@ struct ASTGenVisitor {
   }
 }
 
+extension ASTGenVisitor {
+  /// Obtains a bridged, `ASTContext`-owned "identifier".
+  ///
+  /// If the token text is `_`, return an empty identifier. If the token is an
+  /// escaped identifier, backticks are stripped.
+  func bridgedIdentifier(token: TokenSyntax) -> BridgedIdentifier {
+    var text = token.rawText
+    if text == "_" {
+      return nil
+    }
+    if text.count > 2 && text.hasPrefix("`") && text.hasSuffix("`") {
+      text = .init(rebasing: text.dropFirst().dropLast())
+    }
+    return self.ctx.getIdentifier(text.bridged)
+  }
+
+  /// Obtains a bridged, `ASTContext`-owned "identifier".
+  ///
+  /// If the `token` text is `nil`, return an empty identifier.
+  func bridgedIdentifier(token: TokenSyntax?) -> BridgedIdentifier {
+    token.map(bridgedIdentifier(token:)) ?? nil
+  }
+
+  /// Obtains the start location of the node excluding leading trivia in the
+  /// source buffer.
+  func bridgedSourceLoc(syntax node: some SyntaxProtocol) -> BridgedSourceLoc {
+    BridgedSourceLoc(at: node.positionAfterSkippingLeadingTrivia, in: self.base)
+  }
+
+  /// Obtains the start location of the node excluding leading trivia in the
+  /// source buffer. If the `node` is nil returns an invalid source location.
+  func bridgedSourceLoc(syntax node: (some SyntaxProtocol)?) -> BridgedSourceLoc {
+    node.map(bridgedSourceLoc(syntax:)) ?? nil
+  }
+
+  /// Obtains a pair of bridged identifier and the bridged source location.
+  func bridgedIdentifierAndSourceLoc(token: TokenSyntax) -> (identifier: BridgedIdentifier, sourceLoc: BridgedSourceLoc) {
+    return (
+      self.bridgedIdentifier(token: token),
+      self.bridgedSourceLoc(syntax: token)
+    )
+  }
+
+  /// Obtains a pair of bridged identifier and the bridged source location.
+  /// If `token` is `nil`, returns a pair of an empty identifier and an invalid
+  /// source location.
+  func bridgedIdentifierAndSourceLoc(token: TokenSyntax?) -> (identifier: BridgedIdentifier, sourceLoc: BridgedSourceLoc) {
+    token.map(bridgedIdentifierAndSourceLoc(token:)) ?? (nil, nil)
+  }
+
+  /// Obtains a pair of bridged identifier and the bridged source location.
+  func bridgedIdentifierAndSourceLoc(token: TokenSyntax) -> BridgedIdentifierAndSourceLoc {
+    BridgedIdentifierAndSourceLoc(
+      name: self.bridgedIdentifier(token: token),
+      nameLoc: self.bridgedSourceLoc(syntax: token)
+    )
+  }
+
+  /// Obtains bridged token source range from a pair of token nodes.
+  func bridgedSourceRange(startToken: TokenSyntax, endToken: TokenSyntax) -> BridgedSourceRange {
+    BridgedSourceRange(
+      start: self.bridgedSourceLoc(syntax: startToken),
+      end: self.bridgedSourceLoc(syntax: endToken)
+    )
+  }
+}
+
 extension ASTGenVisitor {
   /// Replaces the current declaration context with `declContext` for the duration of its execution, and calls `body`.
   @inline(__always)

lib/ASTGen/Sources/ASTGen/Bridge.swift

@@ -78,13 +78,6 @@ public extension BridgedSourceLoc {
   }
 }
 
-extension BridgedSourceRange {
-  @inline(__always)
-  init(startToken: TokenSyntax, endToken: TokenSyntax, in astgen: ASTGenVisitor) {
-    self.init(start: startToken.bridgedSourceLoc(in: astgen), end: endToken.bridgedSourceLoc(in: astgen))
-  }
-}
-
 extension String {
   init(bridged: BridgedStringRef) {
     self.init(
@@ -136,90 +129,3 @@ extension BridgedStringRef {
     return self.data == nil && self.count == 0
   }
 }
-
-extension SyntaxProtocol {
-  /// Obtains the bridged start location of the node excluding leading trivia in the source buffer provided by `astgen`
-  ///
-  /// - Parameter astgen: The visitor providing the source buffer.
-  @inline(__always)
-  func bridgedSourceLoc(in astgen: ASTGenVisitor) -> BridgedSourceLoc {
-    return BridgedSourceLoc(at: self.positionAfterSkippingLeadingTrivia, in: astgen.base)
-  }
-}
-
-extension Optional where Wrapped: SyntaxProtocol {
-  /// Obtains the bridged start location of the node excluding leading trivia in the source buffer provided by `astgen`.
-  ///
-  /// - Parameter astgen: The visitor providing the source buffer.
-  @inline(__always)
-  func bridgedSourceLoc(in astgen: ASTGenVisitor) -> BridgedSourceLoc {
-    guard let self else {
-      return nil
-    }
-
-    return self.bridgedSourceLoc(in: astgen)
-  }
-}
-
-extension TokenSyntax {
-  /// Obtains a bridged, `ASTContext`-owned copy of this token's text.
-  ///
-  /// - Parameter astgen: The visitor providing the `ASTContext`.
-  @inline(__always)
-  func bridgedIdentifier(in astgen: ASTGenVisitor) -> BridgedIdentifier {
-    var text = self.rawText
-    if rawText == "_" {
-      return nil
-    }
-    if rawText.count > 2 && rawText.hasPrefix("`") && rawText.hasSuffix("`") {
-      text = .init(rebasing: text.dropFirst().dropLast())
-    }
-    return astgen.ctx.getIdentifier(rawText.bridged)
-  }
-
-  /// Obtains a bridged, `ASTContext`-owned copy of this token's text, and its bridged start location in the
-  /// source buffer provided by `astgen`.
-  ///
-  /// - Parameter astgen: The visitor providing the `ASTContext` and source buffer.
-  @inline(__always)
-  func bridgedIdentifierAndSourceLoc(in astgen: ASTGenVisitor) -> (BridgedIdentifier, BridgedSourceLoc) {
-    return (self.bridgedIdentifier(in: astgen), self.bridgedSourceLoc(in: astgen))
-  }
-
-  /// Obtains a bridged, `ASTContext`-owned copy of this token's text, and its bridged start location in the
-  /// source buffer provided by `astgen`.
-  ///
-  /// - Parameter astgen: The visitor providing the `ASTContext` and source buffer.
-  @inline(__always)
-  func bridgedIdentifierAndSourceLoc(in astgen: ASTGenVisitor) -> BridgedIdentifierAndSourceLoc {
-    let (name, nameLoc) = self.bridgedIdentifierAndSourceLoc(in: astgen)
-    return .init(name: name, nameLoc: nameLoc)
-  }
-}
-
-extension Optional<TokenSyntax> {
-  /// Obtains a bridged, `ASTContext`-owned copy of this token's text.
-  ///
-  /// - Parameter astgen: The visitor providing the `ASTContext`.
-  @inline(__always)
-  func bridgedIdentifier(in astgen: ASTGenVisitor) -> BridgedIdentifier {
-    guard let self else {
-      return nil
-    }
-
-    return self.bridgedIdentifier(in: astgen)
-  }
-
-  /// Obtains a bridged, `ASTContext`-owned copy of this token's text, and its bridged start location in the
-  /// source buffer provided by `astgen` excluding leading trivia.
-  ///
-  /// - Parameter astgen: The visitor providing the `ASTContext` and source buffer.
-  @inline(__always)
-  func bridgedIdentifierAndSourceLoc(in astgen: ASTGenVisitor) -> (BridgedIdentifier, BridgedSourceLoc) {
-    guard let self else {
-      return (nil, nil)
-    }
-
-    return self.bridgedIdentifierAndSourceLoc(in: astgen)
-  }
-}