Skip to content

[NFC] Replace type-erased pattern matching with typed if-else blocks #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions Sources/TSCUtility/Version.swift
Original file line number Diff line number Diff line change
Expand Up @@ -186,22 +186,24 @@ extension Version: Comparable, Hashable {
return true // Prerelease lhs < non-prerelease rhs
}

let zippedIdentifiers = zip(lhs.prereleaseIdentifiers, rhs.prereleaseIdentifiers)
for (lhsPrereleaseIdentifier, rhsPrereleaseIdentifier) in zippedIdentifiers {
for (lhsPrereleaseIdentifier, rhsPrereleaseIdentifier) in zip(lhs.prereleaseIdentifiers, rhs.prereleaseIdentifiers) {
if lhsPrereleaseIdentifier == rhsPrereleaseIdentifier {
continue
}

let typedLhsIdentifier: Any = Int(lhsPrereleaseIdentifier) ?? lhsPrereleaseIdentifier
let typedRhsIdentifier: Any = Int(rhsPrereleaseIdentifier) ?? rhsPrereleaseIdentifier

switch (typedLhsIdentifier, typedRhsIdentifier) {
case let (int1 as Int, int2 as Int): return int1 < int2
case let (string1 as String, string2 as String): return string1 < string2
case (is Int, is String): return true // Int prereleases < String prereleases
case (is String, is Int): return false
default:
return false

// Check if either of the 2 pre-release identifiers is numeric.
let lhsNumericPrereleaseIdentifier = Int(lhsPrereleaseIdentifier)
let rhsNumericPrereleaseIdentifier = Int(rhsPrereleaseIdentifier)

if let lhsNumericPrereleaseIdentifier = lhsNumericPrereleaseIdentifier,
let rhsNumericPrereleaseIdentifier = rhsNumericPrereleaseIdentifier {
return lhsNumericPrereleaseIdentifier < rhsNumericPrereleaseIdentifier
} else if lhsNumericPrereleaseIdentifier != nil {
return true // numeric pre-release < non-numeric pre-release
} else if rhsNumericPrereleaseIdentifier != nil {
return false // non-numeric pre-release > numeric pre-release
} else {
return lhsPrereleaseIdentifier < rhsPrereleaseIdentifier
}
}

Expand Down