Skip to content

Commit 9b96b62

Browse files
logic-buildinglogic-building
authored
Merge pull request #126 from logic-building/Distinct<Type>P
Added function Distinct<Type>P
2 parents 9afc16f + d1f9c65 commit 9b96b62

19 files changed

+1611
-353
lines changed

‎fp/distinctp.go

Lines changed: 449 additions & 0 deletions
Large diffs are not rendered by default.

‎fp/distinctp_test.go

Lines changed: 748 additions & 0 deletions
Large diffs are not rendered by default.

‎fp/equalmap.go

Lines changed: 196 additions & 196 deletions
Large diffs are not rendered by default.

‎fp/filterPtr_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,8 @@ func TestFilterStrPtr(t *testing.T) {
439439
func isEvenStrPtr(num *string) bool {
440440
if *num == "2" || *num == "4" || *num == "6" || *num == "8" || *num == "10" {
441441
return true
442-
} else {
443-
return false
444442
}
443+
return false
445444
}
446445

447446

‎fp/filtermaperr_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,8 @@ func isPositiveStrErr(num string) (bool, error) {
523523
}
524524
if num == "2" || num == "3" || num == "4" || num == "5" || num == "6" || num == "7" || num == "8" {
525525
return true, nil
526-
} else {
527-
return false, nil
528526
}
527+
return false, nil
529528
}
530529

531530
func multiplyBy2StrErr(num string) (string, error) {

‎fp/filtermapioerr_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8069,9 +8069,8 @@ func someLogicBoolStrErr(num bool) (string, error) {
80698069

80708070
if num == true {
80718071
return v10, nil
8072-
} else {
8073-
return v0, nil
80748072
}
8073+
return v0, nil
80758074
}
80768075

80778076
func TestFilterMapBoolFloat32Err(t *testing.T) {

‎fp/filtermapioptr_test.go

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4822,9 +4822,8 @@ func someLogicBoolIntPtr(num *bool) *int {
48224822

48234823
if *num == true {
48244824
return &v10
4825-
} else {
4826-
return &v0
48274825
}
4826+
return &v0
48284827
}
48294828

48304829
func TestFilterMapBoolInt64Ptr(t *testing.T) {
@@ -4861,9 +4860,8 @@ func someLogicBoolInt64Ptr(num *bool) *int64 {
48614860

48624861
if *num == true {
48634862
return &v10
4864-
} else {
4865-
return &v0
48664863
}
4864+
return &v0
48674865
}
48684866

48694867
func TestFilterMapBoolInt32Ptr(t *testing.T) {
@@ -4900,9 +4898,8 @@ func someLogicBoolInt32Ptr(num *bool) *int32 {
49004898

49014899
if *num == true {
49024900
return &v10
4903-
} else {
4904-
return &v0
49054901
}
4902+
return &v0
49064903
}
49074904

49084905
func TestFilterMapBoolInt16Ptr(t *testing.T) {
@@ -4939,9 +4936,8 @@ func someLogicBoolInt16Ptr(num *bool) *int16 {
49394936

49404937
if *num == true {
49414938
return &v10
4942-
} else {
4943-
return &v0
49444939
}
4940+
return &v0
49454941
}
49464942

49474943
func TestFilterMapBoolInt8Ptr(t *testing.T) {
@@ -4978,9 +4974,8 @@ func someLogicBoolInt8Ptr(num *bool) *int8 {
49784974

49794975
if *num == true {
49804976
return &v10
4981-
} else {
4982-
return &v0
49834977
}
4978+
return &v0
49844979
}
49854980

49864981
func TestFilterMapBoolUintPtr(t *testing.T) {
@@ -5017,9 +5012,8 @@ func someLogicBoolUintPtr(num *bool) *uint {
50175012

50185013
if *num == true {
50195014
return &v10
5020-
} else {
5021-
return &v0
50225015
}
5016+
return &v0
50235017
}
50245018

50255019
func TestFilterMapBoolUint64Ptr(t *testing.T) {
@@ -5056,9 +5050,8 @@ func someLogicBoolUint64Ptr(num *bool) *uint64 {
50565050

50575051
if *num == true {
50585052
return &v10
5059-
} else {
5060-
return &v0
50615053
}
5054+
return &v0
50625055
}
50635056

50645057
func TestFilterMapBoolUint32Ptr(t *testing.T) {
@@ -5095,9 +5088,8 @@ func someLogicBoolUint32Ptr(num *bool) *uint32 {
50955088

50965089
if *num == true {
50975090
return &v10
5098-
} else {
5099-
return &v0
51005091
}
5092+
return &v0
51015093
}
51025094

51035095
func TestFilterMapBoolUint16Ptr(t *testing.T) {
@@ -5134,9 +5126,8 @@ func someLogicBoolUint16Ptr(num *bool) *uint16 {
51345126

51355127
if *num == true {
51365128
return &v10
5137-
} else {
5138-
return &v0
51395129
}
5130+
return &v0
51405131
}
51415132

51425133
func TestFilterMapBoolUint8Ptr(t *testing.T) {
@@ -5173,9 +5164,8 @@ func someLogicBoolUint8Ptr(num *bool) *uint8 {
51735164

51745165
if *num == true {
51755166
return &v10
5176-
} else {
5177-
return &v0
51785167
}
5168+
return &v0
51795169
}
51805170

51815171
func TestFilterMapBoolStrPtr(t *testing.T) {
@@ -5211,9 +5201,8 @@ func someLogicBoolStrPtr(num *bool) *string {
52115201

52125202
if *num == true {
52135203
return &v10
5214-
} else {
5215-
return &v0
52165204
}
5205+
return &v0
52175206
}
52185207

52195208
func TestFilterMapBoolFloat32Ptr(t *testing.T) {
@@ -5250,9 +5239,8 @@ func someLogicBoolFloat32Ptr(num *bool) *float32 {
52505239

52515240
if *num == true {
52525241
return &v10
5253-
} else {
5254-
return &v0
52555242
}
5243+
return &v0
52565244
}
52575245

52585246
func TestFilterMapBoolFloat64Ptr(t *testing.T) {
@@ -5289,9 +5277,8 @@ func someLogicBoolFloat64Ptr(num *bool) *float64 {
52895277

52905278
if *num == true {
52915279
return &v10
5292-
} else {
5293-
return &v0
52945280
}
5281+
return &v0
52955282
}
52965283

52975284
func TestFilterMapFloat32IntPtr(t *testing.T) {

‎fp/filtermapioptrerr_test.go

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7461,9 +7461,8 @@ func someLogicBoolIntPtrErr(num *bool) (*int, error) {
74617461

74627462
if *num == true {
74637463
return &v10, nil
7464-
} else {
7465-
return &v0, nil
74667464
}
7465+
return &v0, nil
74677466
}
74687467

74697468
func TestFilterMapBoolInt64PtrErr(t *testing.T) {
@@ -7523,9 +7522,8 @@ func someLogicBoolInt64PtrErr(num *bool) (*int64, error) {
75237522

75247523
if *num == true {
75257524
return &v10, nil
7526-
} else {
7527-
return &v0, nil
75287525
}
7526+
return &v0, nil
75297527
}
75307528

75317529
func TestFilterMapBoolInt32PtrErr(t *testing.T) {
@@ -7585,9 +7583,8 @@ func someLogicBoolInt32PtrErr(num *bool) (*int32, error) {
75857583

75867584
if *num == true {
75877585
return &v10, nil
7588-
} else {
7589-
return &v0, nil
75907586
}
7587+
return &v0, nil
75917588
}
75927589

75937590
func TestFilterMapBoolInt16PtrErr(t *testing.T) {
@@ -7647,9 +7644,8 @@ func someLogicBoolInt16PtrErr(num *bool) (*int16, error) {
76477644

76487645
if *num == true {
76497646
return &v10, nil
7650-
} else {
7651-
return &v0, nil
76527647
}
7648+
return &v0, nil
76537649
}
76547650

76557651
func TestFilterMapBoolInt8PtrErr(t *testing.T) {
@@ -7709,9 +7705,8 @@ func someLogicBoolInt8PtrErr(num *bool) (*int8, error) {
77097705

77107706
if *num == true {
77117707
return &v10, nil
7712-
} else {
7713-
return &v0, nil
77147708
}
7709+
return &v0, nil
77157710
}
77167711

77177712
func TestFilterMapBoolUintPtrErr(t *testing.T) {
@@ -7771,9 +7766,8 @@ func someLogicBoolUintPtrErr(num *bool) (*uint, error) {
77717766

77727767
if *num == true {
77737768
return &v10, nil
7774-
} else {
7775-
return &v0, nil
77767769
}
7770+
return &v0, nil
77777771
}
77787772

77797773
func TestFilterMapBoolUint64PtrErr(t *testing.T) {
@@ -7833,9 +7827,8 @@ func someLogicBoolUint64PtrErr(num *bool) (*uint64, error) {
78337827

78347828
if *num == true {
78357829
return &v10, nil
7836-
} else {
7837-
return &v0, nil
78387830
}
7831+
return &v0, nil
78397832
}
78407833

78417834
func TestFilterMapBoolUint32PtrErr(t *testing.T) {
@@ -7895,9 +7888,8 @@ func someLogicBoolUint32PtrErr(num *bool) (*uint32, error) {
78957888

78967889
if *num == true {
78977890
return &v10, nil
7898-
} else {
7899-
return &v0, nil
79007891
}
7892+
return &v0, nil
79017893
}
79027894

79037895
func TestFilterMapBoolUint16PtrErr(t *testing.T) {
@@ -7957,9 +7949,8 @@ func someLogicBoolUint16PtrErr(num *bool) (*uint16, error) {
79577949

79587950
if *num == true {
79597951
return &v10, nil
7960-
} else {
7961-
return &v0, nil
79627952
}
7953+
return &v0, nil
79637954
}
79647955

79657956
func TestFilterMapBoolUint8PtrErr(t *testing.T) {
@@ -8019,9 +8010,8 @@ func someLogicBoolUint8PtrErr(num *bool) (*uint8, error) {
80198010

80208011
if *num == true {
80218012
return &v10, nil
8022-
} else {
8023-
return &v0, nil
80248013
}
8014+
return &v0, nil
80258015
}
80268016

80278017
func TestFilterMapBoolStrPtrErr(t *testing.T) {
@@ -8079,9 +8069,8 @@ func someLogicBoolStrPtrErr(num *bool) (*string, error) {
80798069

80808070
if *num == true {
80818071
return &v10, nil
8082-
} else {
8083-
return &v0, nil
80848072
}
8073+
return &v0, nil
80858074
}
80868075

80878076
func TestFilterMapBoolFloat32PtrErr(t *testing.T) {
@@ -8141,9 +8130,8 @@ func someLogicBoolFloat32PtrErr(num *bool) (*float32, error) {
81418130

81428131
if *num == true {
81438132
return &v10, nil
8144-
} else {
8145-
return &v0, nil
81468133
}
8134+
return &v0, nil
81478135
}
81488136

81498137
func TestFilterMapBoolFloat64PtrErr(t *testing.T) {
@@ -8203,9 +8191,8 @@ func someLogicBoolFloat64PtrErr(num *bool) (*float64, error) {
82038191

82048192
if *num == true {
82058193
return &v10, nil
8206-
} else {
8207-
return &v0, nil
82088194
}
8195+
return &v0, nil
82098196
}
82108197

82118198
func TestFilterMapFloat32IntPtrErr(t *testing.T) {

0 commit comments

Comments
 (0)