Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
5897251193 | |||
9d4da8ef95 | |||
31f5aa6e52 |
@ -10,7 +10,7 @@ func (p *Position) Advance(rn rune) {
|
||||
p.Index++
|
||||
if rn == '\n' {
|
||||
p.Line++
|
||||
p.Column = 0
|
||||
p.Column = 1
|
||||
} else {
|
||||
p.Column++
|
||||
}
|
||||
|
12
reader.go
12
reader.go
@ -18,7 +18,7 @@ func New(r io.Reader) *Reader {
|
||||
return &Reader{
|
||||
buf: ds.NewArrayStack[posRune](),
|
||||
src: bufio.NewReader(r),
|
||||
pos: &Position{},
|
||||
pos: &Position{Index: 0, Line: 1, Column: 1},
|
||||
}
|
||||
}
|
||||
|
||||
@ -176,16 +176,24 @@ func (r *Reader) PeekStringUntil(f ...RuneFunc) (string, error) {
|
||||
}
|
||||
|
||||
// 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 {
|
||||
_, err := r.StringUntil(f...)
|
||||
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 {
|
||||
_, err := r.StringWhile(f...)
|
||||
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) {
|
||||
|
Reference in New Issue
Block a user