Update go.mod

errors.go

@@ -6,4 +6,5 @@ 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

@@ -1,8 +1,11 @@
-module git.milar.in/milarin/bufr
+module git.tordarus.net/tordarus/bufr
 
 go 1.19
 
 require (
-	git.milar.in/milarin/adverr v1.1.0
+	git.tordarus.net/tordarus/adverr v1.1.0
-	git.milar.in/milarin/ds v0.0.2
+	git.tordarus.net/tordarus/ds v0.0.2
+	git.tordarus.net/tordarus/slices v0.0.8
 )
+
+require git.tordarus.net/tordarus/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=

reader.go

@@ -6,10 +6,13 @@ 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
 }
@@ -19,6 +22,8 @@ func New(r io.Reader) *Reader {
 		buf:     ds.NewArrayStack[posRune](),
 		src:     bufio.NewReader(r),
 		pos:     &Position{Index: 0, Line: 1, Column: 1},
+		index:   0,
+		indices: ds.NewArrayStack[uint64](),
 	}
 }
 
@@ -33,8 +38,8 @@ func (r *Reader) psrn(rn rune) posRune {
 	}
 }
 
-func (r *Reader) Pos() (index, line, column int) {
+func (r *Reader) Pos() Position {
-	return r.pos.Index, r.pos.Line, r.pos.Column
+	return *r.pos
 }
 
 // Rune returns the next rune in r
@@ -43,10 +48,15 @@ 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) {
@@ -95,6 +105,8 @@ func (r *Reader) UnreadRune() error {
 		r.src = prependRune(rn.Rune, r.src)
 	}
 
+	r.index--
+
 	return nil
 }
 
@@ -204,8 +216,86 @@ func (r *Reader) ExpectRune(f ...RuneFunc) (bool, error) {
 	return findFirstTrue(rn, f), nil
 }
 
-// Commit clears the internal buffer and therefore removes all data which were already read.
+// ExpectString calls ExpectRune for each rune in str successively.
-// After calling Commit any unreads will return ErrNothingToUnread until another read occured.
+// If the expected string was not found, all read runes will be unread
-func (r *Reader) Commit() {
+func (r *Reader) ExpectString(str string) (bool, error) {
-	r.buf.Clear()
+	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

@@ -11,8 +11,8 @@ func TestPos(t *testing.T) {
 
 	unread := false
 	for rn, err := r.Rune(); err == nil; rn, err = r.Rune() {
-		index, line, col := r.Pos()
+		pos := r.Pos()
-		fmt.Println(string(rn), index, line, col)
+		fmt.Println(string(rn), pos.Index, pos.Line, pos.Column)
 
 		if !unread && rn == '\n' {
 			for i := 0; i < 5; i++ {

runefunc.go

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