Combine Cursor with State
This commit is contained in:
@ -9,7 +9,6 @@ import (
|
||||
|
||||
"git.codemonkeysoftware.net/b/gigaparsec"
|
||||
pbytes "git.codemonkeysoftware.net/b/gigaparsec/bytes"
|
||||
"git.codemonkeysoftware.net/b/gigaparsec/cursor"
|
||||
ptest "git.codemonkeysoftware.net/b/gigaparsec/test"
|
||||
pgen "git.codemonkeysoftware.net/b/gigaparsec/test/generator"
|
||||
"github.com/shoenig/test"
|
||||
@ -29,7 +28,7 @@ func TestRegexp(t *testing.T) {
|
||||
|
||||
}))
|
||||
t.Run("basically works", func(t *testing.T) {
|
||||
result, err := pbytes.Regexp("a")(gigaparsec.MakeState(cursor.NewReaderAt(strings.NewReader("a"))))
|
||||
result, err := pbytes.Regexp("a")(gigaparsec.MakeState(strings.NewReader("a")))
|
||||
must.NoError(t, err)
|
||||
success, value, _ := result.Status()
|
||||
test.True(t, success, test.Sprint(result.Message()))
|
||||
@ -40,7 +39,7 @@ func TestRegexp(t *testing.T) {
|
||||
|
||||
func TestRuneReader(t *testing.T) {
|
||||
var s = "abcdefghijklmnopqrstuvwxyz"
|
||||
rr := pbytes.NewRuneReader(cursor.NewReaderAt(strings.NewReader(s)))
|
||||
rr := pbytes.NewRuneReader(gigaparsec.MakeState(strings.NewReader(s)))
|
||||
for i, b := range s {
|
||||
r, n, err := rr.ReadRune()
|
||||
test.NoError(t, err)
|
||||
@ -56,7 +55,7 @@ func TestMatchString(t *testing.T) {
|
||||
t.Run("fails on unexpected error", rapid.MakeCheck(func(t *rapid.T) {
|
||||
s := rapid.StringN(-1, -1, 100).Draw(t, "s")
|
||||
readErr := pgen.Error().Draw(t, "readErr")
|
||||
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(cursor.NewReaderAt(ptest.ErrReaderAt(readErr))))
|
||||
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(ptest.ErrReaderAt(readErr)))
|
||||
test.ErrorIs(t, err, readErr)
|
||||
success, _, _ := result.Status()
|
||||
test.False(t, success)
|
||||
@ -68,7 +67,7 @@ func TestMatchString(t *testing.T) {
|
||||
notPrefix := func(b []byte) bool { return !bytes.HasPrefix(input, b) }
|
||||
s := string(bgen.Filter(notPrefix).Draw(t, "s"))
|
||||
|
||||
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(cursor.NewReaderAt(bytes.NewReader(input))))
|
||||
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(bytes.NewReader(input)))
|
||||
test.NoError(t, err)
|
||||
success, _, _ := result.Status()
|
||||
test.False(t, success)
|
||||
@ -78,7 +77,7 @@ func TestMatchString(t *testing.T) {
|
||||
input := rapid.SliceOfN(rapid.Byte(), 1, 100).Draw(t, "input")
|
||||
slen := rapid.IntRange(0, len(input)).Draw(t, "slen")
|
||||
s := string(input[:slen])
|
||||
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(cursor.NewReaderAt(bytes.NewReader(input))))
|
||||
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(bytes.NewReader(input)))
|
||||
must.NoError(t, err)
|
||||
success, value, next := result.Status()
|
||||
must.True(t, success)
|
||||
|
Reference in New Issue
Block a user