mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

ci: fix v test-cleancode

Browse Source
This commit is contained in:
Delyan Angelov
2021-01-25 11:26:20 +02:00
parent 94fd3ff431
commit 728344ff65
49 changed files with 353 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vlib/semver/parse.v
View File

@@ -43,8 +43,9 @@ fn (ver RawVersion) is_valid() bool {
if ver.raw_ints.len != 3 {
return false
}
return is_valid_number(ver.raw_ints[ver_major]) && is_valid_number(ver.raw_ints[ver_minor])
&& is_valid_number(ver.raw_ints[ver_patch]) && is_valid_string(ver.prerelease)
return is_valid_number(ver.raw_ints[semver.ver_major])
&& is_valid_number(ver.raw_ints[semver.ver_minor])
&& is_valid_number(ver.raw_ints[semver.ver_patch]) && is_valid_string(ver.prerelease)
&& is_valid_string(ver.metadata)
}
@@ -54,7 +55,7 @@ fn (ver RawVersion) is_missing(typ int) bool {
fn (raw_ver RawVersion) coerce() ?Version {
ver := raw_ver.complete()
if !is_valid_number(ver.raw_ints[ver_major]) {
if !is_valid_number(ver.raw_ints[semver.ver_major]) {
return error('Invalid major version: $ver.raw_ints[ver_major]')
}
return ver.to_version()
@@ -80,5 +81,5 @@ fn (raw_ver RawVersion) validate() ?Version {
}
fn (raw_ver RawVersion) to_version() Version {
return Version{raw_ver.raw_ints[ver_major].int(), raw_ver.raw_ints[ver_minor].int(), raw_ver.raw_ints[ver_patch].int(), raw_ver.prerelease, raw_ver.metadata}
return Version{raw_ver.raw_ints[semver.ver_major].int(), raw_ver.raw_ints[semver.ver_minor].int(), raw_ver.raw_ints[semver.ver_patch].int(), raw_ver.prerelease, raw_ver.metadata}
}

14
vlib/semver/range.v
View File

@@ -57,7 +57,7 @@ fn (c Comparator) satisfies(ver Version) bool {
}
fn parse_range(input string) ?Range {
raw_comparator_sets := input.split(comparator_set_sep)
raw_comparator_sets := input.split(semver.comparator_set_sep)
mut comparator_sets := []ComparatorSet{}
for raw_comp_set in raw_comparator_sets {
if can_expand(raw_comp_set) {
@@ -72,7 +72,7 @@ fn parse_range(input string) ?Range {
}
fn parse_comparator_set(input string) ?ComparatorSet {
raw_comparators := input.split(comparator_sep)
raw_comparators := input.split(semver.comparator_sep)
if raw_comparators.len > 2 {
return error('Invalid format of comparator set for input "$input"')
}
@@ -113,7 +113,7 @@ fn parse_comparator(input string) ?Comparator {
fn parse_xrange(input string) ?Version {
mut raw_ver := parse(input).complete()
for typ in versions {
if raw_ver.raw_ints[typ].index_any(x_range_symbols) == -1 {
if raw_ver.raw_ints[typ].index_any(semver.x_range_symbols) == -1 {
continue
}
match typ {
@@ -139,8 +139,8 @@ fn parse_xrange(input string) ?Version {
}
fn can_expand(input string) bool {
return input[0] == `~` || input[0] == `^` || input.contains(hyphen_range_sep)
|| input.index_any(x_range_symbols) > -1
return input[0] == `~` || input[0] == `^` || input.contains(semver.hyphen_range_sep)
|| input.index_any(semver.x_range_symbols) > -1
}
fn expand_comparator_set(input string) ?ComparatorSet {
@@ -149,7 +149,7 @@ fn expand_comparator_set(input string) ?ComparatorSet {
`^` { return expand_caret(input[1..]) }
else {}
}
if input.contains(hyphen_range_sep) {
if input.contains(semver.hyphen_range_sep) {
return expand_hyphen(input)
}
return expand_xrange(input)
@@ -178,7 +178,7 @@ fn expand_caret(raw_version string) ?ComparatorSet {
}
fn expand_hyphen(raw_range string) ?ComparatorSet {
raw_versions := raw_range.split(hyphen_range_sep)
raw_versions := raw_range.split(semver.hyphen_range_sep)
if raw_versions.len != 2 {
return none
}

14
vlib/semver/semver_test.v
View File

@@ -76,7 +76,7 @@ const (
)
fn test_from() {
for item in versions_to_test {
for item in main.versions_to_test {
ver := semver.from(item.raw) or {
assert false
return
@@ -87,7 +87,7 @@ fn test_from() {
assert ver.metadata == item.metadata
assert ver.prerelease == item.prerelease
}
for ver in invalid_versions_to_test {
for ver in main.invalid_versions_to_test {
semver.from(ver) or {
assert true
continue
@@ -140,7 +140,7 @@ fn test_compare() {
}
fn test_satisfies() {
for item in ranges_to_test {
for item in main.ranges_to_test {
ver := semver.from(item.raw_version) or {
assert false
return
@@ -155,13 +155,13 @@ fn test_satisfies_invalid() {
assert false
return
}
for item in invalid_ranges_to_test {
for item in main.invalid_ranges_to_test {
assert ver.satisfies(item) == false
}
}
fn test_coerce() {
for item in coerce_to_test {
for item in main.coerce_to_test {
valid := semver.from(item.valid) or {
assert false
return
@@ -183,10 +183,10 @@ fn test_coerce_invalid() {
}
fn test_is_valid() {
for item in versions_to_test {
for item in main.versions_to_test {
assert semver.is_valid(item.raw)
}
for item in invalid_versions_to_test {
for item in main.invalid_versions_to_test {
assert semver.is_valid(item) == false
}
}