3 Commits

Author SHA1 Message Date
5897251193 fixed column indexing 2023-03-18 23:10:22 +01:00
9d4da8ef95 fixed line indexing 2023-03-18 23:08:33 +01:00
31f5aa6e52 unread rune on skip methods 2023-01-21 00:37:14 +01:00
2 changed files with 13 additions and 5 deletions

View File

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

View File

@ -18,7 +18,7 @@ func New(r io.Reader) *Reader {
return &Reader{ return &Reader{
buf: ds.NewArrayStack[posRune](), buf: ds.NewArrayStack[posRune](),
src: bufio.NewReader(r), src: bufio.NewReader(r),
pos: &Position{}, pos: &Position{Index: 0, Line: 1, Column: 1},
} }
} }
@ -176,15 +176,23 @@ func (r *Reader) PeekStringUntil(f ...RuneFunc) (string, error) {
} }
// SkipUntil acts as StringUntil but discards the string // SkipUntil acts as StringUntil but discards the string
// The rune for which that function returned false will be unread.
func (r *Reader) SkipUntil(f ...RuneFunc) error { func (r *Reader) SkipUntil(f ...RuneFunc) error {
_, err := r.StringUntil(f...) _, err := r.StringUntil(f...)
return err if err != nil {
return err
}
return r.UnreadRune()
} }
// SkipWhile acts as StringWhile but discards the string // SkipWhile acts as StringWhile but discards the string.
// The rune for which that function returned false will be unread.
func (r *Reader) SkipWhile(f ...RuneFunc) error { func (r *Reader) SkipWhile(f ...RuneFunc) error {
_, err := r.StringWhile(f...) _, err := r.StringWhile(f...)
return err if err != nil {
return err
}
return r.UnreadRune()
} }
// ExpectRune returns true if any function returns true for the next rune read from r // ExpectRune returns true if any function returns true for the next rune read from r