[refactoring] use position.Position to store token position

internal/scanner/lexer.go

@@ -78,10 +78,10 @@ func (l *Lexer) SetErrors(e []*errors.Error) {
 }
 
 func (lex *Lexer) setTokenPosition(token *Token) {
-	token.StartLine = lex.NewLines.GetLine(lex.ts)
-	token.EndLine = lex.NewLines.GetLine(lex.te - 1)
-	token.StartPos = lex.ts
-	token.EndPos = lex.te
+	token.Position.StartLine = lex.NewLines.GetLine(lex.ts)
+	token.Position.EndLine = lex.NewLines.GetLine(lex.te - 1)
+	token.Position.StartPos = lex.ts
+	token.Position.EndPos = lex.te
 }
 
 func (lex *Lexer) addToken(id TokenID, ps, pe int) {

internal/scanner/token.go

@@ -1,16 +1,14 @@
 package scanner
 
 import (
+	"github.com/z7zmey/php-parser/pkg/position"
 	"github.com/z7zmey/php-parser/pkg/token"
 )
 
 // Token value returned by lexer
 type Token struct {
-	ID        TokenID
-	Value     []byte
-	Tokens    []token.Token
-	StartLine int
-	EndLine   int
-	StartPos  int
-	EndPos    int
+	ID       TokenID
+	Value    []byte
+	Tokens   []token.Token
+	Position position.Position
 }