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

merge token package into scanner package

Browse Source
This commit is contained in:
z7zmey
2018-04-15 14:47:40 +03:00
parent 983c721e83
commit e65ace8984
14 changed files with 56 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
position/builder.go
View File

@@ -2,7 +2,7 @@ package position
import (
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/token"
"github.com/z7zmey/php-parser/scanner"
)
// Builder provide functions to constuct positions
@@ -99,7 +99,7 @@ func (b *Builder) NewNodePosition(n node.Node) *Position {
}
// NewTokenPosition returns new Position
func (b *Builder) NewTokenPosition(t token.Token) *Position {
func (b *Builder) NewTokenPosition(t scanner.Token) *Position {
return &Position{
t.StartLine,
t.EndLine,
@@ -109,7 +109,7 @@ func (b *Builder) NewTokenPosition(t token.Token) *Position {
}
// NewTokensPosition returns new Position
func (b *Builder) NewTokensPosition(startToken token.Token, endToken token.Token) *Position {
func (b *Builder) NewTokensPosition(startToken scanner.Token, endToken scanner.Token) *Position {
return &Position{
startToken.StartLine,
endToken.EndLine,
@@ -119,7 +119,7 @@ func (b *Builder) NewTokensPosition(startToken token.Token, endToken token.Token
}
// NewTokenNodePosition returns new Position
func (b *Builder) NewTokenNodePosition(t token.Token, n node.Node) *Position {
func (b *Builder) NewTokenNodePosition(t scanner.Token, n node.Node) *Position {
return &Position{
t.StartLine,
b.getNodeEndPos(n).endLine,
@@ -129,7 +129,7 @@ func (b *Builder) NewTokenNodePosition(t token.Token, n node.Node) *Position {
}
// NewNodeTokenPosition returns new Position
func (b *Builder) NewNodeTokenPosition(n node.Node, t token.Token) *Position {
func (b *Builder) NewNodeTokenPosition(n node.Node, t scanner.Token) *Position {
return &Position{
b.getNodeStartPos(n).startLine,
t.EndLine,
@@ -149,7 +149,7 @@ func (b *Builder) NewNodesPosition(startNode node.Node, endNode node.Node) *Posi
}
// NewNodeListTokenPosition returns new Position
func (b *Builder) NewNodeListTokenPosition(list []node.Node, t token.Token) *Position {
func (b *Builder) NewNodeListTokenPosition(list []node.Node, t scanner.Token) *Position {
return &Position{
b.getListStartPos(list).startLine,
t.EndLine,
@@ -159,7 +159,7 @@ func (b *Builder) NewNodeListTokenPosition(list []node.Node, t token.Token) *Pos
}
// NewTokenNodeListPosition returns new Position
func (b *Builder) NewTokenNodeListPosition(t token.Token, list []node.Node) *Position {
func (b *Builder) NewTokenNodeListPosition(t scanner.Token, list []node.Node) *Position {
return &Position{
t.StartLine,
b.getListEndPos(list).endLine,
@@ -179,7 +179,7 @@ func (b *Builder) NewNodeNodeListPosition(n node.Node, list []node.Node) *Positi
}
// NewOptionalListTokensPosition returns new Position
func (b *Builder) NewOptionalListTokensPosition(list []node.Node, t token.Token, endToken token.Token) *Position {
func (b *Builder) NewOptionalListTokensPosition(list []node.Node, t scanner.Token, endToken scanner.Token) *Position {
if list == nil {
return &Position{
t.StartLine,

28
position/position_test.go
View File

@@ -6,13 +6,13 @@ import (
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/position"
"github.com/z7zmey/php-parser/token"
"github.com/z7zmey/php-parser/scanner"
)
func TestNewTokenPosition(t *testing.T) {
builder := position.Builder{}
tkn := token.NewToken([]byte(`foo`), 1, 1, 0, 3)
tkn := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
pos := builder.NewTokenPosition(tkn)
@@ -24,8 +24,8 @@ func TestNewTokenPosition(t *testing.T) {
func TestNewTokensPosition(t *testing.T) {
builder := position.Builder{}
token1 := token.NewToken([]byte(`foo`), 1, 1, 0, 3)
token2 := token.NewToken([]byte(`foo`), 2, 2, 4, 6)
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
token2 := scanner.NewToken([]byte(`foo`), 2, 2, 4, 6)
pos := builder.NewTokensPosition(token1, token2)
@@ -57,7 +57,7 @@ func TestNewNodePosition(t *testing.T) {
}
func TestNewTokenNodePosition(t *testing.T) {
tkn := token.NewToken([]byte(`foo`), 1, 1, 0, 3)
tkn := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
n := node.NewIdentifier("test node")
p := &position.Positions{}
@@ -81,7 +81,7 @@ func TestNewTokenNodePosition(t *testing.T) {
func TestNewNodeTokenPosition(t *testing.T) {
n := node.NewIdentifier("test node")
tkn := token.NewToken([]byte(`foo`), 2, 2, 10, 12)
tkn := scanner.NewToken([]byte(`foo`), 2, 2, 10, 12)
p := &position.Positions{}
p.AddPosition(n, &position.Position{
@@ -161,7 +161,7 @@ func TestNewNodesPosition(t *testing.T) {
func TestNewNodeListTokenPosition(t *testing.T) {
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
tkn := token.NewToken([]byte(`foo`), 3, 3, 20, 22)
tkn := scanner.NewToken([]byte(`foo`), 3, 3, 20, 22)
builder := position.Builder{
Positions: &position.Positions{
@@ -188,7 +188,7 @@ func TestNewNodeListTokenPosition(t *testing.T) {
}
func TestNewTokenNodeListPosition(t *testing.T) {
tkn := token.NewToken([]byte(`foo`), 1, 1, 0, 2)
tkn := scanner.NewToken([]byte(`foo`), 1, 1, 0, 2)
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
@@ -254,8 +254,8 @@ func TestNewNodeNodeListPosition(t *testing.T) {
func TestNewOptionalListTokensPosition(t *testing.T) {
builder := position.Builder{}
token1 := token.NewToken([]byte(`foo`), 1, 1, 0, 3)
token2 := token.NewToken([]byte(`foo`), 2, 2, 4, 6)
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
token2 := scanner.NewToken([]byte(`foo`), 2, 2, 4, 6)
pos := builder.NewOptionalListTokensPosition(nil, token1, token2)
@@ -292,8 +292,8 @@ func TestNewOptionalListTokensPosition2(t *testing.T) {
},
}
token1 := token.NewToken([]byte(`foo`), 4, 4, 27, 29)
token2 := token.NewToken([]byte(`foo`), 5, 5, 30, 32)
token1 := scanner.NewToken([]byte(`foo`), 4, 4, 27, 29)
token2 := scanner.NewToken([]byte(`foo`), 5, 5, 30, 32)
pos := builder.NewOptionalListTokensPosition([]node.Node{n2, n3}, token1, token2)
@@ -334,7 +334,7 @@ func TestNilNodeListPos(t *testing.T) {
}
func TestNilNodeListTokenPos(t *testing.T) {
token1 := token.NewToken([]byte(`foo`), 1, 1, 0, 3)
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
builder := position.Builder{}
@@ -367,7 +367,7 @@ func TestEmptyNodeListPos(t *testing.T) {
}
func TestEmptyNodeListTokenPos(t *testing.T) {
token1 := token.NewToken([]byte(`foo`), 1, 1, 0, 3)
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
builder := position.Builder{}