Make SourceLength a struct

swiftlang · ahoppen · Sep 12, 2018 · Apr 10, 2018 · Apr 24, 2018 · Apr 24, 2018
commit 9cef71e7b79246238cf002985e58609c8032d161
diff --git a/Sources/SwiftSyntax/RawSyntax.swift b/Sources/SwiftSyntax/RawSyntax.swift
@@ -24,6 +24,15 @@ extension CodingUserInfoKey {
     CodingUserInfoKey(rawValue: "SwiftSyntax.RawSyntax.OmittedNodeLookup")!
 }
 
+/// Box a value type into a reference type
+class Box<T> {
+  let value: T
+
+  init(_ value: T) {
+    self.value = value
+  }
+}
+
 /// A ID that uniquely identifies a syntax node and stays stable across multiple
 /// incremental parses
 public struct SyntaxNodeId: Hashable, Codable {
@@ -72,11 +81,11 @@ struct RawSyntax: Codable {
   /// incremental parses
   let id: SyntaxNodeId
 
-  var _contentLength = AtomicCache<SourceLength>()
+  var _contentLength = AtomicCache<Box<SourceLength>>()
 
   /// The length of this node excluding its leading and trailing trivia
   var contentLength: SourceLength {
-    return _contentLength.value() {
+    return _contentLength.value({
       switch data {
       case .node(kind: _, layout: let layout):
         let firstElementIndex = layout.firstIndex(where: { $0 != nil })
@@ -97,11 +106,11 @@ struct RawSyntax: Codable {
             contentLength += element.trailingTriviaLength
           }
         }
-        return contentLength
+        return Box(contentLength)
       case .token(kind: let kind, leadingTrivia: _, trailingTrivia: _):
-        return SourceLength(of: kind.text)
+        return Box(SourceLength(of: kind.text))
       }
-    }
+    }).value
   }
 
   init(kind: SyntaxKind, layout: [RawSyntax?], presence: SourcePresence,

diff --git a/Sources/SwiftSyntax/SourceLength.swift b/Sources/SwiftSyntax/SourceLength.swift
@@ -13,7 +13,7 @@
 /// The length a syntax node spans in the source code. From any AbsolutePosition
 /// you reach a node's end location by either adding its UTF-8 length or by
 /// inserting `lines` newlines and then moving `columns` columns to the right.
-public final class SourceLength {
+public struct SourceLength {
   public let newlines: Int
   public let columnsAtLastLine: Int
   public let utf8Length: Int
@@ -90,4 +90,4 @@ extension AbsolutePosition {
   public static func +=(lhs: inout AbsolutePosition, rhs: SourceLength) {
     lhs = lhs + rhs
   }
-}
+}
diff --git a/Sources/SwiftSyntax/SyntaxData.swift b/Sources/SwiftSyntax/SyntaxData.swift
@@ -18,15 +18,6 @@ import Foundation
 /// exposed to clients.
 typealias NodeIdentifier = [Int]
 
-/// Box a value type into a reference type
-fileprivate class Box<T> {
-  let value: T
-
-  init(_ value: T) {
-    self.value = value
-  }
-}
-
 /// SyntaxData is the underlying storage for each Syntax node.
 /// It's modelled as an array that stores and caches a SyntaxData for each raw
 /// syntax node in its layout. It is up to the specific Syntax nodes to maintain