strips/darwin-apk
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/darwin-apk.git synced 2025-08-03 21:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix version conflict parsing

Browse Source
This commit is contained in:
a dinosaur
2025-07-05 19:58:57 +10:00
parent 45ef34ec64
commit d88b96df80
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Sources/apk/Version/ApkVersionRequirement.swift
View File

@ -38,10 +38,7 @@ internal struct ApkVersionRequirement: Hashable {
} }
(nameEnd, versionStart) = (range.lowerBound, range.upperBound) (nameEnd, versionStart) = (range.lowerBound, range.upperBound)
} else { } else {
// Lack of conflict flag indicates any version comparer.formUnion(.any)
if !comparer.contains(.conflict) {
comparer.formUnion(.any)
}
(nameEnd, versionStart) = (dependStr.endIndex, dependStr.endIndex) (nameEnd, versionStart) = (dependStr.endIndex, dependStr.endIndex)
} }
@ -54,9 +51,10 @@ internal struct ApkVersionRequirement: Hashable {
extension ApkVersionRequirement: CustomStringConvertible { extension ApkVersionRequirement: CustomStringConvertible {
var description: String { var description: String {
switch self.versionSpec { switch self.versionSpec {
case .any: self.name case .any(let invert):
case .conflict: "!\(self.name)" "\(invert ? "!" : "")\(self.name)"
case .constraint(let op, let version): "\(self.name)\(op)\(version)" case .constraint(let invert, let op, let version):
"\(invert ? "!" : "")\(self.name)\(op)\(version)"
} }
} }
} }
@ -92,16 +90,11 @@ fileprivate extension ApkVersionRequirement {
fileprivate extension ApkVersionSpecification { fileprivate extension ApkVersionSpecification {
init(_ bits: ApkVersionRequirement.ComparatorBits, version: Substring) throws(ApkVersionRequirement.ParseError) { init(_ bits: ApkVersionRequirement.ComparatorBits, version: Substring) throws(ApkVersionRequirement.ParseError) {
if bits == [ .conflict ] { let invert = bits.contains(.conflict)
self = .conflict self = if bits.subtracting(.conflict) == [ .any ] {
.any(invert: invert)
} else { } else {
if bits.contains(.conflict) { .constraint(invert: invert, op: try .init(bits), version: String(version))
throw .brokenSpec
} else if bits == [ .any ] {
self = .any
} else {
self = .constraint(op: try .init(bits), version: String(version))
}
} }
} }
} }
@ -113,11 +106,11 @@ fileprivate extension ApkVersionSpecification.Operator {
case .less: .less case .less: .less
case .greater: .greater case .greater: .greater
//case .checksum: .checksum //case .checksum: .checksum
case [ .equals, .less ]: .lessEqual case [ .equals, .less ]: .lessEqual
case [ .equals, .greater ]: .greaterEqual case [ .equals, .greater ]: .greaterEqual
case [ .fuzzy, .equals ], .fuzzy: .fuzzyEquals case [ .fuzzy, .equals ], .fuzzy: .fuzzyEquals
case [ .fuzzy, .equals, .less]: .lessFuzzy case [ .fuzzy, .equals, .less ]: .lessFuzzy
case [ .fuzzy, .equals, .greater]: .greaterFuzzy case [ .fuzzy, .equals, .greater ]: .greaterFuzzy
default: throw .brokenSpec default: throw .brokenSpec
} }
} }

5
Sources/apk/Version/ApkVersionSpecification.swift
View File

@ -4,9 +4,8 @@
*/ */
enum ApkVersionSpecification: Equatable, Hashable { enum ApkVersionSpecification: Equatable, Hashable {
case any case any(invert: Bool)
case constraint(op: Operator, version: String) case constraint(invert: Bool, op: Operator, version: String)
case conflict
} }
extension ApkVersionSpecification { extension ApkVersionSpecification {