commit 4cf4750440fc86cf6770b593f4a9663fdede810f · jonmsterling.com/swift-pterodactyl

+5 -5

Sources/PterodactylSyntax/Cursor.swift

···

       1
        
       import Foundation

     

       2
        
       

     

       3
       -
       public struct Cursor<L: Language>: Sendable {

     

       4
       -
       	let node: Child<L>

     

       5
        
       	let utf16Offset: Int

     

       6
       -
       	let children: [Cursor<L>]

     

       7
        
       	

     

       8
       -
       	init(node: Child<L>, utf16Offset: Int) {

     

       9
        
       		self.node = node

     

       10
        
       		self.utf16Offset = utf16Offset

     

       11
        
       		

     

       12
       -
       		var children: [Cursor<L>] = []

     

       13
        
       		var utf16Offset = utf16Offset

     

       14
        
       		for childNode in node.children {

     

       15
        
       			children.append(Self(node: childNode, utf16Offset: utf16Offset))

···

       1
        
       import Foundation

     

       2
        
       

     

       3
       +
       public struct Cursor: Sendable {

     

       4
       +
         let node: SyntaxTree.Child

     

       5
        
       	let utf16Offset: Int

     

       6
       +
       	let children: [Cursor]

     

       7
        
       	

     

       8
       +
         init(node: SyntaxTree.Child, utf16Offset: Int) {

     

       9
        
       		self.node = node

     

       10
        
       		self.utf16Offset = utf16Offset

     

       11
        
       		

     

       12
       +
       		var children: [Cursor] = []

     

       13
        
       		var utf16Offset = utf16Offset

     

       14
        
       		for childNode in node.children {

     

       15
        
       			children.append(Self(node: childNode, utf16Offset: utf16Offset))

-16

Sources/PterodactylSyntax/Protocols.swift

···

       1
       -
       import Foundation

     

       2
       -
       

     

       3
       -
       public protocol TreeKindType: Equatable, Sendable {

     

       4
       -
       	static var error: Self { get }

     

       5
       -
       }

     

       6
       -
       

     

       7
       -
       public protocol TokenKindType: Equatable, Sendable {

     

       8
       -
       	static var eof: Self { get }

     

       9
       -
       }

     

       10
       -
       

     

       11
       -
       public protocol Language {

     

       12
       -
       	associatedtype TokenKind: TokenKindType

     

       13
       -
       	associatedtype TreeKind: TreeKindType

     

       14
       -
       	associatedtype TokenMetadata: Sendable, Equatable

     

       15
       -
       	associatedtype TreeMetadata: Sendable, Equatable

     

       16
       -
       }

+4 -4

Sources/PterodactylSyntax/Token.swift

···

       1
        
       import Foundation

     

       2
        
       

     

       3
       -
       public struct Token<Kind> {

     

       4
       -
       	public let kind: Kind

     

       5
        
       	public let text: String

     

       6
        
       	public let utf16Length: Int

     

       7
        
       	

     

       8
       -
       	init(kind: Kind, text: String) {

     

       9
        
       		self.kind = kind

     

       10
        
       		self.text = text

     

       11
        
       		self.utf16Length = text.utf16.count

     

       12
        
       	}

     

       13
        
       }

     

       14
        
       

     

       15
       -
       extension Token: Sendable where Kind: Sendable {}

···

       1
        
       import Foundation

     

       2
        
       

     

       3
       +
       public struct Token: Codable {

     

       4
       +
       	public let kind: TokenKind

     

       5
        
       	public let text: String

     

       6
        
       	public let utf16Length: Int

     

       7
        
       	

     

       8
       +
       	init(kind: TokenKind, text: String) {

     

       9
        
       		self.kind = kind

     

       10
        
       		self.text = text

     

       11
        
       		self.utf16Length = text.utf16.count

     

       12
        
       	}

     

       13
        
       }

     

       14
        
       

     

       15
       +
       extension Token: Sendable {}

+14 -14

Sources/PterodactylSyntax/Tree.swift Sources/PterodactylSyntax/SyntaxTree.swift

···

       1
        
       import Foundation

     

       2
        
       

     

       3
       -
       public struct Tree<L: Language>: Sendable {

     

       4
       -
       	public let kind: L.TreeKind

     

       5
       -
       	public let metadata: L.TreeMetadata?

     

       6
       -
       	public let children: [Child<L>]

     

       7
        
       	public let utf16Length: Int

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
       

     

       9
       -
       	public init(kind: L.TreeKind, metadata: L.TreeMetadata?, children: [Child<L>]) {

     

       10
        
       		self.kind = kind

     

       11
        
       		self.metadata = metadata

     

       12
        
       		self.children = children

     
···

       16
        
       	}

     

       17
        
       }

     

       18
        
       

     

       19
       -
       public enum Child<L: Language>: Sendable {

     

       20
       -
       	case token(Token<L.TokenKind>, metadata: L.TokenMetadata?)

     

       21
       -
       	case tree(Tree<L>)

     

       22
       -
       }

     

       23
       -
       

     

       24
       -
       extension Tree {

     

       25
        
       	public var text: String {

     

       26
        
       		children.map(\.text).joined()

     

       27
        
       	}

     

       28
        
       }

     

       29
        
       

     

       30
       -
       extension Child {

     

       31
        
       	var text: String {

     

       32
        
       		switch self {

     

       33
        
       		case let .token(tok, _): tok.text

     
···

       37
        
       

     

       38
        
       	var utf16Length: Int {

     

       39
        
       		switch self {

     

       40
       -
       		case let .token(token, metadata): token.utf16Length

     

       41
        
       		case let .tree(tree): tree.utf16Length

     

       42
        
       		}

     

       43
        
       	}

     
···

       50
        
       	}

     

       51
        
       }

     

       52
        
       

     

       53
       -
       extension Tree: CustomStringConvertible {

     

       54
        
       	public var description: String {

     

       55
        
       		prettyPrint()

     

       56
        
       	}

···

       1
        
       import Foundation

     

       2
        
       

     

       3
       +
       public struct SyntaxTree: Codable, Sendable {

     

       4
       +
       	public let kind: SyntaxTreeKind

     

       5
       +
       	public let metadata: SyntaxTreeMetadata?

     

       6
       +
       	public let children: [Child]

     

       7
        
       	public let utf16Length: Int

     

       8
       +
         

     

       9
       +
         public enum Child: Codable, Sendable {

     

       10
       +
           case token(Token, metadata: TokenMetadata?)

     

       11
       +
           case tree(SyntaxTree)

     

       12
       +
         }

     

       13
        
       

     

       14
       +
         public init(kind: SyntaxTreeKind, metadata: SyntaxTreeMetadata?, children: [SyntaxTree.Child]) {

     

       15
        
       		self.kind = kind

     

       16
        
       		self.metadata = metadata

     

       17
        
       		self.children = children

     
···

       21
        
       	}

     

       22
        
       }

     

       23
        
       

     

       24
       +
       extension SyntaxTree {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
       	public var text: String {

     

       26
        
       		children.map(\.text).joined()

     

       27
        
       	}

     

       28
        
       }

     

       29
        
       

     

       30
       +
       extension SyntaxTree.Child {

     

       31
        
       	var text: String {

     

       32
        
       		switch self {

     

       33
        
       		case let .token(tok, _): tok.text

     
···

       37
        
       

     

       38
        
       	var utf16Length: Int {

     

       39
        
       		switch self {

     

       40
       +
       		case let .token(token, _): token.utf16Length

     

       41
        
       		case let .tree(tree): tree.utf16Length

     

       42
        
       		}

     

       43
        
       	}

     
···

       50
        
       	}

     

       51
        
       }

     

       52
        
       

     

       53
       +
       extension SyntaxTree: CustomStringConvertible {

     

       54
        
       	public var description: String {

     

       55
        
       		prettyPrint()

     

       56
        
       	}

+16

Sources/PterodactylSyntax/Types.swift

···

       1
       +
       import Foundation

     

       2
       +
       

     

       3
       +
       public enum TokenKind: Codable, Equatable, Sendable {

     

       4
       +
         case eof

     

       5
       +
       }

     

       6
       +
       

     

       7
       +
       public enum SyntaxTreeKind: Codable, Equatable, Sendable {

     

       8
       +
         case error

     

       9
       +
       }

     

       10
       +
       

     

       11
       +
       public struct TokenMetadata: Codable, Equatable, Sendable {

     

       12
       +
       }

     

       13
       +
       

     

       14
       +
       public struct SyntaxTreeMetadata: Codable, Equatable, Sendable {

     

       15
       +
         

     

       16
       +
       }