Skip to content

Commit abfd4c3

Browse files
tangrufustangrufus
authored
Rename Wildcard to MatchAll (#24)
1 parent 95a6a73 commit abfd4c3

File tree

11 files changed

+140
-137
lines changed

11 files changed

+140
-137
lines changed

‎and.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ func And(es ...Endless) (CeilingFloorConstrainter, error) { //nolint:cyclop,iret
1919
}
2020

2121
es = slices.Clone(es)
22-
es = slices.DeleteFunc(es, Endless.wildcard)
22+
es = slices.DeleteFunc(es, Endless.matchAll)
2323

2424
if len(es) == 0 {
25-
return NewWildcard(), nil
25+
return NewMatchAll(), nil
2626
}
2727
if len(es) == 1 {
2828
return es[0], nil
@@ -94,7 +94,7 @@ func maxBoundedFloor(es ...Endless) (Endless, bool) {
9494
es = slices.Clone(es)
9595

9696
bfs := slices.DeleteFunc(es, func(c Endless) bool {
97-
return c.floor().wildcard()
97+
return c.floor().matchAll()
9898
})
9999

100100
if len(bfs) == 0 {

‎and_example_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ func ExampleAnd() {
1616
// Output: >=2 <3
1717
}
1818

19-
func ExampleAnd_wildcard() {
19+
func ExampleAnd_matchAll() {
2020
a, _ := comver.And(
2121
comver.NewGreaterThanOrEqualTo(comver.MustParse("2")),
2222
comver.NewLessThan(comver.MustParse("3")),
23-
comver.NewWildcard(),
23+
comver.NewMatchAll(),
2424
)
2525

2626
fmt.Println(a)

‎and_test.go‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ func TestAnd(t *testing.T) {
5050
wantErr: nil,
5151
},
5252
{
53-
name: "single_wildcard",
54-
es: []Endless{NewWildcard()},
55-
want: NewWildcard(),
53+
name: "single_match_all",
54+
es: []Endless{NewMatchAll()},
55+
want: NewMatchAll(),
5656
wantErr: nil,
5757
},
5858
{
59-
name: "multiple_wildcards",
60-
es: []Endless{NewWildcard(), NewWildcard()},
61-
want: NewWildcard(),
59+
name: "multiple_match_alls",
60+
es: []Endless{NewMatchAll(), NewMatchAll()},
61+
want: NewMatchAll(),
6262
wantErr: nil,
6363
},
6464
{
@@ -114,17 +114,17 @@ func TestAnd(t *testing.T) {
114114
wantErr: errImpossibleInterval,
115115
},
116116
{
117-
name: "impossible_interval_wildcard",
117+
name: "impossible_interval_match_all",
118118
es: []Endless{
119119
NewLessThan(MustParse("1")),
120120
NewGreaterThan(MustParse("4")),
121-
NewWildcard(),
121+
NewMatchAll(),
122122
},
123123
want: nilC,
124124
wantErr: errImpossibleInterval,
125125
},
126126
{
127-
name: "multiple_wildcards_multiple_endlesses",
127+
name: "multiple_match_alls_multiple_endlesses",
128128
es: []Endless{
129129
NewLessThan(MustParse("1")),
130130
NewLessThanOrEqualTo(MustParse("1")),
@@ -134,8 +134,8 @@ func TestAnd(t *testing.T) {
134134
NewGreaterThan(MustParse("3")),
135135
NewGreaterThanOrEqualTo(MustParse("4")),
136136
NewGreaterThan(MustParse("4")),
137-
NewWildcard(),
138-
NewWildcard(),
137+
NewMatchAll(),
138+
NewMatchAll(),
139139
},
140140
want: nilC,
141141
wantErr: errImpossibleInterval,
@@ -178,11 +178,11 @@ func TestAnd(t *testing.T) {
178178
wantErr: nil,
179179
},
180180
{
181-
name: "exact_version_wildcard",
181+
name: "exact_version_match_all",
182182
es: []Endless{
183183
NewLessThanOrEqualTo(MustParse("1")),
184184
NewGreaterThanOrEqualTo(MustParse("1")),
185-
NewWildcard(),
185+
NewMatchAll(),
186186
},
187187
want: NewExactConstraint(MustParse("1")),
188188
wantErr: nil,
@@ -198,8 +198,8 @@ func TestAnd(t *testing.T) {
198198
NewGreaterThanOrEqualTo(MustParse("1")),
199199
NewGreaterThan(MustParse("1")),
200200
NewGreaterThan(MustParse("1")),
201-
NewWildcard(),
202-
NewWildcard(),
201+
NewMatchAll(),
202+
NewMatchAll(),
203203
},
204204
want: nilC,
205205
wantErr: errImpossibleInterval,
@@ -213,8 +213,8 @@ func TestAnd(t *testing.T) {
213213
NewGreaterThanOrEqualTo(MustParse("1")),
214214
NewGreaterThan(MustParse("1")),
215215
NewGreaterThan(MustParse("1")),
216-
NewWildcard(),
217-
NewWildcard(),
216+
NewMatchAll(),
217+
NewMatchAll(),
218218
},
219219
want: nilC,
220220
wantErr: errImpossibleInterval,
@@ -226,8 +226,8 @@ func TestAnd(t *testing.T) {
226226
NewLessThanOrEqualTo(MustParse("1")),
227227
NewGreaterThanOrEqualTo(MustParse("1")),
228228
NewGreaterThanOrEqualTo(MustParse("1")),
229-
NewWildcard(),
230-
NewWildcard(),
229+
NewMatchAll(),
230+
NewMatchAll(),
231231
},
232232
want: NewExactConstraint(MustParse("1")),
233233
wantErr: nil,
@@ -239,8 +239,8 @@ func TestAnd(t *testing.T) {
239239
NewLessThanOrEqualTo(MustParse("1")),
240240
NewLessThan(MustParse("1")),
241241
NewLessThan(MustParse("1")),
242-
NewWildcard(),
243-
NewWildcard(),
242+
NewMatchAll(),
243+
NewMatchAll(),
244244
NewGreaterThan(MustParse("1")),
245245
},
246246
want: nilC,
@@ -253,8 +253,8 @@ func TestAnd(t *testing.T) {
253253
NewGreaterThanOrEqualTo(MustParse("1")),
254254
NewGreaterThan(MustParse("1")),
255255
NewGreaterThan(MustParse("1")),
256-
NewWildcard(),
257-
NewWildcard(),
256+
NewMatchAll(),
257+
NewMatchAll(),
258258
NewLessThan(MustParse("1")),
259259
},
260260
want: nilC,
@@ -267,8 +267,8 @@ func TestAnd(t *testing.T) {
267267
NewLessThanOrEqualTo(MustParse("1")),
268268
NewLessThan(MustParse("1")),
269269
NewLessThan(MustParse("1")),
270-
NewWildcard(),
271-
NewWildcard(),
270+
NewMatchAll(),
271+
NewMatchAll(),
272272
NewGreaterThanOrEqualTo(MustParse("1")),
273273
NewGreaterThanOrEqualTo(MustParse("1")),
274274
NewGreaterThan(MustParse("1")),
@@ -381,7 +381,7 @@ func TestAnd(t *testing.T) {
381381
wantErr: nil,
382382
},
383383
{
384-
name: "compact_ceiling_floor_wildcard",
384+
name: "compact_ceiling_floor_match_all",
385385
es: []Endless{
386386
NewLessThanOrEqualTo(MustParse("4")),
387387
NewLessThan(MustParse("4")),
@@ -391,7 +391,7 @@ func TestAnd(t *testing.T) {
391391
NewGreaterThanOrEqualTo(MustParse("2")),
392392
NewGreaterThan(MustParse("1")),
393393
NewGreaterThanOrEqualTo(MustParse("1")),
394-
NewWildcard(),
394+
NewMatchAll(),
395395
},
396396
want: interval{
397397
upper: NewLessThan(MustParse("3")),
@@ -450,13 +450,13 @@ func Test_minBoundedCeiling(t *testing.T) {
450450
{
451451
name: "empty",
452452
cs: []Endless{},
453-
want: NewWildcard(),
453+
want: NewMatchAll(),
454454
wantOk: false,
455455
},
456456
{
457457
name: "nil",
458458
cs: nil,
459-
want: NewWildcard(),
459+
want: NewMatchAll(),
460460
wantOk: false,
461461
},
462462
{
@@ -474,19 +474,19 @@ func Test_minBoundedCeiling(t *testing.T) {
474474
{
475475
name: "single_greaterThan",
476476
cs: []Endless{NewGreaterThan(MustParse("3"))},
477-
want: NewWildcard(),
477+
want: NewMatchAll(),
478478
wantOk: false,
479479
},
480480
{
481481
name: "single_greaterThanOrEqualTo",
482482
cs: []Endless{NewGreaterThanOrEqualTo(MustParse("4"))},
483-
want: NewWildcard(),
483+
want: NewMatchAll(),
484484
wantOk: false,
485485
},
486486
{
487-
name: "single_wildcard",
488-
cs: []Endless{NewWildcard()},
489-
want: NewWildcard(),
487+
name: "single_match_all",
488+
cs: []Endless{NewMatchAll()},
489+
want: NewMatchAll(),
490490
wantOk: false,
491491
},
492492
{
@@ -497,19 +497,19 @@ func Test_minBoundedCeiling(t *testing.T) {
497497
NewGreaterThanOrEqualTo(MustParse("4")),
498498
NewGreaterThan(MustParse("4")),
499499
},
500-
want: NewWildcard(),
500+
want: NewMatchAll(),
501501
wantOk: false,
502502
},
503503
{
504-
name: "multiple_no_ceiling_wildcard",
504+
name: "multiple_no_ceiling_match_all",
505505
cs: []Endless{
506506
NewGreaterThanOrEqualTo(MustParse("3")),
507507
NewGreaterThan(MustParse("3")),
508508
NewGreaterThanOrEqualTo(MustParse("4")),
509509
NewGreaterThan(MustParse("4")),
510-
NewWildcard(),
510+
NewMatchAll(),
511511
},
512-
want: NewWildcard(),
512+
want: NewMatchAll(),
513513
wantOk: false,
514514
},
515515
{
@@ -542,7 +542,7 @@ func Test_minBoundedCeiling(t *testing.T) {
542542
wantOk: true,
543543
},
544544
{
545-
name: "multiple_ceilings_wildcard",
545+
name: "multiple_ceilings_match_all",
546546
cs: []Endless{
547547
NewLessThan(MustParse("1")),
548548
NewLessThanOrEqualTo(MustParse("1")),
@@ -552,7 +552,7 @@ func Test_minBoundedCeiling(t *testing.T) {
552552
NewGreaterThan(MustParse("3")),
553553
NewGreaterThanOrEqualTo(MustParse("4")),
554554
NewGreaterThan(MustParse("4")),
555-
NewWildcard(),
555+
NewMatchAll(),
556556
},
557557
want: NewLessThan(MustParse("1")),
558558
wantOk: true,
@@ -570,14 +570,14 @@ func Test_minBoundedCeiling(t *testing.T) {
570570
wantOk: true,
571571
},
572572
{
573-
name: "single_ceiling_wildcard",
573+
name: "single_ceiling_match_all",
574574
cs: []Endless{
575575
NewLessThanOrEqualTo(MustParse("2")),
576576
NewGreaterThanOrEqualTo(MustParse("3")),
577577
NewGreaterThan(MustParse("3")),
578578
NewGreaterThanOrEqualTo(MustParse("4")),
579579
NewGreaterThan(MustParse("4")),
580-
NewWildcard(),
580+
NewMatchAll(),
581581
},
582582
want: NewLessThanOrEqualTo(MustParse("2")),
583583
wantOk: true,
@@ -627,25 +627,25 @@ func Test_maxBoundedFloor(t *testing.T) {
627627
{
628628
name: "empty",
629629
fs: []Endless{},
630-
want: NewWildcard(),
630+
want: NewMatchAll(),
631631
wantOk: false,
632632
},
633633
{
634634
name: "nil",
635635
fs: nil,
636-
want: NewWildcard(),
636+
want: NewMatchAll(),
637637
wantOk: false,
638638
},
639639
{
640640
name: "single_lessThan",
641641
fs: []Endless{NewLessThan(MustParse("1"))},
642-
want: NewWildcard(),
642+
want: NewMatchAll(),
643643
wantOk: false,
644644
},
645645
{
646646
name: "single_lessThanOrEqualTo",
647647
fs: []Endless{NewLessThanOrEqualTo(MustParse("2"))},
648-
want: NewWildcard(),
648+
want: NewMatchAll(),
649649
wantOk: false,
650650
},
651651
{
@@ -661,9 +661,9 @@ func Test_maxBoundedFloor(t *testing.T) {
661661
wantOk: true,
662662
},
663663
{
664-
name: "single_wildcard",
665-
fs: []Endless{NewWildcard()},
666-
want: NewWildcard(),
664+
name: "single_match_all",
665+
fs: []Endless{NewMatchAll()},
666+
want: NewMatchAll(),
667667
wantOk: false,
668668
},
669669
{
@@ -674,19 +674,19 @@ func Test_maxBoundedFloor(t *testing.T) {
674674
NewLessThan(MustParse("2")),
675675
NewLessThanOrEqualTo(MustParse("2")),
676676
},
677-
want: NewWildcard(),
677+
want: NewMatchAll(),
678678
wantOk: false,
679679
},
680680
{
681-
name: "multiple_no_floor_wildcard",
681+
name: "multiple_no_floor_match_all",
682682
fs: []Endless{
683683
NewLessThan(MustParse("1")),
684684
NewLessThanOrEqualTo(MustParse("1")),
685685
NewLessThan(MustParse("2")),
686686
NewLessThanOrEqualTo(MustParse("2")),
687-
NewWildcard(),
687+
NewMatchAll(),
688688
},
689-
want: NewWildcard(),
689+
want: NewMatchAll(),
690690
wantOk: false,
691691
},
692692
{
@@ -719,7 +719,7 @@ func Test_maxBoundedFloor(t *testing.T) {
719719
wantOk: true,
720720
},
721721
{
722-
name: "multiple_floors_wildcard",
722+
name: "multiple_floors_match_all",
723723
fs: []Endless{
724724
NewLessThan(MustParse("1")),
725725
NewLessThanOrEqualTo(MustParse("1")),
@@ -729,7 +729,7 @@ func Test_maxBoundedFloor(t *testing.T) {
729729
NewGreaterThan(MustParse("3")),
730730
NewGreaterThanOrEqualTo(MustParse("4")),
731731
NewGreaterThan(MustParse("4")),
732-
NewWildcard(),
732+
NewMatchAll(),
733733
},
734734
want: NewGreaterThan(MustParse("4")),
735735
wantOk: true,
@@ -747,14 +747,14 @@ func Test_maxBoundedFloor(t *testing.T) {
747747
wantOk: true,
748748
},
749749
{
750-
name: "single_floor_wildcard",
750+
name: "single_floor_match_all",
751751
fs: []Endless{
752752
NewLessThan(MustParse("1")),
753753
NewLessThanOrEqualTo(MustParse("1")),
754754
NewLessThan(MustParse("2")),
755755
NewLessThanOrEqualTo(MustParse("2")),
756756
NewGreaterThan(MustParse("3")),
757-
NewWildcard(),
757+
NewMatchAll(),
758758
},
759759
want: NewGreaterThan(MustParse("3")),
760760
wantOk: true,

0 commit comments

Comments
 (0)