comparing 6148bfd882359e3a1520c02a1e2019c1ba58ac33 and push-qvwwonwuvquy on jonmsterling.com/swift-pterodactyl

+1

.gitignore

···

       2
       2
        
       #

     

       3
       3
        
       # SPDX-License-Identifier: MPL-2.0

     

       4
       4
        
       

     

       5
       5
       +
       .jj/*

     

       5
       6
        
       .DS_Store

     

       6
       7
        
       /.build

     

       7
       8
        
       /Packages

-1

Package.swift

···

       47
       47
        
       			name: "PterodactylBuildTests",

     

       48
       48
        
       			dependencies: [

     

       49
       49
        
       				"PterodactylBuild",

     

       50
       50
       -
       				"PterodactylSyntax",

     

       51
       50
        
       				.product(name: "llbuild2fx", package: "swift-llbuild2")

     

       52
       51
        
       			]

     

       53
       52
        
       		),

+14 -42

Sources/PterodactylBuild/Keys/AnalyseImports.swift

···

       5
       5
        
       import Foundation

     

       6
       6
        
       import TSCBasic

     

       7
       7
        
       import llbuild2fx

     

       8
       8
       -
       import PterodactylSyntax

     

       9
       9
       -
       

     

       10
       10
       -
       private struct ImportParser {

     

       11
       11
       -
       	private var lexer: PterodactylSyntax.Lexer

     

       12
       12
       -
       	public private(set) var imports: [String] = []

     

       13
       13
       -
       

     

       14
       14
       -
       	public init(input: String) {

     

       15
       15
       -
       		self.lexer = PterodactylSyntax.Lexer(input: input)

     

       16
       16
       -
       	}

     

       17
       17
       -
       

     

       18
       18
       -
       	public mutating func parseHeader() {

     

       19
       19
       -
       		while true {

     

       20
       20
       -
       			let token = nextSignificantToken()

     

       21
       21
       -
       			switch token.kind {

     

       22
       22
       -
       			case .keyword(.import): parseImportStatement()

     

       23
       23
       -
       			default: return

     

       24
       24
       -
       			}

     

       25
       25
       -
       		}

     

       26
       26
       -
       	}

     

       27
       27
       -
       

     

       28
       28
       -
       	/// Returns the next non-whitespace token.

     

       29
       29
       -
       	private mutating func nextSignificantToken() -> Token {

     

       30
       30
       -
       		var token = lexer.nextToken()

     

       31
       31
       -
       		while case .whitespace = token.kind {

     

       32
       32
       -
       			token = lexer.nextToken()

     

       33
       33
       -
       		}

     

       34
       34
       -
       		return token

     

       35
       35
       -
       	}

     

       36
       36
       -
       

     

       37
       37
       -
       	/// Parses a single `import xyz` line.

     

       38
       38
       -
       	private mutating func parseImportStatement() {

     

       39
       39
       -
       		let next = nextSignificantToken()

     

       40
       40
       -
       		guard next.kind == .identifier else { return }

     

       41
       41
       -
       		imports.append(next.text)

     

       42
       42
       -
       	}

     

       43
       43
       -
       }

     

       44
       44
       -
       

     

       45
       8
        
       

     

       46
       9
        
       extension Keys {

     

       47
       10
        
       	struct AnalyseImports: BuildKey {

     
···

       51
       14
        
       		func computeValue(_ ctx: BuildContext<Self>) async throws -> [UnitName] {

     

       52
       15
        
       			let contents = try await ctx.load(blobId)

     

       53
       16
        
       			let code = try await String(decoding: Data(ctx.read(blob: contents.blob!)), as: UTF8.self)

     

       54
       54
       -
       			var importParser = ImportParser(input: code)

     

       55
       55
       -
       			importParser.parseHeader()

     

       56
       56
       -
       			

     

       57
       57
       -
       			return importParser.imports.map { name in

     

       58
       58
       -
       				UnitName(basename: name)

     

       17
       17
       +
       

     

       18
       18
       +
       			var results: [UnitName] = []

     

       19
       19
       +
       			let lines = code.split(separator: "\n", omittingEmptySubsequences: false)

     

       20
       20
       +
       

     

       21
       21
       +
       			for line in lines {

     

       22
       22
       +
       				let trimmed = line.trimmingCharacters(in: .whitespaces)

     

       23
       23
       +
       				guard trimmed.hasPrefix("import ") else { continue }

     

       24
       24
       +
       				let parts = trimmed.split(separator: " ", maxSplits: 1, omittingEmptySubsequences: true)

     

       25
       25
       +
       				if parts.count == 2 {

     

       26
       26
       +
       					let name = parts[1].trimmingCharacters(in: .whitespaces)

     

       27
       27
       +
       					results.append(UnitName(name: name))

     

       28
       28
       +
       				}

     

       59
       29
        
       			}

     

       30
       30
       +
       

     

       31
       31
       +
       			return results

     

       60
       32
        
       		}

     

       61
       33
        
       	}

     

       62
       34
        
       }

+7

Sources/PterodactylBuild/Keys/Keys.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
       +
       enum Keys {}

-7

Sources/PterodactylBuild/Keys.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
       -
       enum Keys {}

+5 -5

Sources/PterodactylBuild/Types/UnitName.swift

···

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

     

       4
       4
        
       

     

       5
       5
        
       import Foundation

     

       6
       6
       -
       import TSCBasic

     

       7
       6
        
       import llbuild2fx

     

       7
       7
       +
       import TSCBasic

     

       8
       8
        
       

     

       9
       9
        
       struct UnitName: Codable, Equatable, Hashable {

     

       10
       10
       -
       	var basename: String

     

       10
       10
       +
       	var name: String

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
        
       extension UnitName: FXValue {}

     

       14
       14
        
       

     

       15
       15
        
       extension UnitName {

     

       16
       16
       -
       	static func fromPath(_ path: AbsolutePath) -> Self {

     

       17
       17
       -
       		Self(basename: path.basenameWithoutExt)

     

       18
       18
       -
       	}

     

       16
       16
       +
         static func fromPath(_ path: AbsolutePath) -> Self {

     

       17
       17
       +
           Self(name: path.basenameWithoutExt)

     

       18
       18
       +
         }

     

       19
       19
        
       }

-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
       -
       }

-76

Sources/PterodactylSyntax/Lexer.swift

···

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

     

       2
       2
       -
       //

     

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

     

       4
       4
       -
       

     

       5
       5
       -
       //

     

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

     

       7
       7
       -
        

     

       8
       8
       -
        import Foundation

     

       9
       9
       -
        

     

       10
       10
       -
       public struct Lexer {

     

       11
       11
       -
        	private let input: String

     

       12
       12
       -
        	private var index: String.Index

     

       13
       13
       -
       	private var tokens: [PterodactylSyntax.Token]

     

       14
       14
       -
        

     

       15
       15
       -
       	public init(input: String) {

     

       16
       16
       -
        		self.input = input

     

       17
       17
       -
        		self.index = input.startIndex

     

       18
       18
       -
        		self.tokens = []

     

       19
       19
       -
        	}

     

       20
       20
       -
        

     

       21
       21
       -
        	static let keywords: [String: Keyword] = [

     

       22
       22
       -
        		"import": .import

     

       23
       23
       -
        	]

     

       24
       24
       -
        

     

       25
       25
       -
        	public mutating func nextToken() -> Token {

     

       26
       26
       -
        		guard !isAtEnd else {

     

       27
       27
       -
        			return Token(kind: .eof, text: "")

     

       28
       28
       -
        		}

     

       29
       29
       -
        

     

       30
       30
       -
        		let char = currentChar

     

       31
       31
       -
        

     

       32
       32
       -
        		if char.isNewline {

     

       33
       33
       -
        			advance()

     

       34
       34
       -
        			return Token(kind: .whitespace(.newline), text: String(char))

     

       35
       35
       -
        		}

     

       36
       36
       -
        

     

       37
       37
       -
        		if char.isWhitespace {

     

       38
       38
       -
        			let text = readWhile { $0.isWhitespace && !$0.isNewline }

     

       39
       39
       -
        			return Token(kind: .whitespace(.other), text: text)

     

       40
       40
       -
        		}

     

       41
       41
       -
        

     

       42
       42
       -
        		if char.isLetter {

     

       43
       43
       -
        			let word = readWhile { $0.isLetter || $0.isNumber || $0 == "_" }

     

       44
       44
       -
        			let kind: TokenKind =

     

       45
       45
       -
        				if let keyword = Self.keywords[word] {

     

       46
       46
       -
        					.keyword(keyword)

     

       47
       47
       -
        				} else {

     

       48
       48
       -
        					.identifier

     

       49
       49
       -
        				}

     

       50
       50
       -
        			return Token(kind: kind, text: word)

     

       51
       51
       -
        		}

     

       52
       52
       -
        

     

       53
       53
       -
        		advance()

     

       54
       54
       -
        		return Token(kind: .error, text: String(char))

     

       55
       55
       -
        	}

     

       56
       56
       -
        

     

       57
       57
       -
        	private mutating func readWhile(_ condition: (Character) -> Bool) -> String {

     

       58
       58
       -
        		var result = ""

     

       59
       59
       -
        		while !isAtEnd && condition(currentChar) {

     

       60
       60
       -
        			result.append(currentChar)

     

       61
       61
       -
        			advance()

     

       62
       62
       -
        		}

     

       63
       63
       -
        		return result

     

       64
       64
       -
        	}

     

       65
       65
       -
        

     

       66
       66
       -
        	private var currentChar: Character { input[index] }

     

       67
       67
       -
        	

     

       68
       68
       -
        	private var isAtEnd: Bool {

     

       69
       69
       -
        		index == input.endIndex

     

       70
       70
       -
        	}

     

       71
       71
       -
        

     

       72
       72
       -
        	private mutating func advance() {

     

       73
       73
       -
        		guard index < input.endIndex else { return }

     

       74
       74
       -
        		index = input.index(after: index)

     

       75
       75
       -
        	}

     

       76
       76
       -
        }

+10 -12

Sources/PterodactylSyntax/SyntaxTree.swift

···

       5
       5
        
       import Foundation

     

       6
       6
        
       

     

       7
       7
        
       public struct SyntaxTree: Codable, Sendable {

     

       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
       -
       

     

       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
       +
         

     

       18
       13
        
         public enum Child: Codable, Sendable {

     

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

     

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

     

       20
       15
        
           case tree(SyntaxTree)

     

       21
       16
        
         }

     

       22
       17
        
       

     

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

     

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

     

       24
       19
        
       		self.kind = kind

     

       25
       20
        
       		self.metadata = metadata

     

       26
       21
        
       		self.children = children

     

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

     

       23
       23
       +
       			length + child.utf16Length

     

       24
       24
       +
       		}

     

       27
       25
        
       	}

     

       28
       26
        
       }

     

       29
       27

+2 -47

Sources/PterodactylSyntax/Types.swift

···

       4
       4
        
       

     

       5
       5
        
       import Foundation

     

       6
       6
        
       

     

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

     

       8
       8
       -
       	case `import`

     

       9
       9
       -
       	case theory

     

       10
       10
       -
       	case `where`

     

       11
       11
       -
       }

     

       12
       12
       -
       

     

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

     

       14
       14
       -
       	case newline

     

       15
       15
       -
       	case other

     

       16
       16
       -
       }

     

       17
       17
       -
       

     

       18
       7
        
       public enum TokenKind: Codable, Equatable, Sendable {

     

       19
       8
        
         case eof

     

       20
       20
       -
       	case keyword(Keyword)

     

       21
       21
       -
       	case error

     

       22
       22
       -
       	case identifier

     

       23
       23
       -
       	case whitespace(Whitespace)

     

       24
       24
       -
       	case blockBegin

     

       25
       25
       -
       	case blockEnd

     

       26
       26
       -
       	case blockSep

     

       27
       9
        
       }

     

       28
       10
        
       

     

       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
       -
       	}

     

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

     

       12
       12
       +
         case error

     

       42
       13
        
       }

     

       43
       14
        
       

     

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

     
···

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

     

       48
       19
        
         

     

       49
       20
        
       }

     

       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
       -
       }

-4

license.sh

···

       1
       1
       -
       #!/bin/bash

     

       2
       2
       -
       

     

       3
       3
       -
       reuse annotate --recursive --license MPL-2.0 --copyright "The Project Pterodactyl Developers" Tests Sources

     

       4
       4
       -

Compare changes