maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[refactoring] remove scanner token

Browse Source
This commit is contained in:
Vadym Slizov
2020-08-17 20:31:04 +03:00
parent 394092269a
commit 97747c5ac0
36 changed files with 6591 additions and 9813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/position/position.go
View File

@@ -1,9 +1,9 @@
package position
import (
"github.com/z7zmey/php-parser/internal/scanner"
"github.com/z7zmey/php-parser/pkg/ast"
"github.com/z7zmey/php-parser/pkg/position"
"github.com/z7zmey/php-parser/pkg/token"
)
type startPos struct {
@@ -95,7 +95,7 @@ func NewNodePosition(n ast.Vertex) *position.Position {
}
// NewTokenPosition returns new Position
func NewTokenPosition(t *scanner.Token) *position.Position {
func NewTokenPosition(t *token.Token) *position.Position {
return &position.Position{
StartLine: t.Position.StartLine,
EndLine: t.Position.EndLine,
@@ -105,7 +105,7 @@ func NewTokenPosition(t *scanner.Token) *position.Position {
}
// NewTokensPosition returns new Position
func NewTokensPosition(startToken *scanner.Token, endToken *scanner.Token) *position.Position {
func NewTokensPosition(startToken *token.Token, endToken *token.Token) *position.Position {
return &position.Position{
StartLine: startToken.Position.StartLine,
EndLine: endToken.Position.EndLine,
@@ -115,7 +115,7 @@ func NewTokensPosition(startToken *scanner.Token, endToken *scanner.Token) *posi
}
// NewTokenNodePosition returns new Position
func NewTokenNodePosition(t *scanner.Token, n ast.Vertex) *position.Position {
func NewTokenNodePosition(t *token.Token, n ast.Vertex) *position.Position {
return &position.Position{
StartLine: t.Position.StartLine,
EndLine: getNodeEndPos(n).endLine,
@@ -125,7 +125,7 @@ func NewTokenNodePosition(t *scanner.Token, n ast.Vertex) *position.Position {
}
// NewNodeTokenPosition returns new Position
func NewNodeTokenPosition(n ast.Vertex, t *scanner.Token) *position.Position {
func NewNodeTokenPosition(n ast.Vertex, t *token.Token) *position.Position {
return &position.Position{
StartLine: getNodeStartPos(n).startLine,
EndLine: t.Position.EndLine,
@@ -145,7 +145,7 @@ func NewNodesPosition(startNode ast.Vertex, endNode ast.Vertex) *position.Positi
}
// NewNodeListTokenPosition returns new Position
func NewNodeListTokenPosition(list []ast.Vertex, t *scanner.Token) *position.Position {
func NewNodeListTokenPosition(list []ast.Vertex, t *token.Token) *position.Position {
return &position.Position{
StartLine: getListStartPos(list).startLine,
EndLine: t.Position.EndLine,
@@ -155,7 +155,7 @@ func NewNodeListTokenPosition(list []ast.Vertex, t *scanner.Token) *position.Pos
}
// NewTokenNodeListPosition returns new Position
func NewTokenNodeListPosition(t *scanner.Token, list []ast.Vertex) *position.Position {
func NewTokenNodeListPosition(t *token.Token, list []ast.Vertex) *position.Position {
return &position.Position{
StartLine: t.Position.StartLine,
EndLine: getListEndPos(list).endLine,
@@ -185,7 +185,7 @@ func NewNodeListNodePosition(list []ast.Vertex, n ast.Vertex) *position.Position
}
// NewOptionalListTokensPosition returns new Position
func NewOptionalListTokensPosition(list []ast.Vertex, t *scanner.Token, endToken *scanner.Token) *position.Position {
func NewOptionalListTokensPosition(list []ast.Vertex, t *token.Token, endToken *token.Token) *position.Position {
if list == nil {
return &position.Position{
StartLine: t.Position.StartLine,

54
internal/position/position_test.go
View File

@@ -5,15 +5,15 @@ import (
"testing"
builder "github.com/z7zmey/php-parser/internal/position"
"github.com/z7zmey/php-parser/internal/scanner"
"github.com/z7zmey/php-parser/pkg/ast"
"github.com/z7zmey/php-parser/pkg/position"
"github.com/z7zmey/php-parser/pkg/token"
)
func TestNewTokenPosition(t *testing.T) {
tkn := &scanner.Token{
tkn := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
@@ -29,18 +29,18 @@ func TestNewTokenPosition(t *testing.T) {
}
func TestNewTokensPosition(t *testing.T) {
token1 := &scanner.Token{
token1 := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 3,
},
}
token2 := &scanner.Token{
token2 := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 4,
@@ -71,9 +71,9 @@ func TestNewNodePosition(t *testing.T) {
}
func TestNewTokenNodePosition(t *testing.T) {
tkn := &scanner.Token{
tkn := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
@@ -108,9 +108,9 @@ func TestNewNodeTokenPosition(t *testing.T) {
},
}
tkn := &scanner.Token{
tkn := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 10,
@@ -202,9 +202,9 @@ func TestNewNodeListTokenPosition(t *testing.T) {
},
}
tkn := &scanner.Token{
tkn := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 3,
EndLine: 3,
StartPos: 20,
@@ -218,9 +218,9 @@ func TestNewNodeListTokenPosition(t *testing.T) {
}
func TestNewTokenNodeListPosition(t *testing.T) {
tkn := &scanner.Token{
tkn := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
@@ -332,18 +332,18 @@ func TestNewNodeListNodePosition(t *testing.T) {
}
func TestNewOptionalListTokensPosition(t *testing.T) {
token1 := &scanner.Token{
token1 := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 3,
},
}
token2 := &scanner.Token{
token2 := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 4,
@@ -378,18 +378,18 @@ func TestNewOptionalListTokensPosition2(t *testing.T) {
},
}
token1 := &scanner.Token{
token1 := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 4,
EndLine: 4,
StartPos: 27,
EndPos: 29,
},
}
token2 := &scanner.Token{
token2 := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 5,
EndLine: 5,
StartPos: 30,
@@ -426,9 +426,9 @@ func TestNilNodeListPos(t *testing.T) {
}
func TestNilNodeListTokenPos(t *testing.T) {
token := &scanner.Token{
token := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
@@ -459,9 +459,9 @@ func TestEmptyNodeListPos(t *testing.T) {
}
func TestEmptyNodeListTokenPos(t *testing.T) {
token := &scanner.Token{
token := &token.Token{
Value: []byte(`foo`),
Position: position.Position{
Position: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,