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

Simplified Result

Browse Source
This commit is contained in:
Brandon Dyck
2024-09-24 12:56:10 -06:00
parent 9cab6d266d
commit f8bc7582a5
7 changed files with 142 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
seq.go
View File

@ -11,8 +11,6 @@ func Seq2[In, Out, T, T2 any](
) Parser[In, Out] {
return func(s State[In]) (Result[In, Out], error) {
var anyConsumed bool
var failed bool
var msg Message
var next = s
r, err := p(next)
@ -20,22 +18,20 @@ func Seq2[In, Out, T, T2 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
failed, _, msg = r.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r.Failed() {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, _, val, next, _ := r.Succeeded()
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
failed, _, msg = r2.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r2.Failed() {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, _, val2, next, _ := r2.Succeeded()
_, val2, next := r2.Succeeded()
final := f(val, val2)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil
@ -50,8 +46,6 @@ func Seq3[In, Out, T, T2, T3 any](
) Parser[In, Out] {
return func(s State[In]) (Result[In, Out], error) {
var anyConsumed bool
var failed bool
var msg Message
var next = s
r, err := p(next)
@ -59,33 +53,30 @@ func Seq3[In, Out, T, T2, T3 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
failed, _, msg = r.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r.Failed() {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, _, val, next, _ := r.Succeeded()
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
failed, _, msg = r2.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r2.Failed() {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, _, val2, next, _ := r2.Succeeded()
_, val2, next := r2.Succeeded()
r3, err := p3(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r3.Consumed()
failed, _, msg = r3.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r3.Failed() {
return Fail[In, Out](anyConsumed, r3.Message()), nil
}
_, _, val3, next, _ := r3.Succeeded()
_, val3, next := r3.Succeeded()
final := f(val, val2, val3)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil
@ -101,8 +92,6 @@ func Seq4[In, Out, T, T2, T3, T4 any](
) Parser[In, Out] {
return func(s State[In]) (Result[In, Out], error) {
var anyConsumed bool
var failed bool
var msg Message
var next = s
r, err := p(next)
@ -110,44 +99,40 @@ func Seq4[In, Out, T, T2, T3, T4 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
failed, _, msg = r.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r.Failed() {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, _, val, next, _ := r.Succeeded()
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
failed, _, msg = r2.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r2.Failed() {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, _, val2, next, _ := r2.Succeeded()
_, val2, next := r2.Succeeded()
r3, err := p3(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r3.Consumed()
failed, _, msg = r3.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r3.Failed() {
return Fail[In, Out](anyConsumed, r3.Message()), nil
}
_, _, val3, next, _ := r3.Succeeded()
_, val3, next := r3.Succeeded()
r4, err := p4(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r4.Consumed()
failed, _, msg = r4.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r4.Failed() {
return Fail[In, Out](anyConsumed, r4.Message()), nil
}
_, _, val4, next, _ := r4.Succeeded()
_, val4, next := r4.Succeeded()
final := f(val, val2, val3, val4)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil
@ -164,8 +149,6 @@ func Seq5[In, Out, T, T2, T3, T4, T5 any](
) Parser[In, Out] {
return func(s State[In]) (Result[In, Out], error) {
var anyConsumed bool
var failed bool
var msg Message
var next = s
r, err := p(next)
@ -173,55 +156,50 @@ func Seq5[In, Out, T, T2, T3, T4, T5 any](
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r.Consumed()
failed, _, msg = r.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r.Failed() {
return Fail[In, Out](anyConsumed, r.Message()), nil
}
_, _, val, next, _ := r.Succeeded()
_, val, next := r.Succeeded()
r2, err := p2(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r2.Consumed()
failed, _, msg = r2.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r2.Failed() {
return Fail[In, Out](anyConsumed, r2.Message()), nil
}
_, _, val2, next, _ := r2.Succeeded()
_, val2, next := r2.Succeeded()
r3, err := p3(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r3.Consumed()
failed, _, msg = r3.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r3.Failed() {
return Fail[In, Out](anyConsumed, r3.Message()), nil
}
_, _, val3, next, _ := r3.Succeeded()
_, val3, next := r3.Succeeded()
r4, err := p4(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r4.Consumed()
failed, _, msg = r4.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r4.Failed() {
return Fail[In, Out](anyConsumed, r4.Message()), nil
}
_, _, val4, next, _ := r4.Succeeded()
_, val4, next := r4.Succeeded()
r5, err := p5(next)
if err != nil {
return Result[In, Out]{}, err
}
anyConsumed = anyConsumed || r5.Consumed()
failed, _, msg = r5.Failed()
if failed {
return Fail[In, Out](anyConsumed, msg), nil
if r5.Failed() {
return Fail[In, Out](anyConsumed, r5.Message()), nil
}
_, _, val5, next, _ := r5.Succeeded()
_, val5, next := r5.Succeeded()
final := f(val, val2, val3, val4, val5)
return Succeed(anyConsumed, final, next, MessageOK(s.Pos())), nil