jyapayne/nimble
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now only one & is allowed in a version range.

Browse source
This commit is contained in:
Dominik Picheta 2011-01-27 18:21:07 +00:00
commit 0265915c2c
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
version.nim
View file

@ -2,10 +2,11 @@
import strutils import strutils
type type
TVersion* = distinct string TVersion* = distinct string
TVersionRangeEnum* = enum TVersionRangeEnum* = enum
verLater, # > V verLater, # > V
verEarlier, # < V verEarlier, # < V
verEqLater, # >= V -- Equal or laterparseInt(sVer[i]) verEqLater, # >= V -- Equal or later
verEqEarlier, # <= V -- Equal or earlier verEqEarlier, # <= V -- Equal or earlier
verIntersect, # > V & < V verIntersect, # > V & < V
verAny # * verAny # *
@ -97,7 +98,13 @@ proc parseVersionRange*(s: string): PVersionRange =
# Parse everything after & # Parse everything after &
# Recursion <3 # Recursion <3
var right = parseVersionRange(copy(s, i + 1)) var right = parseVersionRange(copy(s, i + 1))
# Disallow more than one verIntersect. It's pointless and could lead to
# major unknown mistakes.
if right.kind == verIntersect:
raise newException(EParseVersion,
"Having more than one `&` in a version range is pointless")
result.kind = verIntersect result.kind = verIntersect
result.verI = (left, right) result.verI = (left, right)
break break
@ -121,10 +128,10 @@ when isMainModule:
assert(newVersion("1.0.1") > newVersion("1.0")) assert(newVersion("1.0.1") > newVersion("1.0"))
assert(newVersion("1.0.6") <= newVersion("1.0.6")) assert(newVersion("1.0.6") <= newVersion("1.0.6"))
var inter1 = parseVersionRange(">= 1.0 & <= 1.5") var inter1 = parseVersionRange(">= 1.0 & <= 1.5 & > 1.1 ")
assert(not withinRange(newVersion("1.5.1"), inter1)) assert(not withinRange(newVersion("1.5.1"), inter1))
assert(withinRange(newVersion("1.2.3.4.5.6.7.8.9.10.11.12"), inter1)) assert(withinRange(newVersion("1.0.2.3.4.5.6.7.8.9.10.11.12"), inter1))
assert(newVersion("1") == newVersion("1")) assert(newVersion("1") == newVersion("1"))