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

rename package cfg to conf

Browse Source
This commit is contained in:
Vadym Slizov
2021-02-13 23:54:34 +02:00
parent 9d12f1d162
commit 367eff9de6
14 changed files with 503 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/php5/parser.go
View File

@@ -4,7 +4,7 @@ import (
"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/cfg"
"github.com/z7zmey/php-parser/pkg/conf"
"github.com/z7zmey/php-parser/pkg/errors"
"github.com/z7zmey/php-parser/pkg/token"
)
@@ -19,7 +19,7 @@ type Parser struct {
}
// NewParser creates and returns new Parser
func NewParser(lexer *scanner.Lexer, config cfg.Config) *Parser {
func NewParser(lexer *scanner.Lexer, config conf.Config) *Parser {
return &Parser{
Lexer: lexer,
errHandlerFunc: config.ErrorHandlerFunc,

424
internal/php5/parser_test.go
View File

File diff suppressed because it is too large Load Diff

4
internal/php5/php5_bench_test.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/z7zmey/php-parser/internal/php5"
"github.com/z7zmey/php-parser/internal/scanner"
"github.com/z7zmey/php-parser/pkg/cfg"
"github.com/z7zmey/php-parser/pkg/conf"
"github.com/z7zmey/php-parser/pkg/version"
)
@@ -17,7 +17,7 @@ func BenchmarkPhp5(b *testing.B) {
}
for n := 0; n < b.N; n++ {
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 5,
Minor: 6,

4
internal/php7/parser.go
View File

@@ -4,7 +4,7 @@ import (
"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/cfg"
"github.com/z7zmey/php-parser/pkg/conf"
"github.com/z7zmey/php-parser/pkg/errors"
"github.com/z7zmey/php-parser/pkg/token"
)
@@ -19,7 +19,7 @@ type Parser struct {
}
// NewParser creates and returns new Parser
func NewParser(lexer *scanner.Lexer, config cfg.Config) *Parser {
func NewParser(lexer *scanner.Lexer, config conf.Config) *Parser {
return &Parser{
Lexer: lexer,
errHandlerFunc: config.ErrorHandlerFunc,

466
internal/php7/parser_test.go
View File

File diff suppressed because it is too large Load Diff

4
internal/php7/php7_bench_test.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/z7zmey/php-parser/internal/php7"
"github.com/z7zmey/php-parser/internal/scanner"
"github.com/z7zmey/php-parser/pkg/cfg"
"github.com/z7zmey/php-parser/pkg/conf"
"github.com/z7zmey/php-parser/pkg/version"
)
@@ -18,7 +18,7 @@ func BenchmarkPhp7(b *testing.B) {
}
for n := 0; n < b.N; n++ {
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,

4
internal/scanner/lexer.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"strings"
"github.com/z7zmey/php-parser/pkg/cfg"
"github.com/z7zmey/php-parser/pkg/conf"
"github.com/z7zmey/php-parser/pkg/errors"
"github.com/z7zmey/php-parser/pkg/position"
"github.com/z7zmey/php-parser/pkg/token"
@@ -27,7 +27,7 @@ type Lexer struct {
newLines NewLines
}
func NewLexer(data []byte, config cfg.Config) *Lexer {
func NewLexer(data []byte, config conf.Config) *Lexer {
lex := &Lexer{
data: data,
phpVersion: config.Version,

70
internal/scanner/scanner_test.go
View File

@@ -4,7 +4,7 @@ import (
"gotest.tools/assert"
"testing"
"github.com/z7zmey/php-parser/pkg/cfg"
"github.com/z7zmey/php-parser/pkg/conf"
"github.com/z7zmey/php-parser/pkg/errors"
"github.com/z7zmey/php-parser/pkg/position"
"github.com/z7zmey/php-parser/pkg/token"
@@ -355,7 +355,7 @@ func TestTokens(t *testing.T) {
token.T_UNSET_CAST.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -388,7 +388,7 @@ func TestShebang(t *testing.T) {
"\n",
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -413,7 +413,7 @@ func TestShebangHtml(t *testing.T) {
0.1
`
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -468,7 +468,7 @@ func TestNumberTokens(t *testing.T) {
token.T_DNUMBER.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -530,7 +530,7 @@ func TestConstantStrings(t *testing.T) {
token.T_CONSTANT_ENCAPSED_STRING.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -582,7 +582,7 @@ func TestSingleQuoteStringTokens(t *testing.T) {
token.T_CONSTANT_ENCAPSED_STRING.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -682,7 +682,7 @@ func TestTeplateStringTokens(t *testing.T) {
token.ID(int('"')).String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -778,7 +778,7 @@ func TestBackquoteStringTokens(t *testing.T) {
token.ID(int('`')).String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -877,7 +877,7 @@ CAT;
token.ID(int(';')).String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -955,7 +955,7 @@ CAT
token.T_END_HEREDOC.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -999,7 +999,7 @@ CAT;
token.ID(int(';')).String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1035,7 +1035,7 @@ func TestHereDocTokens73(t *testing.T) {
token.T_VARIABLE.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1070,7 +1070,7 @@ CAT;`
token.ID(int(';')).String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 2,
@@ -1098,7 +1098,7 @@ func TestHereDocUnclosed(t *testing.T) {
token.T_START_HEREDOC.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1135,7 +1135,7 @@ func TestInlineHtmlNopTokens(t *testing.T) {
token.T_INLINE_HTML.String(),
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1175,7 +1175,7 @@ func TestStringTokensAfterVariable(t *testing.T) {
"\"",
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1214,7 +1214,7 @@ func TestSlashAfterVariable(t *testing.T) {
"3",
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1257,7 +1257,7 @@ func TestCommentEnd(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1294,7 +1294,7 @@ func TestCommentNewLine(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1331,7 +1331,7 @@ func TestCommentNewLine1(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1368,7 +1368,7 @@ func TestCommentNewLine2(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1406,7 +1406,7 @@ func TestCommentWithPhpEndTag(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1444,7 +1444,7 @@ func TestInlineComment(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1482,7 +1482,7 @@ func TestInlineComment2(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1524,7 +1524,7 @@ func TestEmptyInlineComment(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1562,7 +1562,7 @@ func TestEmptyInlineComment2(t *testing.T) {
},
}
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1584,7 +1584,7 @@ func TestMethodCallTokens(t *testing.T) {
src := `<?php
$a -> bar ( '' ) ;`
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1692,7 +1692,7 @@ func TestYieldFromTokens(t *testing.T) {
src := `<?php
yield from $a`
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1734,7 +1734,7 @@ func TestYieldFromTokens(t *testing.T) {
func TestVarNameByteChars(t *testing.T) {
src := "<?php $\x80 $\xff"
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1752,7 +1752,7 @@ func TestVarNameByteChars(t *testing.T) {
func TestStringVarNameByteChars(t *testing.T) {
src := "<?php \"$\x80 $\xff\""
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1780,7 +1780,7 @@ func TestIgnoreControllCharacters(t *testing.T) {
src := "<?php \004 echo $b;"
var actualErr *errors.Error
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1811,7 +1811,7 @@ func TestIgnoreControllCharacters(t *testing.T) {
func TestIgnoreControllCharactersAtStringVarOffset(t *testing.T) {
src := "<?php \"$a[test\004]\";"
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1848,7 +1848,7 @@ func TestIgnoreControllCharactersAtStringVarOffset(t *testing.T) {
func TestDoubleDollar(t *testing.T) {
src := `<?php "$$a";`
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,
@@ -1875,7 +1875,7 @@ func TestDoubleDollar(t *testing.T) {
func TestTripleDollar(t *testing.T) {
src := `<?php "$$$a";`
config := cfg.Config{
config := conf.Config{
Version: &version.Version{
Major: 7,
Minor: 4,