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

save comment position

Browse Source
This commit is contained in:
z7zmey
2018-04-15 21:39:26 +03:00
parent c2f938e55c
commit 781a55659b
10 changed files with 114 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
position/builder.go
View File

@@ -1,198 +0,0 @@
package position
import (
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/scanner"
)
// Builder provide functions to constuct positions
type Builder struct {
Positions *Positions
}
type startPos struct {
startLine int
startPos int
}
type endPos struct {
endLine int
endPos int
}
func (b *Builder) getListStartPos(l []node.Node) startPos {
if l == nil {
return startPos{-1, -1}
}
if len(l) == 0 {
return startPos{-1, -1}
}
return b.getNodeStartPos(l[0])
}
func (b *Builder) getNodeStartPos(n node.Node) startPos {
sl := -1
sp := -1
if n == nil {
return startPos{-1, -1}
}
p := (*b.Positions)[n]
if p != nil {
sl = p.StartLine
sp = p.StartPos
}
return startPos{sl, sp}
}
func (b *Builder) getListEndPos(l []node.Node) endPos {
if l == nil {
return endPos{-1, -1}
}
if len(l) == 0 {
return endPos{-1, -1}
}
return b.getNodeEndPos(l[len(l)-1])
}
func (b *Builder) getNodeEndPos(n node.Node) endPos {
el := -1
ep := -1
if n == nil {
return endPos{-1, -1}
}
p := (*b.Positions)[n]
if p != nil {
el = p.EndLine
ep = p.EndPos
}
return endPos{el, ep}
}
// NewNodeListPosition returns new Position
func (b *Builder) NewNodeListPosition(list []node.Node) *Position {
return &Position{
b.getListStartPos(list).startLine,
b.getListEndPos(list).endLine,
b.getListStartPos(list).startPos,
b.getListEndPos(list).endPos,
}
}
// NewNodePosition returns new Position
func (b *Builder) NewNodePosition(n node.Node) *Position {
return &Position{
b.getNodeStartPos(n).startLine,
b.getNodeEndPos(n).endLine,
b.getNodeStartPos(n).startPos,
b.getNodeEndPos(n).endPos,
}
}
// NewTokenPosition returns new Position
func (b *Builder) NewTokenPosition(t scanner.Token) *Position {
return &Position{
t.StartLine,
t.EndLine,
t.StartPos,
t.EndPos,
}
}
// NewTokensPosition returns new Position
func (b *Builder) NewTokensPosition(startToken scanner.Token, endToken scanner.Token) *Position {
return &Position{
startToken.StartLine,
endToken.EndLine,
startToken.StartPos,
endToken.EndPos,
}
}
// NewTokenNodePosition returns new Position
func (b *Builder) NewTokenNodePosition(t scanner.Token, n node.Node) *Position {
return &Position{
t.StartLine,
b.getNodeEndPos(n).endLine,
t.StartPos,
b.getNodeEndPos(n).endPos,
}
}
// NewNodeTokenPosition returns new Position
func (b *Builder) NewNodeTokenPosition(n node.Node, t scanner.Token) *Position {
return &Position{
b.getNodeStartPos(n).startLine,
t.EndLine,
b.getNodeStartPos(n).startPos,
t.EndPos,
}
}
// NewNodesPosition returns new Position
func (b *Builder) NewNodesPosition(startNode node.Node, endNode node.Node) *Position {
return &Position{
b.getNodeStartPos(startNode).startLine,
b.getNodeEndPos(endNode).endLine,
b.getNodeStartPos(startNode).startPos,
b.getNodeEndPos(endNode).endPos,
}
}
// NewNodeListTokenPosition returns new Position
func (b *Builder) NewNodeListTokenPosition(list []node.Node, t scanner.Token) *Position {
return &Position{
b.getListStartPos(list).startLine,
t.EndLine,
b.getListStartPos(list).startPos,
t.EndPos,
}
}
// NewTokenNodeListPosition returns new Position
func (b *Builder) NewTokenNodeListPosition(t scanner.Token, list []node.Node) *Position {
return &Position{
t.StartLine,
b.getListEndPos(list).endLine,
t.StartPos,
b.getListEndPos(list).endPos,
}
}
// NewNodeNodeListPosition returns new Position
func (b *Builder) NewNodeNodeListPosition(n node.Node, list []node.Node) *Position {
return &Position{
b.getNodeStartPos(n).startLine,
b.getListEndPos(list).endLine,
b.getNodeStartPos(n).startPos,
b.getListEndPos(list).endPos,
}
}
// NewOptionalListTokensPosition returns new Position
func (b *Builder) NewOptionalListTokensPosition(list []node.Node, t scanner.Token, endToken scanner.Token) *Position {
if list == nil {
return &Position{
t.StartLine,
endToken.EndLine,
t.StartPos,
endToken.EndPos,
}
}
return &Position{
b.getListStartPos(list).startLine,
endToken.EndLine,
b.getListStartPos(list).startPos,
endToken.EndPos,
}
}

10
position/position.go
View File

@@ -14,6 +14,16 @@ type Position struct {
EndPos int
}
// NewPosition Position constructor
func NewPosition(StartLine int, EndLine int, StartPos int, EndPos int) *Position {
return &Position{
StartLine: StartLine,
EndLine: EndLine,
StartPos: StartPos,
EndPos: EndPos,
}
}
func (p Position) String() string {
return fmt.Sprintf("Pos{Line: %d-%d Pos: %d-%d}", p.StartLine, p.EndLine, p.StartPos, p.EndPos)
}

379
position/position_test.go
View File

@@ -1,379 +0,0 @@
package position_test
import (
"testing"
"github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/position"
"github.com/z7zmey/php-parser/scanner"
)
func TestNewTokenPosition(t *testing.T) {
builder := position.Builder{}
tkn := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
pos := builder.NewTokenPosition(tkn)
if pos.String() != `Pos{Line: 1-1 Pos: 0-3}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewTokensPosition(t *testing.T) {
builder := position.Builder{}
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
token2 := scanner.NewToken([]byte(`foo`), 2, 2, 4, 6)
pos := builder.NewTokensPosition(token1, token2)
if pos.String() != `Pos{Line: 1-2 Pos: 0-6}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewNodePosition(t *testing.T) {
n := node.NewIdentifier("test node")
p := &position.Positions{}
p.AddPosition(n, &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 3,
})
builder := position.Builder{
Positions: p,
}
pos := builder.NewNodePosition(n)
if pos.String() != `Pos{Line: 1-1 Pos: 0-3}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewTokenNodePosition(t *testing.T) {
tkn := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
n := node.NewIdentifier("test node")
p := &position.Positions{}
p.AddPosition(n, &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 4,
EndPos: 12,
})
builder := position.Builder{
Positions: p,
}
pos := builder.NewTokenNodePosition(tkn, n)
if pos.String() != `Pos{Line: 1-2 Pos: 0-12}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewNodeTokenPosition(t *testing.T) {
n := node.NewIdentifier("test node")
tkn := scanner.NewToken([]byte(`foo`), 2, 2, 10, 12)
p := &position.Positions{}
p.AddPosition(n, &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 9,
})
builder := position.Builder{
Positions: p,
}
pos := builder.NewNodeTokenPosition(n, tkn)
if pos.String() != `Pos{Line: 1-2 Pos: 0-12}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewNodeListPosition(t *testing.T) {
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 9,
},
n2: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 10,
EndPos: 19,
},
},
}
pos := builder.NewNodeListPosition([]node.Node{n1, n2})
if pos.String() != `Pos{Line: 1-2 Pos: 0-19}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewNodesPosition(t *testing.T) {
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 9,
},
n2: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 10,
EndPos: 19,
},
},
}
pos := builder.NewNodesPosition(n1, n2)
if pos.String() != `Pos{Line: 1-2 Pos: 0-19}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewNodeListTokenPosition(t *testing.T) {
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
tkn := scanner.NewToken([]byte(`foo`), 3, 3, 20, 22)
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 9,
},
n2: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 10,
EndPos: 19,
},
},
}
pos := builder.NewNodeListTokenPosition([]node.Node{n1, n2}, tkn)
if pos.String() != `Pos{Line: 1-3 Pos: 0-22}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewTokenNodeListPosition(t *testing.T) {
tkn := scanner.NewToken([]byte(`foo`), 1, 1, 0, 2)
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 3,
EndPos: 10,
},
n2: &position.Position{
StartLine: 3,
EndLine: 3,
StartPos: 11,
EndPos: 20,
},
},
}
pos := builder.NewTokenNodeListPosition(tkn, []node.Node{n1, n2})
if pos.String() != `Pos{Line: 1-3 Pos: 0-20}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewNodeNodeListPosition(t *testing.T) {
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
n3 := node.NewIdentifier("test node")
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 8,
},
n2: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 9,
EndPos: 17,
},
n3: &position.Position{
StartLine: 3,
EndLine: 3,
StartPos: 18,
EndPos: 26,
},
},
}
pos := builder.NewNodeNodeListPosition(n1, []node.Node{n2, n3})
if pos.String() != `Pos{Line: 1-3 Pos: 0-26}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewOptionalListTokensPosition(t *testing.T) {
builder := position.Builder{}
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
token2 := scanner.NewToken([]byte(`foo`), 2, 2, 4, 6)
pos := builder.NewOptionalListTokensPosition(nil, token1, token2)
if pos.String() != `Pos{Line: 1-2 Pos: 0-6}` {
t.Errorf("token value is not equal\n")
}
}
func TestNewOptionalListTokensPosition2(t *testing.T) {
n1 := node.NewIdentifier("test node")
n2 := node.NewIdentifier("test node")
n3 := node.NewIdentifier("test node")
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 8,
},
n2: &position.Position{
StartLine: 2,
EndLine: 2,
StartPos: 9,
EndPos: 17,
},
n3: &position.Position{
StartLine: 3,
EndLine: 3,
StartPos: 18,
EndPos: 26,
},
},
}
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)
if pos.String() != `Pos{Line: 2-5 Pos: 9-32}` {
t.Errorf("token value is not equal\n")
}
}
func TestNilNodePos(t *testing.T) {
builder := position.Builder{}
pos := builder.NewNodesPosition(nil, nil)
if pos.String() != `Pos{Line: -1--1 Pos: -1--1}` {
t.Errorf("token value is not equal\n")
}
}
func TestNilNodeListPos(t *testing.T) {
n1 := node.NewIdentifier("test node")
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 8,
},
},
}
pos := builder.NewNodeNodeListPosition(n1, nil)
if pos.String() != `Pos{Line: 1--1 Pos: 0--1}` {
t.Errorf("token value is not equal\n")
}
}
func TestNilNodeListTokenPos(t *testing.T) {
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
builder := position.Builder{}
pos := builder.NewNodeListTokenPosition(nil, token1)
if pos.String() != `Pos{Line: -1-1 Pos: -1-3}` {
t.Errorf("token value is not equal\n")
}
}
func TestEmptyNodeListPos(t *testing.T) {
n1 := node.NewIdentifier("test node")
builder := position.Builder{
Positions: &position.Positions{
n1: &position.Position{
StartLine: 1,
EndLine: 1,
StartPos: 0,
EndPos: 8,
},
},
}
pos := builder.NewNodeNodeListPosition(n1, []node.Node{})
if pos.String() != `Pos{Line: 1--1 Pos: 0--1}` {
t.Errorf("token value is not equal\n")
}
}
func TestEmptyNodeListTokenPos(t *testing.T) {
token1 := scanner.NewToken([]byte(`foo`), 1, 1, 0, 3)
builder := position.Builder{}
pos := builder.NewNodeListTokenPosition([]node.Node{}, token1)
if pos.String() != `Pos{Line: -1-1 Pos: -1-3}` {
t.Errorf("token value is not equal\n")
}
}