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

build: replace VKCOM import with laytan import

Browse Source
This commit is contained in:
Laytan Laats 2023-03-31 16:50:08 +02:00
parent 92d341cbb5
commit 68ac672368
62 changed files with 199 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/php-parser/main.go
View File

@ -16,15 +16,15 @@ import (
"github.com/pkg/profile" "github.com/pkg/profile"
"github.com/yookoala/realpath" "github.com/yookoala/realpath"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/parser" "github.com/laytan/php-parser/pkg/parser"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"github.com/VKCOM/php-parser/pkg/visitor/dumper" "github.com/laytan/php-parser/pkg/visitor/dumper"
"github.com/VKCOM/php-parser/pkg/visitor/nsresolver" "github.com/laytan/php-parser/pkg/visitor/nsresolver"
"github.com/VKCOM/php-parser/pkg/visitor/printer" "github.com/laytan/php-parser/pkg/visitor/printer"
"github.com/VKCOM/php-parser/pkg/visitor/traverser" "github.com/laytan/php-parser/pkg/visitor/traverser"
) )
var ( var (

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/VKCOM/php-parser module github.com/laytan/php-parser
go 1.13 go 1.13

12
internal/php7/lexer.go
View File

@ -4,12 +4,12 @@ import (
"bytes" "bytes"
"strings" "strings"
pos "github.com/VKCOM/php-parser/internal/position" pos "github.com/laytan/php-parser/internal/position"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
type Lexer struct { type Lexer struct {

6
internal/php7/node.go
View File

@ -1,9 +1,9 @@
package php7 package php7
import ( import (
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
type ParserBrackets struct { type ParserBrackets struct {

10
internal/php7/parser.go
View File

@ -1,11 +1,11 @@
package php7 package php7
import ( import (
"github.com/VKCOM/php-parser/internal/position" "github.com/laytan/php-parser/internal/position"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
// Parser structure // Parser structure

14
internal/php7/parser_test.go
View File

@ -5,13 +5,13 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
"github.com/VKCOM/php-parser/internal/php7" "github.com/laytan/php-parser/internal/php7"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

BIN
internal/php7/php7.go generated
View File

Binary file not shown.

6
internal/php7/php7_bench_test.go
View File

@ -5,9 +5,9 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php7" "github.com/laytan/php-parser/internal/php7"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
func BenchmarkPhp7(b *testing.B) { func BenchmarkPhp7(b *testing.B) {

2
internal/php7/scanner.go
View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
// line internal/php7/scanner.go:15 // line internal/php7/scanner.go:15

10
internal/php7/scanner_test.go
View File

@ -4,11 +4,11 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
func TestTokens(t *testing.T) { func TestTokens(t *testing.T) {

8
internal/php8/builder.go
View File

@ -3,10 +3,10 @@ package php8
import ( import (
"bytes" "bytes"
"github.com/VKCOM/php-parser/internal/position" "github.com/laytan/php-parser/internal/position"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
position2 "github.com/VKCOM/php-parser/pkg/position" position2 "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
// Builder is responsible for creating nodes inside grammar rules. // Builder is responsible for creating nodes inside grammar rules.

12
internal/php8/lexer.go
View File

@ -4,12 +4,12 @@ import (
"bytes" "bytes"
"strings" "strings"
pos "github.com/VKCOM/php-parser/internal/position" pos "github.com/laytan/php-parser/internal/position"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
type Lexer struct { type Lexer struct {

6
internal/php8/node.go
View File

@ -1,9 +1,9 @@
package php8 package php8
import ( import (
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
type ParserBrackets struct { type ParserBrackets struct {

10
internal/php8/parser.go
View File

@ -1,11 +1,11 @@
package php8 package php8
import ( import (
"github.com/VKCOM/php-parser/internal/position" "github.com/laytan/php-parser/internal/position"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
// Parser structure // Parser structure

2
internal/php8/parser_php8_1_test.go
View File

@ -3,7 +3,7 @@ package php8_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/tester" "github.com/laytan/php-parser/internal/tester"
) )
func TestReadonlyModifier(t *testing.T) { func TestReadonlyModifier(t *testing.T) {

2
internal/php8/parser_php8_2_test.go
View File

@ -3,7 +3,7 @@ package php8_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/tester" "github.com/laytan/php-parser/internal/tester"
) )
func TestClassReadonlyModifier(t *testing.T) { func TestClassReadonlyModifier(t *testing.T) {

16
internal/php8/parser_php8_test.go
View File

@ -3,14 +3,14 @@ package php8_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/tester" "github.com/laytan/php-parser/internal/tester"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/parser" "github.com/laytan/php-parser/pkg/parser"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"gotest.tools/assert" "gotest.tools/assert"
) )

14
internal/php8/parser_test.go
View File

@ -3,15 +3,15 @@ package php8_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"gotest.tools/assert" "gotest.tools/assert"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

4
internal/php8/php8.go
View File

@ -10,8 +10,8 @@ import __yyfmt__ "fmt"
import ( import (
"strconv" "strconv"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
// line internal/php8/php8.y:13 // line internal/php8/php8.y:13

6
internal/php8/php8_bench_test.go
View File

@ -5,9 +5,9 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
func BenchmarkPhp8(b *testing.B) { func BenchmarkPhp8(b *testing.B) {

2
internal/php8/scanner.go
View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
// line internal/php8/scanner.go:15 // line internal/php8/scanner.go:15

1
internal/php8/scanner.rl
View File

@ -1,3 +1,4 @@
// ragel_subtype=go
package php8 package php8
import ( import (

4
internal/php8/scanner_php8_1_test.go
View File

@ -3,8 +3,8 @@ package php8_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/tester" "github.com/laytan/php-parser/internal/tester"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
func TestReadonlyTokens(t *testing.T) { func TestReadonlyTokens(t *testing.T) {

10
internal/php8/scanner_php8_test.go
View File

@ -3,11 +3,11 @@ package php8_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"github.com/VKCOM/php-parser/internal/tester" "github.com/laytan/php-parser/internal/tester"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"gotest.tools/assert" "gotest.tools/assert"
) )

10
internal/php8/scanner_test.go
View File

@ -5,11 +5,11 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
func TestTokens(t *testing.T) { func TestTokens(t *testing.T) {

2
internal/position/newline_test.go
View File

@ -4,7 +4,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/VKCOM/php-parser/internal/position" "github.com/laytan/php-parser/internal/position"
"gotest.tools/assert" "gotest.tools/assert"
) )

6
internal/position/position.go
View File

@ -1,9 +1,9 @@
package position package position
import ( import (
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
type startPos struct { type startPos struct {

8
internal/position/position_test.go
View File

@ -5,10 +5,10 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
builder "github.com/VKCOM/php-parser/internal/position" builder "github.com/laytan/php-parser/internal/position"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
func TestNewTokenPosition(t *testing.T) { func TestNewTokenPosition(t *testing.T) {

10
internal/tester/lexer_token_freefloating.go
View File

@ -3,11 +3,11 @@ package tester
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php7" "github.com/laytan/php-parser/internal/php7"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"gotest.tools/assert" "gotest.tools/assert"
) )

8
internal/tester/lexer_token_string.go
View File

@ -3,10 +3,10 @@ package tester
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php7" "github.com/laytan/php-parser/internal/php7"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"gotest.tools/assert" "gotest.tools/assert"
) )

10
internal/tester/lexer_token_struct.go
View File

@ -3,11 +3,11 @@ package tester
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php7" "github.com/laytan/php-parser/internal/php7"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"gotest.tools/assert" "gotest.tools/assert"
) )

10
internal/tester/parse_print.go
View File

@ -4,11 +4,11 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/parser" "github.com/laytan/php-parser/pkg/parser"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"github.com/VKCOM/php-parser/pkg/visitor/printer" "github.com/laytan/php-parser/pkg/visitor/printer"
"gotest.tools/assert" "gotest.tools/assert"
) )

8
internal/tester/parser.go
View File

@ -3,10 +3,10 @@ package tester
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/parser" "github.com/laytan/php-parser/pkg/parser"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"gotest.tools/assert" "gotest.tools/assert"
) )

8
internal/tester/parser_dump.go
View File

@ -4,10 +4,10 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/parser" "github.com/laytan/php-parser/pkg/parser"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"github.com/VKCOM/php-parser/pkg/visitor/dumper" "github.com/laytan/php-parser/pkg/visitor/dumper"
"gotest.tools/assert" "gotest.tools/assert"
) )

8
internal/tester/parser_error.go
View File

@ -3,10 +3,10 @@ package tester
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/parser" "github.com/laytan/php-parser/pkg/parser"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"gotest.tools/assert" "gotest.tools/assert"
) )

2
pkg/ast/ast.go
View File

@ -1,6 +1,6 @@
package ast package ast
import "github.com/VKCOM/php-parser/pkg/position" import "github.com/laytan/php-parser/pkg/position"
// The edge-case/overwrites, from node type name to their visitor function name. // The edge-case/overwrites, from node type name to their visitor function name.
var TypeToVisitorNameMap = map[string]string{ var TypeToVisitorNameMap = map[string]string{

4
pkg/ast/node.go
View File

@ -1,8 +1,8 @@
package ast package ast
import ( import (
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
//go:generate go run node_funcs_gen.go //go:generate go run node_funcs_gen.go

2
pkg/ast/node_funcs.go
View File

@ -2,7 +2,7 @@
package ast package ast
import "github.com/VKCOM/php-parser/pkg/position" import "github.com/laytan/php-parser/pkg/position"
type Type int type Type int

4
pkg/ast/node_funcs_gen.go
View File

@ -9,7 +9,7 @@ import (
"regexp" "regexp"
"text/template" "text/template"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
type templData struct { type templData struct {
@ -27,7 +27,7 @@ var fileTempl = template.Must(
package ast package ast
import "github.com/VKCOM/php-parser/pkg/position" import "github.com/laytan/php-parser/pkg/position"
type Type int type Type int

4
pkg/conf/conf.go
View File

@ -1,8 +1,8 @@
package conf package conf
import ( import (
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
type Config struct { type Config struct {

2
pkg/errors/error.go
View File

@ -3,7 +3,7 @@ package errors
import ( import (
"fmt" "fmt"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
) )
// Error parsing error // Error parsing error

4
pkg/errors/error_test.go
View File

@ -5,8 +5,8 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
) )
func TestConstructor(t *testing.T) { func TestConstructor(t *testing.T) {

10
pkg/parser/doc.go
View File

@ -9,11 +9,11 @@ Package usage example:
"log" "log"
"os" "os"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/errors" "github.com/laytan/php-parser/pkg/errors"
"github.com/VKCOM/php-parser/pkg/parser" "github.com/laytan/php-parser/pkg/parser"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"github.com/VKCOM/php-parser/pkg/visitor/dumper" "github.com/laytan/php-parser/pkg/visitor/dumper"
) )
func main() { func main() {

10
pkg/parser/parser.go
View File

@ -3,11 +3,11 @@ package parser
import ( import (
"errors" "errors"
"github.com/VKCOM/php-parser/internal/php7" "github.com/laytan/php-parser/internal/php7"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
var ( var (

2
pkg/token/token.go
View File

@ -1,6 +1,6 @@
package token package token
import "github.com/VKCOM/php-parser/pkg/position" import "github.com/laytan/php-parser/pkg/position"
//go:generate stringer -type=ID -output ./token_string.go //go:generate stringer -type=ID -output ./token_string.go
type ID int type ID int

2
pkg/version/version_test.go
View File

@ -5,7 +5,7 @@ import (
"gotest.tools/assert" "gotest.tools/assert"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
) )
func Test(t *testing.T) { func Test(t *testing.T) {

6
pkg/visitor/dumper/dumper.go
View File

@ -5,10 +5,10 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
type Dumper struct { type Dumper struct {

8
pkg/visitor/dumper/dumper_test.go
View File

@ -4,11 +4,11 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/position" "github.com/laytan/php-parser/pkg/position"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/visitor/dumper" "github.com/laytan/php-parser/pkg/visitor/dumper"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
func TestDumper_root(t *testing.T) { func TestDumper_root(t *testing.T) {

4
pkg/visitor/formatter/formatter.go
View File

@ -3,8 +3,8 @@ package formatter
import ( import (
"bytes" "bytes"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
type formatterState int type formatterState int

8
pkg/visitor/formatter/formatter_test.go
View File

@ -2,12 +2,12 @@ package formatter_test
import ( import (
"bytes" "bytes"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/visitor/formatter" "github.com/laytan/php-parser/pkg/visitor/formatter"
"github.com/VKCOM/php-parser/pkg/visitor/printer" "github.com/laytan/php-parser/pkg/visitor/printer"
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
func TestFormatter_Root(t *testing.T) { func TestFormatter_Root(t *testing.T) {

4
pkg/visitor/nsresolver/namespace_resolver.go
View File

@ -5,8 +5,8 @@ import (
"errors" "errors"
"strings" "strings"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/visitor" "github.com/laytan/php-parser/pkg/visitor"
) )
// NamespaceResolver visitor // NamespaceResolver visitor

6
pkg/visitor/nsresolver/namespace_resolver_test.go
View File

@ -1,13 +1,13 @@
package nsresolver_test package nsresolver_test
import ( import (
"github.com/VKCOM/php-parser/pkg/visitor/nsresolver" "github.com/laytan/php-parser/pkg/visitor/nsresolver"
"github.com/VKCOM/php-parser/pkg/visitor/traverser" "github.com/laytan/php-parser/pkg/visitor/traverser"
"testing" "testing"
"gotest.tools/assert" "gotest.tools/assert"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
func TestResolveStaticCall(t *testing.T) { func TestResolveStaticCall(t *testing.T) {

2
pkg/visitor/null.go
View File

@ -1,7 +1,7 @@
package visitor package visitor
import ( import (
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
type Null struct{} type Null struct{}

4
pkg/visitor/printer/printer.go
View File

@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"io" "io"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
) )
type printerState int type printerState int

10
pkg/visitor/printer/printer_php7_test.go
View File

@ -5,11 +5,11 @@ import (
"os" "os"
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php7" "github.com/laytan/php-parser/internal/php7"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"github.com/VKCOM/php-parser/pkg/visitor/printer" "github.com/laytan/php-parser/pkg/visitor/printer"
) )
func ExamplePrinter() { func ExamplePrinter() {

2
pkg/visitor/printer/printer_php8_1_test.go
View File

@ -3,7 +3,7 @@ package printer_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/internal/tester" "github.com/laytan/php-parser/internal/tester"
) )
func TestParseAndPrintReadonlyModifierPHP81(t *testing.T) { func TestParseAndPrintReadonlyModifierPHP81(t *testing.T) {

12
pkg/visitor/printer/printer_php8_test.go
View File

@ -5,12 +5,12 @@ import (
"os" "os"
"testing" "testing"
"github.com/VKCOM/php-parser/internal/php8" "github.com/laytan/php-parser/internal/php8"
"github.com/VKCOM/php-parser/internal/tester" "github.com/laytan/php-parser/internal/tester"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/conf" "github.com/laytan/php-parser/pkg/conf"
"github.com/VKCOM/php-parser/pkg/version" "github.com/laytan/php-parser/pkg/version"
"github.com/VKCOM/php-parser/pkg/visitor/printer" "github.com/laytan/php-parser/pkg/visitor/printer"
"gotest.tools/assert" "gotest.tools/assert"
) )

6
pkg/visitor/printer/printer_test.go
View File

@ -2,11 +2,11 @@ package printer_test
import ( import (
"bytes" "bytes"
"github.com/VKCOM/php-parser/pkg/token" "github.com/laytan/php-parser/pkg/token"
"github.com/VKCOM/php-parser/pkg/visitor/printer" "github.com/laytan/php-parser/pkg/visitor/printer"
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
func TestPrinterPrintFile(t *testing.T) { func TestPrinterPrintFile(t *testing.T) {

2
pkg/visitor/traverser/traverser.go
View File

@ -1,7 +1,7 @@
package traverser package traverser
import ( import (
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
) )
//go:generate go run traverser_gen.go //go:generate go run traverser_gen.go

4
pkg/visitor/traverser/traverser_gen.go
View File

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"text/template" "text/template"
phpast "github.com/VKCOM/php-parser/pkg/ast" phpast "github.com/laytan/php-parser/pkg/ast"
"golang.org/x/tools/go/packages" "golang.org/x/tools/go/packages"
) )
@ -32,7 +32,7 @@ var fileTempl = template.Must(
package traverser package traverser
import "github.com/VKCOM/php-parser/pkg/ast" import "github.com/laytan/php-parser/pkg/ast"
{{range $typ := .Types}} {{range $typ := .Types}}
func (t *Traverser) {{$typ.FuncName}}(n *ast.{{$typ.Name}}) { func (t *Traverser) {{$typ.FuncName}}(n *ast.{{$typ.Name}}) {
if !t.checkEntrance(n) { if !t.checkEntrance(n) {

2
pkg/visitor/traverser/traverser_impl.go
View File

@ -2,7 +2,7 @@
package traverser package traverser
import "github.com/VKCOM/php-parser/pkg/ast" import "github.com/laytan/php-parser/pkg/ast"
func (t *Traverser) Root(n *ast.Root) { func (t *Traverser) Root(n *ast.Root) {
if !t.checkEntrance(n) { if !t.checkEntrance(n) {

6
pkg/visitor/traverser/traverser_test.go
View File

@ -3,9 +3,9 @@ package traverser_test
import ( import (
"testing" "testing"
"github.com/VKCOM/php-parser/pkg/ast" "github.com/laytan/php-parser/pkg/ast"
"github.com/VKCOM/php-parser/pkg/visitor" "github.com/laytan/php-parser/pkg/visitor"
"github.com/VKCOM/php-parser/pkg/visitor/traverser" "github.com/laytan/php-parser/pkg/visitor/traverser"
) )
// testCase is a traverser that does not go into any class statement or its children. // testCase is a traverser that does not go into any class statement or its children.