commit 6148bfd882359e3a1520c02a1e2019c1ba58ac33 · jonmsterling.com/swift-pterodactyl

+100

Sources/PterodactylSyntax/BlockLayoutProcessor.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       import Foundation

     

       6
       6
       +
       

     

       7
       7
       +
       fileprivate struct TokenLocation {

     

       8
       8
       +
       	let startLine: Int

     

       9
       9
       +
       	let startColumn: Int

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       fileprivate struct LocatedToken {

     

       13
       13
       +
       	let token: Token

     

       14
       14
       +
       	let location: TokenLocation

     

       15
       15
       +
       	let lines: [String.SubSequence]

     

       16
       16
       +
       

     

       17
       17
       +
       	init(token: Token, location: TokenLocation) {

     

       18
       18
       +
       		self.token = token

     

       19
       19
       +
       		self.location = location

     

       20
       20
       +
       		self.lines = token.text.split(separator: "\n", omittingEmptySubsequences: false)

     

       21
       21
       +
       	}

     

       22
       22
       +
       

     

       23
       23
       +
       	var nextLocation: TokenLocation {

     

       24
       24
       +
       		let startLine = location.startLine + lines.count - 1

     

       25
       25
       +
       		let startColumn = if lines.count > 1 { lines.last!.utf16.count } else { lines.last?.utf16.count ?? location.startColumn }

     

       26
       26
       +
       		return TokenLocation(startLine: startLine, startColumn: startColumn)

     

       27
       27
       +
       	}

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       public struct BlockLayoutProcessor {

     

       31
       31
       +
       	private let locatedTokens: [LocatedToken]

     

       32
       32
       +
       

     

       33
       33
       +
       	public init(tokens: [Token]) {

     

       34
       34
       +
       		var locatedTokens: [LocatedToken] = []

     

       35
       35
       +
       		var location = TokenLocation(startLine: 0, startColumn: 0)

     

       36
       36
       +
       		for token in tokens {

     

       37
       37
       +
       			let locatedToken = LocatedToken(token: token, location: location)

     

       38
       38
       +
       			locatedTokens.append(locatedToken)

     

       39
       39
       +
       			location = locatedToken.nextLocation

     

       40
       40
       +
       		}

     

       41
       41
       +
       

     

       42
       42
       +
       		self.locatedTokens = locatedTokens

     

       43
       43
       +
       	}

     

       44
       44
       +
       

     

       45
       45
       +
       

     

       46
       46
       +
       	public func layout() -> [Token] {

     

       47
       47
       +
       		var result: [Token] = []

     

       48
       48
       +
       		var indentStack: [Int] = [0]

     

       49
       49
       +
       		var previousLine = 0

     

       50
       50
       +
       		var firstTokenInBlock = false

     

       51
       51
       +
       

     

       52
       52
       +
       		for (index, locatedToken) in locatedTokens.enumerated() {

     

       53
       53
       +
       			guard locatedToken.token.kind != .eof else { break }

     

       54
       54
       +
       			guard locatedToken.token.kind.canDetermineLayoutColumn else {

     

       55
       55
       +
       				result.append(locatedToken.token)

     

       56
       56
       +
       				continue

     

       57
       57
       +
       			}

     

       58
       58
       +
       

     

       59
       59
       +
       			if locatedToken.location.startLine > previousLine {

     

       60
       60
       +
       				while indentStack.count > 1 && locatedToken.location.startColumn < indentStack.last! {

     

       61
       61
       +
       					indentStack.removeLast()

     

       62
       62
       +
       					result.append(Token(kind: .blockEnd, text: ""))

     

       63
       63
       +
       				}

     

       64
       64
       +
       

     

       65
       65
       +
       				if !firstTokenInBlock && indentStack.count > 1 && locatedToken.location.startColumn == indentStack.last! {

     

       66
       66
       +
       					result.append(Token(kind: .blockSep, text: ""))

     

       67
       67
       +
       				}

     

       68
       68
       +
       			}

     

       69
       69
       +
       

     

       70
       70
       +
       			result.append(locatedToken.token)

     

       71
       71
       +
       

     

       72
       72
       +
       			if locatedToken.token.kind.isBlockHerald {

     

       73
       73
       +
       				firstTokenInBlock = true

     

       74
       74
       +
       

     

       75
       75
       +
       				if let nextToken = locatedTokens[index...].first(where: { $0.location.startLine > locatedToken.location.startLine && $0.token.kind.canDetermineLayoutColumn }) {

     

       76
       76
       +
       					result.append(Token(kind: .blockBegin, text: ""))

     

       77
       77
       +
       					indentStack.append(nextToken.location.startColumn)

     

       78
       78
       +
       				} else {

     

       79
       79
       +
       					result.append(Token(kind: .blockBegin, text: ""))

     

       80
       80
       +
       					result.append(Token(kind: .blockEnd, text: ""))

     

       81
       81
       +
       				}

     

       82
       82
       +
       			} else {

     

       83
       83
       +
       				firstTokenInBlock = false

     

       84
       84
       +
       			}

     

       85
       85
       +
       

     

       86
       86
       +
       			previousLine = locatedToken.location.startLine

     

       87
       87
       +
       		}

     

       88
       88
       +
       

     

       89
       89
       +
       		while indentStack.count > 1 {

     

       90
       90
       +
       			indentStack.removeLast()

     

       91
       91
       +
       			result.append(Token(kind: .blockEnd, text: ""))

     

       92
       92
       +
       		}

     

       93
       93
       +
       

     

       94
       94
       +
       		if let eof = locatedTokens.last, eof.token.kind == .eof {

     

       95
       95
       +
       			result.append(eof.token)

     

       96
       96
       +
       		}

     

       97
       97
       +
       

     

       98
       98
       +
       		return result

     

       99
       99
       +
       	}

     

       100
       100
       +
       }

+25

Sources/PterodactylSyntax/Diagnostic.swift

···

       1
       1
       +
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       public struct Diagnostic: Equatable {

     

       6
       6
       +
       	enum Severity: Equatable {

     

       7
       7
       +
       		case error

     

       8
       8
       +
       		case warning

     

       9
       9
       +
       		case note

     

       10
       10
       +
       	}

     

       11
       11
       +
       	let message: String

     

       12
       12
       +
       	let severity: Severity

     

       13
       13
       +
       	/// Absolute UTF-16 code unit offsets from start of source

     

       14
       14
       +
       	let absoluteRange: Range<Int>

     

       15
       15
       +
       

     

       16
       16
       +
       	init(message: String, severity: Severity, absoluteRange: Range<Int>) {

     

       17
       17
       +
       		self.message = message

     

       18
       18
       +
       		self.severity = severity

     

       19
       19
       +
       		self.absoluteRange = absoluteRange

     

       20
       20
       +
       	}

     

       21
       21
       +
       

     

       22
       22
       +
       	init(message: String, absoluteRange: Range<Int>) {

     

       23
       23
       +
       		self.init(message: message, severity: Severity.error, absoluteRange: absoluteRange)

     

       24
       24
       +
       	}

     

       25
       25
       +
       }

+4 -1

Sources/PterodactylSyntax/Lexer.swift

···

       1
       1
        
       // SPDX-FileCopyrightText: 2025 The Project Pterodactyl Developers

     

       2
       2
       -
        //

     

       2
       2
       +
       //

     

       3
       3
       +
       // SPDX-License-Identifier: MPL-2.0

     

       4
       4
       +
       

     

       5
       5
       +
       //

     

       3
       6
        
        // SPDX-License-Identifier: MPL-2.0

     

       4
       7
        
        

     

       5
       8
        
        import Foundation

+12 -10

Sources/PterodactylSyntax/SyntaxTree.swift

···

       5
       5
        
       import Foundation

     

       6
       6
        
       

     

       7
       7
        
       public struct SyntaxTree: Codable, Sendable {

     

       8
       8
       -
       	public let kind: SyntaxTreeKind

     

       9
       9
       -
       	public let metadata: SyntaxTreeMetadata?

     

       10
       10
       -
       	public let children: [Child]

     

       11
       11
       -
       	public let utf16Length: Int

     

       12
       12
       -
         

     

       8
       8
       +
       	public var kind: SyntaxTreeKind

     

       9
       9
       +
       	public var metadata: SyntaxTreeMetadata?

     

       10
       10
       +
       	public var children: [Child]

     

       11
       11
       +
       

     

       12
       12
       +
       	public var utf16Length: Int {

     

       13
       13
       +
       		children.reduce(0) { length, child in

     

       14
       14
       +
       			length + child.utf16Length

     

       15
       15
       +
       		}

     

       16
       16
       +
       	}

     

       17
       17
       +
       

     

       13
       18
        
         public enum Child: Codable, Sendable {

     

       14
       14
       -
           case token(Token, metadata: TokenMetadata?)

     

       19
       19
       +
           case token(Token, metadata: TokenMetadata? = nil)

     

       15
       20
        
           case tree(SyntaxTree)

     

       16
       21
        
         }

     

       17
       22
        
       

     

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

     

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

     

       19
       24
        
       		self.kind = kind

     

       20
       25
        
       		self.metadata = metadata

     

       21
       26
        
       		self.children = children

     

       22
       22
       -
       		self.utf16Length = children.reduce(0) { length, child in

     

       23
       23
       -
       			length + child.utf16Length

     

       24
       24
       -
       		}

     

       25
       27
        
       	}

     

       26
       28
        
       }

     

       27
       29

+34 -2

Sources/PterodactylSyntax/Types.swift

···

       6
       6
        
       

     

       7
       7
        
       public enum Keyword: Codable, Equatable, Sendable {

     

       8
       8
        
       	case `import`

     

       9
       9
       +
       	case theory

     

       10
       10
       +
       	case `where`

     

       9
       11
        
       }

     

       10
       12
        
       

     

       11
       13
        
       public enum Whitespace: Codable, Equatable, Sendable {

     
···

       19
       21
        
       	case error

     

       20
       22
        
       	case identifier

     

       21
       23
        
       	case whitespace(Whitespace)

     

       24
       24
       +
       	case blockBegin

     

       25
       25
       +
       	case blockEnd

     

       26
       26
       +
       	case blockSep

     

       22
       27
        
       }

     

       23
       28
        
       

     

       24
       24
       -
       public enum SyntaxTreeKind: Codable, Equatable, Sendable {

     

       25
       25
       -
         case error

     

       29
       29
       +
       public final class SyntaxTreeKind: Codable, Equatable, Sendable {

     

       30
       30
       +
       	static let error: SyntaxTreeKind = .init(name: "error")

     

       31
       31
       +
       	

     

       32
       32
       +
       	public static func == (lhs: SyntaxTreeKind, rhs: SyntaxTreeKind) -> Bool {

     

       33
       33
       +
       		lhs === rhs

     

       34
       34
       +
       	}

     

       35
       35
       +
       	

     

       36
       36
       +
       	let name: String

     

       37
       37
       +
       	var description: String { name }

     

       38
       38
       +
       	

     

       39
       39
       +
       	required init(name: String) {

     

       40
       40
       +
       		self.name = name

     

       41
       41
       +
       	}

     

       26
       42
        
       }

     

       27
       43
        
       

     

       28
       44
        
       public struct TokenMetadata: Codable, Equatable, Sendable {

     
···

       31
       47
        
       public struct SyntaxTreeMetadata: Codable, Equatable, Sendable {

     

       32
       48
        
         

     

       33
       49
        
       }

     

       50
       50
       +
       

     

       51
       51
       +
       extension TokenKind {

     

       52
       52
       +
       	var canDetermineLayoutColumn: Bool {

     

       53
       53
       +
       		switch self {

     

       54
       54
       +
       		case .whitespace, .eof: false

     

       55
       55
       +
       		default: true

     

       56
       56
       +
       		}

     

       57
       57
       +
       	}

     

       58
       58
       +
       	

     

       59
       59
       +
       	var isBlockHerald: Bool {

     

       60
       60
       +
       		switch self {

     

       61
       61
       +
       		case .keyword(.where): true

     

       62
       62
       +
       		default: false 

     

       63
       63
       +
       		}

     

       64
       64
       +
       	}

     

       65
       65
       +
       }