b/gigaparsec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed Result.Succeeded to Status and removed Failed

Browse Source
This commit is contained in:
Brandon Dyck
2024-09-24 13:16:30 -06:00
parent f8bc7582a5
commit 9375b51a70
7 changed files with 114 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
seq.go
View File

@ -18,20 +18,20 @@ func Seq2[In, Out, T, T2 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
if r.Failed() {
success, val, next := r.Status()
if !success {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
if r2.Failed() {
success, val2, next := r2.Status()
if !success {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, val2, next := r2.Succeeded()
final := f(val, val2)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil
@ -53,30 +53,30 @@ func Seq3[In, Out, T, T2, T3 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
if r.Failed() {
success, val, next := r.Status()
if !success {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
if r2.Failed() {
success, val2, next := r2.Status()
if !success {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, val2, next := r2.Succeeded()
r3, err := p3(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r3.Consumed()
if r3.Failed() {
success, val3, next := r3.Status()
if !success {
return Fail[In, Out](anyConsumed, r3.Message()), nil
}
_, val3, next := r3.Succeeded()
final := f(val, val2, val3)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil
@ -99,40 +99,40 @@ func Seq4[In, Out, T, T2, T3, T4 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
if r.Failed() {
success, val, next := r.Status()
if !success {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
if r2.Failed() {
success, val2, next := r2.Status()
if !success {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, val2, next := r2.Succeeded()
r3, err := p3(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r3.Consumed()
if r3.Failed() {
success, val3, next := r3.Status()
if !success {
return Fail[In, Out](anyConsumed, r3.Message()), nil
}
_, val3, next := r3.Succeeded()
r4, err := p4(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r4.Consumed()
if r4.Failed() {
success, val4, next := r4.Status()
if !success {
return Fail[In, Out](anyConsumed, r4.Message()), nil
}
_, val4, next := r4.Succeeded()
final := f(val, val2, val3, val4)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil
@ -156,50 +156,50 @@ func Seq5[In, Out, T, T2, T3, T4, T5 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
if r.Failed() {
success, val, next := r.Status()
if !success {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
if r2.Failed() {
success, val2, next := r2.Status()
if !success {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, val2, next := r2.Succeeded()
r3, err := p3(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r3.Consumed()
if r3.Failed() {
success, val3, next := r3.Status()
if !success {
return Fail[In, Out](anyConsumed, r3.Message()), nil
}
_, val3, next := r3.Succeeded()
r4, err := p4(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r4.Consumed()
if r4.Failed() {
success, val4, next := r4.Status()
if !success {
return Fail[In, Out](anyConsumed, r4.Message()), nil
}
_, val4, next := r4.Succeeded()
r5, err := p5(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r5.Consumed()
if r5.Failed() {
success, val5, next := r5.Status()
if !success {
return Fail[In, Out](anyConsumed, r5.Message()), nil
}
_, val5, next := r5.Succeeded()
final := f(val, val2, val3, val4, val5)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil