fixed StringWhile

pos_rune.go

@@ -0,0 +1,6 @@
+package bufr
+
+type posRune struct {
+	Rune rune
+	Pos  Position
+}

position.go

@@ -0,0 +1,17 @@
+package bufr
+
+type Position struct {
+	Index  int
+	Line   int
+	Column int
+}
+
+func (p *Position) Advance(rn rune) {
+	p.Index++
+	if rn == '\n' {
+		p.Line++
+		p.Column = 0
+	} else {
+		p.Column++
+	}
+}

reader.go

@@ -9,22 +9,36 @@ import (
 )
 
 type Reader struct {
-	buf *dstruct.Stack[rune]
+	buf *dstruct.Stack[posRune]
 	src *bufio.Reader
+	pos *Position
 }
 
 func NewReader(r io.Reader) *Reader {
 	return &Reader{
-		buf: new(dstruct.Stack[rune]),
+		buf: new(dstruct.Stack[posRune]),
 		src: bufio.NewReader(r),
+		pos: &Position{},
 	}
 }
 
+func (r *Reader) psrn(rn rune) posRune {
+	return posRune{
+		Rune: rn,
+		Pos:  *r.pos,
+	}
+}
+
+func (r *Reader) Pos() (index, line, column int) {
+	return r.pos.Index, r.pos.Line, r.pos.Column
+}
+
 // Rune returns the next rune in r
 func (r *Reader) Rune() (rune, error) {
 	rn, _, err := r.src.ReadRune()
 	if err == nil {
-		r.buf.Push(rn)
+		r.buf.Push(r.psrn(rn))
+		r.pos.Advance(rn)
 	}
 	return rn, err
 }
@@ -38,16 +52,19 @@ func (r *Reader) UnreadRune() error {
 	}
 
 	if err := r.src.UnreadRune(); err == nil {
-		r.buf.Pop()
+		rn := r.buf.Pop()
+		*r.pos = rn.Pos
 	} else {
-		r.src = prependRune(r.buf.Pop(), r.src)
+		rn := r.buf.Pop()
+		*r.pos = rn.Pos
+		r.src = prependRune(rn.Rune, r.src)
 	}
 
 	return nil
 }
 
-// UnreadString calls UnreadRune for each rune in str
-// The actual runes are irrelevant.
+// UnreadString calls UnreadRune for each rune in str + one addtional rune for the separator rune
+// The actual runes in str are irrelevant.
 // Only the rune count of str determines the amount of UnreadRune calls.
 // The first error occured will be returned immediately.
 func (r *Reader) UnreadString(str string) error {
@@ -57,7 +74,7 @@ func (r *Reader) UnreadString(str string) error {
 			return err
 		}
 	}
-	return nil
+	return r.UnreadRune()
 }
 
 // StringWhile reads runes and calls f for each one.
@@ -67,8 +84,9 @@ func (r *Reader) UnreadString(str string) error {
 func (r *Reader) StringWhile(f func(rn rune) bool) (string, error) {
 	s := new(strings.Builder)
 
+	var rn rune
 	var err error
-	for rn, err := r.Rune(); err == nil && f(rn); rn, err = r.Rune() {
+	for rn, err = r.Rune(); err == nil && f(rn); rn, err = r.Rune() {
 		s.WriteRune(rn)
 	}
 

reader_test.go

@@ -0,0 +1,36 @@
+package bufr
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+)
+
+func TestPos(t *testing.T) {
+	r := NewReader(strings.NewReader("hello world\nsecond line"))
+
+	unread := false
+	for rn, err := r.Rune(); err == nil; rn, err = r.Rune() {
+		index, line, col := r.Pos()
+		fmt.Println(string(rn), index, line, col)
+
+		if !unread && rn == '\n' {
+			for i := 0; i < 5; i++ {
+				r.UnreadRune()
+			}
+			unread = true
+		}
+	}
+}
+
+func TestEOF(t *testing.T) {
+	r := NewReader(strings.NewReader("hello world\nasddsa"))
+
+	for line, err := r.StringUntil(isNewline); err == nil; line, err = r.StringUntil(isNewline) {
+		fmt.Println(line, err)
+	}
+}
+
+func isNewline(rn rune) bool {
+	return rn == '\n'
+}