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

42
gigaparsec.go
View File

@ -28,13 +28,8 @@ func Fail[In, Out any](consumed bool, msg Message) Result[In, Out] {
}
}
func (r Result[In, Out]) Failed() (failed, consumed bool, msg Message) {
failed = !r.succeeded
if failed {
consumed = r.consumed
msg = r.message
}
return
func (r Result[In, Out]) Failed() bool {
return !r.succeeded
}
func Succeed[In, Out any](consumed bool, value Out, next State[In], msg Message) Result[In, Out] {
@ -47,13 +42,11 @@ func Succeed[In, Out any](consumed bool, value Out, next State[In], msg Message)
}
}
func (r Result[In, Out]) Succeeded() (succeeded, consumed bool, value Out, next State[In], msg Message) {
func (r Result[In, Out]) Succeeded() (succeeded bool, value Out, next State[In]) {
succeeded = r.succeeded
if succeeded {
consumed = r.consumed
value = r.value
next = r.next
msg = r.message
}
return
}
@ -67,6 +60,10 @@ func (r Result[In, Out]) Consume(consumed bool) Result[In, Out] {
return r
}
func (r Result[In, Out]) Message() Message {
return r.message
}
func MakeMessage(pos uint64, got string, expected ...string) Message {
return Message{
pos: pos,
@ -156,10 +153,10 @@ func (p Parser[In, Out]) Label(label string) Parser[In, Out] {
if err != nil || result.Consumed() {
return result, err
}
if succeeded, _, value, next, msg := result.Succeeded(); succeeded {
msg := result.Message()
if succeeded, value, next := result.Succeeded(); succeeded {
return Succeed(false, value, next, msg.expect(label)), nil
}
_, _, msg := result.Failed()
return Fail[In, Out](false, msg.expect(label)), nil
}
}
@ -177,11 +174,11 @@ func Run[In, Out any](p Parser[In, Out], c cursor.Cursor[In]) (out Out, err erro
err = fmt.Errorf("Run: %w", err)
return
}
if failed, _, msg := result.Failed(); failed {
err = ParseError(msg)
if result.Failed() {
err = ParseError(result.Message())
return
}
_, _, out, _, _ = result.Succeeded()
_, out, _ = result.Succeeded()
return
}
@ -271,11 +268,12 @@ func Choose[In, Out any](p Parser[In, Out], ps ...Parser[In, Out]) Parser[In, Ou
return result, nil
}
var qMsg Message
if isFailure, _, msg := result.Failed(); isFailure {
msg := result.Message()
if result.Failed() {
qMsg = msg
failed = true
} else {
_, _, qValue, _, msg := result.Succeeded()
_, qValue, _ := result.Succeeded()
if failed {
value = qValue
failed = false
@ -305,8 +303,8 @@ func Try[In, Out any](p Parser[In, Out]) Parser[In, Out] {
if err != nil {
return result, err
}
if failed, _, msg := result.Failed(); failed {
return Fail[In, Out](false, msg), nil
if result.Failed() {
return Fail[In, Out](false, result.Message()), nil
}
return result, nil
}
@ -357,14 +355,14 @@ func Repeat[In, Out any](minCount int, p Parser[In, Out]) Parser[In, []Out] {
return Result[In, []Out]{}, fmt.Errorf("AtLeastN: %w", err)
}
consumed = consumed || result.Consumed()
if failed, _, msg := result.Failed(); failed {
if result.Failed() {
if len(values) >= minCount {
return Succeed(consumed, values, next, MessageOK(s.Pos())), nil
}
return Fail[In, []Out](consumed, msg), nil
return Fail[In, []Out](consumed, result.Message()), nil
}
var value Out
_, _, value, next, _ = result.Succeeded()
_, value, next = result.Succeeded()
values = append(values, value)
}
}