From 36b6ae18ce54f20050a393f5b67cf75d813b3caa Mon Sep 17 00:00:00 2001 From: Eric Willigers Date: Tue, 1 Oct 2024 19:06:33 +1000 Subject: [PATCH 1/2] Address compiler warning/notice --- exercises/practice/custom-set/.meta/example.v | 2 +- exercises/practice/yacht/.meta/example.v | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/practice/custom-set/.meta/example.v b/exercises/practice/custom-set/.meta/example.v index 7e924c7..bfb9afe 100644 --- a/exercises/practice/custom-set/.meta/example.v +++ b/exercises/practice/custom-set/.meta/example.v @@ -15,7 +15,7 @@ mut: items map[T]u8 } -[inline] +@[inline] fn (s CustomSet[T]) items() []T { return s.items.keys() } diff --git a/exercises/practice/yacht/.meta/example.v b/exercises/practice/yacht/.meta/example.v index 436ceb8..500fd72 100644 --- a/exercises/practice/yacht/.meta/example.v +++ b/exercises/practice/yacht/.meta/example.v @@ -36,7 +36,7 @@ fn score(category Category, rolls []u8) int { fn score_yacht(rolls []u8) int { unique := arrays.uniq(rolls) - if (unique.len > 1) { + if unique.len > 1 { return 0 } return 50 From 50d9081971a821131b13e7619c74eb6ad0ea19ba Mon Sep 17 00:00:00 2001 From: Eric Willigers Date: Tue, 1 Oct 2024 21:17:20 +1000 Subject: [PATCH 2/2] const --- exercises/practice/allergies/run_test.v | 2 +- exercises/practice/custom-set/.meta/example.v | 1 - exercises/practice/custom-set/run_test.v | 8 +++----- exercises/practice/isbn-verifier/.meta/example.v | 13 ++++++------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/exercises/practice/allergies/run_test.v b/exercises/practice/allergies/run_test.v index a94f5c8..a280712 100644 --- a/exercises/practice/allergies/run_test.v +++ b/exercises/practice/allergies/run_test.v @@ -194,7 +194,7 @@ fn test_list_everything() { Allergen.strawberries, Allergen.tomatoes, Allergen.chocolate, Allergen.pollen, Allergen.cats]) } -fn compare(left voidptr, right voidptr) int { +fn compare(left &Allergen, right &Allergen) int { return int(left) - int(right) } diff --git a/exercises/practice/custom-set/.meta/example.v b/exercises/practice/custom-set/.meta/example.v index bfb9afe..d0484ba 100644 --- a/exercises/practice/custom-set/.meta/example.v +++ b/exercises/practice/custom-set/.meta/example.v @@ -74,4 +74,3 @@ pub fn (s CustomSet[T]) is_subset[T](other CustomSet[T]) bool { pub fn (s CustomSet[T]) is_disjoint[T](other CustomSet[T]) bool { return s.intersection(other).is_empty() } - diff --git a/exercises/practice/custom-set/run_test.v b/exercises/practice/custom-set/run_test.v index 212f8c9..3783eea 100644 --- a/exercises/practice/custom-set/run_test.v +++ b/exercises/practice/custom-set/run_test.v @@ -1,10 +1,8 @@ module main -const ( - empty = CustomSet.new([]int{}) - another_empty = CustomSet.new([]int{}) - non_empty = CustomSet.new([1]) -) +const empty = CustomSet.new([]int{}) +const another_empty = CustomSet.new([]int{}) +const non_empty = CustomSet.new([1]) // is_empty diff --git a/exercises/practice/isbn-verifier/.meta/example.v b/exercises/practice/isbn-verifier/.meta/example.v index 2292e8f..59bd8a3 100644 --- a/exercises/practice/isbn-verifier/.meta/example.v +++ b/exercises/practice/isbn-verifier/.meta/example.v @@ -3,10 +3,9 @@ module main import arrays { group, sum } import regex { regex_opt } -const ( - isbn_len = 10 +const isbn_len = 10 - /* +/* Using a regular expression, I now have two problems: https://blog.codinghorror.com/regular-expressions-now-you-have-two-problems/ @@ -15,10 +14,10 @@ const ( - length check - character validation */ - isbn_re = regex_opt(r'^\d{9}(\d|X)$') or { panic('Invalid ISBN-10 regular expression') } - weights = []int{len: isbn_len, init: isbn_len - index} // [10, 9, 8, ..., 1] - zero = int(`0`) -) +const isbn_re = regex_opt(r'^\d{9}(\d|X)$') or { panic('Invalid ISBN-10 regular expression') } +const weights = []int{len: isbn_len, init: isbn_len - index} // [10, 9, 8, ..., 1] + +const zero = int(`0`) // convert single digit (`0`...`9`) to its integer equivalent. fn digit_to_int(d u8) int {