3 Commits

Author SHA1 Message Date
1bb8ab5e9b fixed IsWhitespace function consideres tabs as whitespace 2023-06-30 19:16:25 +02:00
19e0a61345 Pos() returns a Position object 2023-06-30 18:08:34 +02:00
5897251193 fixed column indexing 2023-03-18 23:10:22 +01:00
4 changed files with 11 additions and 7 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{Index: 0, Line: 1, Column: 0}, pos: &Position{Index: 0, Line: 1, Column: 1},
} }
} }
@ -33,8 +33,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 // Rune returns the next rune in r

View File

@ -11,8 +11,8 @@ func TestPos(t *testing.T) {
unread := false unread := false
for rn, err := r.Rune(); err == nil; rn, err = r.Rune() { 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' { if !unread && rn == '\n' {
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {

View File

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