lexer: introduce a Position (Line, Column) handler

Signed-off-by: Alejandro Mery <amery@jpi.io>

lexer/lexer.go

@@ -1,11 +1,6 @@
 // Package lexer provides basic helpers to implement parsers
 package lexer
 
-import (
-	"errors"
-	"io"
-)
-
 // StateFn is a State Function of the parser
 type StateFn func() (StateFn, error)
 
@@ -16,11 +11,7 @@ func Run(fn StateFn) error {
 		var err error
 
 		fn, err = fn()
-		switch {
+		if err != nil {
-		case errors.Is(err, io.EOF):
-			// EOF
-			return nil
-		case err != nil:
 			// failed
 			return err
 		}

lexer/position.go

@@ -41,26 +41,28 @@ func (p *Position) Step() {
 	p.Column++
 }
 
-// StepN moves the column N places forward
+// Next returns a new Position one rune forward
-func (p *Position) StepN(n int) {
+// on the line
+func (p Position) Next() Position {
 	if p.Line == 0 {
 		p.Reset()
 	}
 
-	switch {
+	return Position{
-	case n > 0:
+		Line:   p.Line,
-		p.Column += n
+		Column: p.Column + 1,
-	default:
-		panic(fmt.Errorf("invalid %v increment", n))
 	}
 }
 
-// StepLine moves position to the start of the next line
+// NextLine returns a new Position at the begining of the next
-func (p *Position) StepLine() {
+// line.
+func (p Position) NextLine() Position {
 	if p.Line == 0 {
 		p.Reset()
 	}
 
-	p.Line++
+	return Position{
-	p.Column = 1
+		Line:   p.Line + 1,
+		Column: 1,
+	}
 }