From e98607f5d08bd7b0b89c18da1cd5c38093f19ffe Mon Sep 17 00:00:00 2001
From: Vadym Slizov <vadym.slizov@miacar.ch>
Date: Sun, 17 May 2020 23:50:23 +0300
Subject: [PATCH] [refactoring] use position.Position to store token position

---
 internal/php5/parser.go                       |  10 +-
 internal/php5/php5.go                         | Bin 352441 -> 353481 bytes
 internal/php7/parser.go                       |  10 +-
 internal/positionbuilder/position_builder.go  |  44 ++---
 .../positionbuilder/position_builder_test.go  | 156 ++++++++++--------
 internal/scanner/lexer.go                     |   8 +-
 internal/scanner/token.go                     |  12 +-
 7 files changed, 126 insertions(+), 114 deletions(-)

diff --git a/internal/php5/parser.go b/internal/php5/parser.go
index d4ec16d..e3b2dc9 100644
--- a/internal/php5/parser.go
+++ b/internal/php5/parser.go
@@ -8,7 +8,6 @@ import (
 	"github.com/z7zmey/php-parser/internal/scanner"
 	"github.com/z7zmey/php-parser/pkg/ast"
 	"github.com/z7zmey/php-parser/pkg/errors"
-	"github.com/z7zmey/php-parser/pkg/position"
 	"github.com/z7zmey/php-parser/pkg/token"
 )
 
@@ -45,14 +44,9 @@ func (l *Parser) Lex(lval *yySymType) int {
 }
 
 func (l *Parser) Error(msg string) {
-	pos := &position.Position{
-		StartLine: l.currentToken.StartLine,
-		EndLine:   l.currentToken.EndLine,
-		StartPos:  l.currentToken.StartPos,
-		EndPos:    l.currentToken.EndPos,
-	}
+	var pos = l.currentToken.Position
 
-	l.Lexer.AddError(errors.NewError(msg, pos))
+	l.Lexer.AddError(errors.NewError(msg, &pos))
 }
 
 func (l *Parser) WithTokens() {
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index b63ef14d9ac832ea4a8f75c6ef740c1df8969913..c822f382c48cfe6e2733cae244a389469472bf4d 100644
GIT binary patch
delta 7013
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
b$~EBgUoq~v;Z6QgqE1_e>U3~~@d*D9=q|R^

delta 5065
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
JIo5i`{{}uRk-h)`

diff --git a/internal/php7/parser.go b/internal/php7/parser.go
index a960984..918c795 100644
--- a/internal/php7/parser.go
+++ b/internal/php7/parser.go
@@ -7,7 +7,6 @@ import (
 	"github.com/z7zmey/php-parser/internal/scanner"
 	"github.com/z7zmey/php-parser/pkg/ast"
 	"github.com/z7zmey/php-parser/pkg/errors"
-	"github.com/z7zmey/php-parser/pkg/position"
 	"github.com/z7zmey/php-parser/pkg/token"
 )
 
@@ -43,14 +42,9 @@ func (l *Parser) Lex(lval *yySymType) int {
 }
 
 func (l *Parser) Error(msg string) {
-	pos := &position.Position{
-		StartLine: l.currentToken.StartLine,
-		EndLine:   l.currentToken.EndLine,
-		StartPos:  l.currentToken.StartPos,
-		EndPos:    l.currentToken.EndPos,
-	}
+	var pos = l.currentToken.Position
 
-	l.Lexer.AddError(errors.NewError(msg, pos))
+	l.Lexer.AddError(errors.NewError(msg, &pos))
 }
 
 func (l *Parser) WithTokens() {
diff --git a/internal/positionbuilder/position_builder.go b/internal/positionbuilder/position_builder.go
index cf06379..4f69393 100644
--- a/internal/positionbuilder/position_builder.go
+++ b/internal/positionbuilder/position_builder.go
@@ -100,29 +100,29 @@ func (b *PositionBuilder) NewNodePosition(n ast.Vertex) *position.Position {
 // NewTokenPosition returns new Position
 func (b *PositionBuilder) NewTokenPosition(t *scanner.Token) *position.Position {
 	return &position.Position{
-		StartLine: t.StartLine,
-		EndLine:   t.EndLine,
-		StartPos:  t.StartPos,
-		EndPos:    t.EndPos,
+		StartLine: t.Position.StartLine,
+		EndLine:   t.Position.EndLine,
+		StartPos:  t.Position.StartPos,
+		EndPos:    t.Position.EndPos,
 	}
 }
 
 // NewTokensPosition returns new Position
 func (b *PositionBuilder) NewTokensPosition(startToken *scanner.Token, endToken *scanner.Token) *position.Position {
 	return &position.Position{
-		StartLine: startToken.StartLine,
-		EndLine:   endToken.EndLine,
-		StartPos:  startToken.StartPos,
-		EndPos:    endToken.EndPos,
+		StartLine: startToken.Position.StartLine,
+		EndLine:   endToken.Position.EndLine,
+		StartPos:  startToken.Position.StartPos,
+		EndPos:    endToken.Position.EndPos,
 	}
 }
 
 // NewTokenNodePosition returns new Position
 func (b *PositionBuilder) NewTokenNodePosition(t *scanner.Token, n ast.Vertex) *position.Position {
 	return &position.Position{
-		StartLine: t.StartLine,
+		StartLine: t.Position.StartLine,
 		EndLine:   b.getNodeEndPos(n).endLine,
-		StartPos:  t.StartPos,
+		StartPos:  t.Position.StartPos,
 		EndPos:    b.getNodeEndPos(n).endPos,
 	}
 }
@@ -131,9 +131,9 @@ func (b *PositionBuilder) NewTokenNodePosition(t *scanner.Token, n ast.Vertex) *
 func (b *PositionBuilder) NewNodeTokenPosition(n ast.Vertex, t *scanner.Token) *position.Position {
 	return &position.Position{
 		StartLine: b.getNodeStartPos(n).startLine,
-		EndLine:   t.EndLine,
+		EndLine:   t.Position.EndLine,
 		StartPos:  b.getNodeStartPos(n).startPos,
-		EndPos:    t.EndPos,
+		EndPos:    t.Position.EndPos,
 	}
 }
 
@@ -151,18 +151,18 @@ func (b *PositionBuilder) NewNodesPosition(startNode ast.Vertex, endNode ast.Ver
 func (b *PositionBuilder) NewNodeListTokenPosition(list []ast.Vertex, t *scanner.Token) *position.Position {
 	return &position.Position{
 		StartLine: b.getListStartPos(list).startLine,
-		EndLine:   t.EndLine,
+		EndLine:   t.Position.EndLine,
 		StartPos:  b.getListStartPos(list).startPos,
-		EndPos:    t.EndPos,
+		EndPos:    t.Position.EndPos,
 	}
 }
 
 // NewTokenNodeListPosition returns new Position
 func (b *PositionBuilder) NewTokenNodeListPosition(t *scanner.Token, list []ast.Vertex) *position.Position {
 	return &position.Position{
-		StartLine: t.StartLine,
+		StartLine: t.Position.StartLine,
 		EndLine:   b.getListEndPos(list).endLine,
-		StartPos:  t.StartPos,
+		StartPos:  t.Position.StartPos,
 		EndPos:    b.getListEndPos(list).endPos,
 	}
 }
@@ -191,17 +191,17 @@ func (b *PositionBuilder) NewNodeListNodePosition(list []ast.Vertex, n ast.Verte
 func (b *PositionBuilder) NewOptionalListTokensPosition(list []ast.Vertex, t *scanner.Token, endToken *scanner.Token) *position.Position {
 	if list == nil {
 		return &position.Position{
-			StartLine: t.StartLine,
-			EndLine:   endToken.EndLine,
-			StartPos:  t.StartPos,
-			EndPos:    endToken.EndPos,
+			StartLine: t.Position.StartLine,
+			EndLine:   endToken.Position.EndLine,
+			StartPos:  t.Position.StartPos,
+			EndPos:    endToken.Position.EndPos,
 		}
 	}
 
 	return &position.Position{
 		StartLine: b.getListStartPos(list).startLine,
-		EndLine:   endToken.EndLine,
+		EndLine:   endToken.Position.EndLine,
 		StartPos:  b.getListStartPos(list).startPos,
-		EndPos:    endToken.EndPos,
+		EndPos:    endToken.Position.EndPos,
 	}
 }
diff --git a/internal/positionbuilder/position_builder_test.go b/internal/positionbuilder/position_builder_test.go
index 5d0e5bc..24652d9 100644
--- a/internal/positionbuilder/position_builder_test.go
+++ b/internal/positionbuilder/position_builder_test.go
@@ -14,11 +14,13 @@ func TestNewTokenPosition(t *testing.T) {
 	builder := positionbuilder.PositionBuilder{}
 
 	tkn := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 1,
-		EndLine:   1,
-		StartPos:  0,
-		EndPos:    3,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  0,
+			EndPos:    3,
+		},
 	}
 
 	pos := builder.NewTokenPosition(tkn)
@@ -32,18 +34,22 @@ func TestNewTokensPosition(t *testing.T) {
 	builder := positionbuilder.PositionBuilder{}
 
 	token1 := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 1,
-		EndLine:   1,
-		StartPos:  0,
-		EndPos:    3,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  0,
+			EndPos:    3,
+		},
 	}
 	token2 := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 2,
-		EndLine:   2,
-		StartPos:  4,
-		EndPos:    6,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 2,
+			EndLine:   2,
+			StartPos:  4,
+			EndPos:    6,
+		},
 	}
 
 	pos := builder.NewTokensPosition(token1, token2)
@@ -72,11 +78,13 @@ func TestNewNodePosition(t *testing.T) {
 
 func TestNewTokenNodePosition(t *testing.T) {
 	tkn := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 1,
-		EndLine:   1,
-		StartPos:  0,
-		EndPos:    3,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  0,
+			EndPos:    3,
+		},
 	}
 	n := &ast.Identifier{
 		Node: ast.Node{
@@ -109,11 +117,13 @@ func TestNewNodeTokenPosition(t *testing.T) {
 	}
 
 	tkn := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 2,
-		EndLine:   2,
-		StartPos:  10,
-		EndPos:    12,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 2,
+			EndLine:   2,
+			StartPos:  10,
+			EndPos:    12,
+		},
 	}
 
 	builder := positionbuilder.PositionBuilder{}
@@ -207,11 +217,13 @@ func TestNewNodeListTokenPosition(t *testing.T) {
 	}
 
 	tkn := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 3,
-		EndLine:   3,
-		StartPos:  20,
-		EndPos:    22,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 3,
+			EndLine:   3,
+			StartPos:  20,
+			EndPos:    22,
+		},
 	}
 
 	builder := positionbuilder.PositionBuilder{}
@@ -223,11 +235,13 @@ func TestNewNodeListTokenPosition(t *testing.T) {
 
 func TestNewTokenNodeListPosition(t *testing.T) {
 	tkn := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 1,
-		EndLine:   1,
-		StartPos:  0,
-		EndPos:    2,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  0,
+			EndPos:    2,
+		},
 	}
 
 	n1 := &ast.Identifier{
@@ -343,18 +357,22 @@ func TestNewOptionalListTokensPosition(t *testing.T) {
 	builder := positionbuilder.PositionBuilder{}
 
 	token1 := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 1,
-		EndLine:   1,
-		StartPos:  0,
-		EndPos:    3,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  0,
+			EndPos:    3,
+		},
 	}
 	token2 := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 2,
-		EndLine:   2,
-		StartPos:  4,
-		EndPos:    6,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 2,
+			EndLine:   2,
+			StartPos:  4,
+			EndPos:    6,
+		},
 	}
 
 	pos := builder.NewOptionalListTokensPosition(nil, token1, token2)
@@ -387,18 +405,22 @@ func TestNewOptionalListTokensPosition2(t *testing.T) {
 	builder := positionbuilder.PositionBuilder{}
 
 	token1 := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 4,
-		EndLine:   4,
-		StartPos:  27,
-		EndPos:    29,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 4,
+			EndLine:   4,
+			StartPos:  27,
+			EndPos:    29,
+		},
 	}
 	token2 := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 5,
-		EndLine:   5,
-		StartPos:  30,
-		EndPos:    32,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 5,
+			EndLine:   5,
+			StartPos:  30,
+			EndPos:    32,
+		},
 	}
 
 	pos := builder.NewOptionalListTokensPosition([]ast.Vertex{n2, n3}, token1, token2)
@@ -435,11 +457,13 @@ func TestNilNodeListPos(t *testing.T) {
 
 func TestNilNodeListTokenPos(t *testing.T) {
 	token := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 1,
-		EndLine:   1,
-		StartPos:  0,
-		EndPos:    3,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  0,
+			EndPos:    3,
+		},
 	}
 
 	builder := positionbuilder.PositionBuilder{}
@@ -470,11 +494,13 @@ func TestEmptyNodeListPos(t *testing.T) {
 
 func TestEmptyNodeListTokenPos(t *testing.T) {
 	token := &scanner.Token{
-		Value:     []byte(`foo`),
-		StartLine: 1,
-		EndLine:   1,
-		StartPos:  0,
-		EndPos:    3,
+		Value: []byte(`foo`),
+		Position: position.Position{
+			StartLine: 1,
+			EndLine:   1,
+			StartPos:  0,
+			EndPos:    3,
+		},
 	}
 
 	builder := positionbuilder.PositionBuilder{}
diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go
index 89b6891..9dad9d0 100644
--- a/internal/scanner/lexer.go
+++ b/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) {
diff --git a/internal/scanner/token.go b/internal/scanner/token.go
index 7c07126..793958c 100644
--- a/internal/scanner/token.go
+++ b/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
 }