errors.go

@@ -6,5 +6,4 @@ import (
 
 var (
 	ErrNothingToUnread = adverr.NewErrTmpl("ErrNothingToUnread", "Unreading failed because there wasn't any Read yet")
-	ErrPopFailed       = adverr.NewErrTmpl("ErrPopFailed", "stack cannot be popped. It was never pushed")
 )

go.mod

@@ -5,7 +5,4 @@ go 1.19
 require (
 	git.milar.in/milarin/adverr v1.1.0
 	git.milar.in/milarin/ds v0.0.2
-	git.milar.in/milarin/slices v0.0.8
 )
-
-require git.milar.in/milarin/gmath v0.0.3 // indirect

go.sum

@@ -1,8 +1,8 @@
 git.milar.in/milarin/adverr v1.1.0 h1:jD9WnOvs40lfMhvqQ7cllOaRJNBMWr1f07/s9jAadp0=
 git.milar.in/milarin/adverr v1.1.0/go.mod h1:joU9sBb7ySyNv4SpTXB0Z4o1mjXsArBw4N27wjgzj9E=
+git.milar.in/milarin/ds v0.0.0-20230120204927-7dc44b9cd222 h1:r7gcMqltPqk9U2/+LzEN5dooZ5wiQ8C7SI/nK6T0KjA=
+git.milar.in/milarin/ds v0.0.0-20230120204927-7dc44b9cd222/go.mod h1:HJK7QERcRvV9j7xzEocrKUtW+1q4JB1Ly4Bj54chfwI=
+git.milar.in/milarin/ds v0.0.1 h1:ov4Rp+QiB3xtmV0a4eC+LluxWEOvbykgW+wCchYEp9o=
+git.milar.in/milarin/ds v0.0.1/go.mod h1:HJK7QERcRvV9j7xzEocrKUtW+1q4JB1Ly4Bj54chfwI=
 git.milar.in/milarin/ds v0.0.2 h1:vCA3mDxZUNfvHpzrdz7SeBUKiPn74NTopo915IUG7I0=
 git.milar.in/milarin/ds v0.0.2/go.mod h1:HJK7QERcRvV9j7xzEocrKUtW+1q4JB1Ly4Bj54chfwI=
-git.milar.in/milarin/gmath v0.0.3 h1:ii6rKNItS55O/wtIFhD1cTN2BMwDZjTBmiOocKURvxM=
-git.milar.in/milarin/gmath v0.0.3/go.mod h1:HDLftG5RLpiNGKiIWh+O2G1PYkNzyLDADO8Cd/1abiE=
-git.milar.in/milarin/slices v0.0.8 h1:qN9TE3tkArdTixMKSnwvNPcApwAjxpLVwA5a9k1rm2s=
-git.milar.in/milarin/slices v0.0.8/go.mod h1:qMhdtMnfWswc1rHpwgNw33lB84aNEkdBn5BDiYA+G3k=

position.go

@@ -10,7 +10,7 @@ func (p *Position) Advance(rn rune) {
 	p.Index++
 	if rn == '\n' {
 		p.Line++
-		p.Column = 1
+		p.Column = 0
 	} else {
 		p.Column++
 	}

reader.go

@@ -6,31 +6,22 @@ import (
 	"strings"
 
 	"git.milar.in/milarin/ds"
-	"git.milar.in/milarin/slices"
 )
 
 type Reader struct {
 	buf ds.Stack[posRune]
-	indices ds.Stack[uint64]
-	index   uint64
 	src *bufio.Reader
 	pos *Position
 }
 
-func New(r io.Reader) *Reader {
+func NewReader(r io.Reader) *Reader {
 	return &Reader{
 		buf: ds.NewArrayStack[posRune](),
 		src: bufio.NewReader(r),
-		pos:     &Position{Index: 0, Line: 1, Column: 1},
+		pos: &Position{},
-		index:   0,
-		indices: ds.NewArrayStack[uint64](),
 	}
 }
 
-func NewFromString(str string) *Reader {
-	return New(strings.NewReader(str))
-}
-
 func (r *Reader) psrn(rn rune) posRune {
 	return posRune{
 		Rune: rn,
@@ -38,8 +29,8 @@ func (r *Reader) psrn(rn rune) posRune {
 	}
 }
 
-func (r *Reader) Pos() Position {
+func (r *Reader) Pos() (index, line, column int) {
-	return *r.pos
+	return r.pos.Index, r.pos.Line, r.pos.Column
 }
 
 // Rune returns the next rune in r
@@ -48,15 +39,10 @@ func (r *Reader) Rune() (rune, error) {
 	if err == nil {
 		r.buf.Push(r.psrn(rn))
 		r.pos.Advance(rn)
-		r.index++
 	}
 	return rn, err
 }
 
-func (r *Reader) Buffered() int {
-	return r.src.Buffered()
-}
-
 // PeekRune returns the next rune in r without advancing reader position.
 // The next read will return the same rune again.
 func (r *Reader) PeekRune() (rune, error) {
@@ -105,8 +91,6 @@ func (r *Reader) UnreadRune() error {
 		r.src = prependRune(rn.Rune, r.src)
 	}
 
-	r.index--
-
 	return nil
 }
 
@@ -165,6 +149,12 @@ func (r *Reader) PeekStringWhile(f ...RuneFunc) (string, error) {
 	return str, nil
 }
 
+// SkipStringWhile acts as StringWhile but discards the string
+func (r *Reader) SkipStringWhile(f ...RuneFunc) error {
+	_, err := r.StringWhile(f...)
+	return err
+}
+
 // StringUntil reads runes and calls all functions for each one.
 // It returns all runes as a string for which all functions returned true.
 // It stops when any function returns false or an error occured.
@@ -187,115 +177,14 @@ func (r *Reader) PeekStringUntil(f ...RuneFunc) (string, error) {
 	return str, nil
 }
 
-// SkipUntil acts as StringUntil but discards the string
+// SkipStringUntil acts as StringUntil but discards the string
-// The rune for which that function returned false will be unread.
+func (r *Reader) SkipStringUntil(f ...RuneFunc) error {
-func (r *Reader) SkipUntil(f ...RuneFunc) error {
 	_, err := r.StringUntil(f...)
-	if err != nil {
 	return err
-	}
-	return r.UnreadRune()
 }
 
-// SkipWhile acts as StringWhile but discards the string.
+// Commit clears the internal buffer and therefore removes all data which were already read.
-// The rune for which that function returned false will be unread.
+// After calling Commit any unreads will return ErrNothingToUnread until another read occured.
-func (r *Reader) SkipWhile(f ...RuneFunc) error {
+func (r *Reader) Commit() {
-	_, err := r.StringWhile(f...)
+	r.buf.Clear()
-	if err != nil {
-		return err
-	}
-	return r.UnreadRune()
-}
-
-// ExpectRune returns true if any function returns true for the next rune read from r
-func (r *Reader) ExpectRune(f ...RuneFunc) (bool, error) {
-	rn, err := r.Rune()
-	if err != nil {
-		return false, err
-	}
-	return findFirstTrue(rn, f), nil
-}
-
-// ExpectString calls ExpectRune for each rune in str successively.
-// If the expected string was not found, all read runes will be unread
-func (r *Reader) ExpectString(str string) (bool, error) {
-	read := 0
-	for _, rn := range str {
-		ok, err := r.ExpectRune(Is(rn))
-		if err != nil {
-			return false, err
-		}
-
-		read++
-
-		if !ok {
-			if err := r.UnreadRunes(read); err != nil {
-				return false, err
-			}
-			return false, nil
-		}
-	}
-
-	return true, nil
-}
-
-// ExpectOneOfString calls ExpectString for each string successively
-// and returns the string which first matched.
-// The boolean value is true if any string was found.
-// The returned string will not be unread.
-func (r *Reader) ExpectOneOfString(str ...string) (string, bool, error) {
-	for _, s := range str {
-		ok, err := r.ExpectString(s)
-		if err != nil {
-			return "", false, err
-		}
-
-		if ok {
-			return s, true, nil
-		}
-	}
-
-	return "", false, nil
-}
-
-func (r *Reader) Push() {
-	r.indices.Push(r.index)
-}
-
-func (r *Reader) Pop() ([]rune, error) {
-	if r.indices.Empty() {
-		return nil, ErrPopFailed.New()
-	}
-
-	lastIndex := r.indices.Pop()
-	currentIndex := r.index
-	if lastIndex < currentIndex {
-		values := make([]rune, 0, int(currentIndex-lastIndex))
-		for i := 0; i < int(currentIndex-lastIndex); i++ {
-			err := r.UnreadRune()
-			if err != nil {
-				return nil, err
-			}
-
-			value, err := r.PeekRune()
-			if err != nil {
-				return nil, err
-			}
-
-			values = append(values, value)
-		}
-		return slices.Reverse(values), nil
-	} else if lastIndex > currentIndex {
-		values := make([]rune, 0, int(lastIndex-currentIndex))
-		for i := 0; i < int(lastIndex-currentIndex); i++ {
-			value, err := r.Rune()
-			if err != nil {
-				return nil, err
-			}
-			values = append(values, value)
-		}
-		return values, nil
-	}
-
-	return []rune{}, nil
 }

reader_test.go

@@ -7,12 +7,12 @@ import (
 )
 
 func TestPos(t *testing.T) {
-	r := New(strings.NewReader("hello world\nsecond line"))
+	r := NewReader(strings.NewReader("hello world\nsecond line"))
 
 	unread := false
 	for rn, err := r.Rune(); err == nil; rn, err = r.Rune() {
-		pos := r.Pos()
+		index, line, col := r.Pos()
-		fmt.Println(string(rn), pos.Index, pos.Line, pos.Column)
+		fmt.Println(string(rn), index, line, col)
 
 		if !unread && rn == '\n' {
 			for i := 0; i < 5; i++ {
@@ -24,7 +24,7 @@ func TestPos(t *testing.T) {
 }
 
 func TestEOF(t *testing.T) {
-	r := New(strings.NewReader("hello world\nasddsa"))
+	r := NewReader(strings.NewReader("hello world\nasddsa"))
 
 	var line string
 	var err error

runefunc.go

@@ -12,12 +12,8 @@ func IsSpace(rn rune) bool {
 	return rn == ' '
 }
 
-func IsTab(rn rune) bool {
-	return rn == '\t'
-}
-
 func IsWhitespace(rn rune) bool {
-	return IsSpace(rn) || IsTab(rn) || IsNewLine(rn)
+	return IsSpace(rn) || IsNewLine(rn)
 }
 
 func And(f ...RuneFunc) RuneFunc {